* [Buildroot] [PATCH 1/1] package/udisks: fix daemon path in systemd service file
@ 2016-11-17 16:54 Pieterjan Camerlynck
2016-11-19 10:08 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Pieterjan Camerlynck @ 2016-11-17 16:54 UTC (permalink / raw)
To: buildroot
Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
---
package/udisks/0002-Fix-systemd-service-file.patch | 37 ++++++++++++++++++++++
package/udisks/udisks.mk | 2 ++
2 files changed, 39 insertions(+)
create mode 100644 package/udisks/0002-Fix-systemd-service-file.patch
diff --git a/package/udisks/0002-Fix-systemd-service-file.patch b/package/udisks/0002-Fix-systemd-service-file.patch
new file mode 100644
index 0000000..07b0d45
--- /dev/null
+++ b/package/udisks/0002-Fix-systemd-service-file.patch
@@ -0,0 +1,37 @@
+Fix systemd service file
+
+This patch has been backported from upstream:
+
+https://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=bf8b4362cef24a6f747e4329305a4939c8f585d1
+
+Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
+
+From bf8b4362cef24a6f747e4329305a4939c8f585d1 Mon Sep 17 00:00:00 2001
+From: David King <amigadave@amigadave.com>
+Date: Thu, 2 Jul 2015 13:49:22 +0100
+Subject: [PATCH] Fix systemd service file
+
+udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1238664
+https://bugs.freedesktop.org/show_bug.cgi?id=91191
+---
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 411ea0f..08af5f4 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir)
+ systemdservice_DATA = $(systemdservice_in_files:.service.in=.service)
+
+ $(systemdservice_DATA): $(systemdservice_in_files) Makefile
+- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@
++ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ endif
+
+ udevrulesdir = $(slashlibdir)/udev/rules.d
+--
+2.7.4
+
diff --git a/package/udisks/udisks.mk b/package/udisks/udisks.mk
index eea79e5..4d3ede7 100644
--- a/package/udisks/udisks.mk
+++ b/package/udisks/udisks.mk
@@ -8,6 +8,8 @@ UDISKS_VERSION = 1.0.5
UDISKS_SITE = http://hal.freedesktop.org/releases
UDISKS_LICENSE = GPLv2+
UDISKS_LICENSE_FILES = COPYING
+# For 0002-Fix-systemd-service-file.patch
+UDISKS_AUTORECONF = YES
UDISKS_DEPENDENCIES = \
sg3_utils \
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] package/udisks: fix daemon path in systemd service file
2016-11-17 16:54 [Buildroot] [PATCH 1/1] package/udisks: fix daemon path in systemd service file Pieterjan Camerlynck
@ 2016-11-19 10:08 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2016-11-19 10:08 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 17 Nov 2016 17:54:20 +0100, Pieterjan Camerlynck wrote:
> Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
> ---
> package/udisks/0002-Fix-systemd-service-file.patch | 37 ++++++++++++++++++++++
> package/udisks/udisks.mk | 2 ++
> 2 files changed, 39 insertions(+)
> create mode 100644 package/udisks/0002-Fix-systemd-service-file.patch
Applied to master, thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-11-19 10:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-17 16:54 [Buildroot] [PATCH 1/1] package/udisks: fix daemon path in systemd service file Pieterjan Camerlynck
2016-11-19 10:08 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.