rpms/bluez
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update systemd patch to apply

Browse Source
This commit is contained in:
Bastien Nocera 2011-06-03 12:16:49 +01:00
parent a0ef757bf4
commit db49d01363
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
0001-systemd-install-systemd-unit-files.patch
View File

@ -1,4 +1,4 @@
From 22c938523708fab4afa67608461c103a663fd21c Mon Sep 17 00:00:00 2001 From c4b7096f8643d23111f91c60cbd2a62883d419ba Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net> From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Jul 2010 19:20:44 +0200 Date: Wed, 21 Jul 2010 19:20:44 +0200
Subject: [PATCH] systemd: install systemd unit files Subject: [PATCH] systemd: install systemd unit files
@ -18,7 +18,7 @@ that bluetoothd is not started twice at the same time.
create mode 100644 scripts/org.bluez.service create mode 100644 scripts/org.bluez.service
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index 4670886..8a844bf 100644 index 4659c80..c2a6976 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -352,7 +352,8 @@ endif @@ -352,7 +352,8 @@ endif
@ -30,8 +30,8 @@ index 4670886..8a844bf 100644
+ scripts/bluetooth.service.in scripts/org.bluez.service + scripts/bluetooth.service.in scripts/org.bluez.service
if PCMCIA if PCMCIA
udevdir = $(libexecdir)/udev udevdir = @UDEV_DIR@
@@ -360,6 +361,20 @@ udevdir = $(libexecdir)/udev @@ -360,6 +361,20 @@ udevdir = @UDEV_DIR@
dist_udev_SCRIPTS = scripts/bluetooth_serial dist_udev_SCRIPTS = scripts/bluetooth_serial
endif endif
@ -56,8 +56,8 @@ index 4670886..8a844bf 100644
pkgconfig_DATA = bluez.pc pkgconfig_DATA = bluez.pc
-DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib -DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules
+DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib --with-systemdsystemunitdir= +DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --with-systemdsystemunitdir=
-DISTCLEANFILES = $(pkgconfig_DATA) -DISTCLEANFILES = $(pkgconfig_DATA)
+DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service +DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service
@ -65,10 +65,10 @@ index 4670886..8a844bf 100644
MAINTAINERCLEANFILES = Makefile.in \ MAINTAINERCLEANFILES = Makefile.in \
aclocal.m4 configure config.h.in config.sub config.guess \ aclocal.m4 configure config.h.in config.sub config.guess \
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index 1ecdc7b..ddb62ed 100644 index 2ce4acf..07b9e55 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -56,5 +56,14 @@ if (test "${enable_capng}" = "yes"); then @@ -57,5 +57,14 @@ if (test "${enable_capng}" = "yes"); then
AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.]) AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
fi fi
@ -121,5 +121,5 @@ index 0000000..dd7ae8f
+User=root +User=root
+SystemdService=dbus-org.bluez.service +SystemdService=dbus-org.bluez.service
-- --
1.7.4.1 1.7.5.1