All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/udisks: fix daemon path in systemd service file
Date: Thu, 17 Nov 2016 17:54:20 +0100	[thread overview]
Message-ID: <1479401660-23073-1-git-send-email-pieterjan.camerlynck@gmail.com> (raw)

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

             reply	other threads:[~2016-11-17 16:54 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-17 16:54 Pieterjan Camerlynck [this message]
2016-11-19 10:08 ` [Buildroot] [PATCH 1/1] package/udisks: fix daemon path in systemd service file Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1479401660-23073-1-git-send-email-pieterjan.camerlynck@gmail.com \
    --to=pieterjan.camerlynck@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.