aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/udisks
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 14:23:17 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:22:04 +0200
commitab198bbcfae9239c761e412e800d497bdd8bedf4 (patch)
tree6527c5ffa4c262abf6e6ef473e53d89a6286da90 /meta-oe/recipes-support/udisks
parent443ea30263cf4a6382ff7c647130bbe7604f6296 (diff)
downloadmeta-openembedded-contrib-ab198bbcfae9239c761e412e800d497bdd8bedf4.tar.gz
meta-openembedded-contrib-ab198bbcfae9239c761e412e800d497bdd8bedf4.tar.bz2
meta-openembedded-contrib-ab198bbcfae9239c761e412e800d497bdd8bedf4.zip
udisks: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/udisks')
-rw-r--r--meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch112
-rw-r--r--meta-oe/recipes-support/udisks/udisks_1.0.4.bb14
2 files changed, 124 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch b/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
new file mode 100644
index 0000000000..29df8a4da4
--- /dev/null
+++ b/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch
@@ -0,0 +1,112 @@
+From 7a485d491697906b445020dfcb37fe91806d7134 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 22 Jul 2010 02:20:22 +0200
+Subject: [PATCH] systemd: install systemd unit files
+Upstream-Status: ?
+Based on: https://www.libreoffice.org/bugzilla/show_bug.cgi?id=29205
+---
+ Makefile.am | 5 ++++-
+ configure.ac | 9 +++++++++
+ data/.gitignore | 1 +
+ data/Makefile.am | 11 ++++++++++-
+ data/org.freedesktop.UDisks.service.in | 2 +-
+ data/udisks-daemon.service.in | 12 ++++++++++++
+ 6 files changed, 37 insertions(+), 3 deletions(-)
+ create mode 100644 data/udisks-daemon.service.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 588f05d..c3aaeea 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,7 +24,10 @@ EXTRA_DIST = \
+ ChangeLog
+
+ # xsltproc barfs on 'make distcheck'; disable for now
+-DISTCHECK_CONFIGURE_FLAGS=--disable-man-pages --disable-gtk-doc
++DISTCHECK_CONFIGURE_FLAGS = \
++ --disable-man-pages \
++ --disable-gtk-doc \
++ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
+ clean-local :
+ rm -f *~
+diff --git a/configure.ac b/configure.ac
+index a9141bf..39bbd7a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -232,6 +232,15 @@ AC_SUBST([GETTEXT_PACKAGE])
+ AM_GLIB_GNU_GETTEXT
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
+
++# systemd
++
++AC_ARG_WITH([systemdsystemunitdir],
++ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++ [],
++ [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
++AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
++
+ AC_OUTPUT([
+ Makefile
+ data/Makefile
+diff --git a/data/Makefile.am b/data/Makefile.am
+index ca6d8ac..bf5c1a7 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -35,6 +35,14 @@ avahiservicedir = $(sysconfdir)/avahi/services
+ avahiservice_DATA = udisks.service
+ endif # REMOTE_ACCESS_ENABLED
+
++if HAVE_SYSTEMD
++systemdsystemunit_DATA = \
++ udisks-daemon.service
++
++udisks-daemon.service: udisks-daemon.service.in
++ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
++endif
++
+ EXTRA_DIST = \
+ 80-udisks.rules \
+ $(dbusif_DATA) \
+@@ -42,7 +50,8 @@ EXTRA_DIST = \
+ $(dbusconf_in_files) \
+ udisks.pc.in \
+ udisks.service \
++ udisks-daemon.service.in \
+ $(NULL)
+
+ clean-local :
+- rm -f *~ $(service_DATA) $(dbusconf_DATA)
++ rm -f *~ $(service_DATA) $(dbusconf_DATA) udisks-daemon.service
+diff --git a/data/org.freedesktop.UDisks.service.in b/data/org.freedesktop.UDisks.service.in
+index b3606a6..6ba2cd0 100644
+--- a/data/org.freedesktop.UDisks.service.in
++++ b/data/org.freedesktop.UDisks.service.in
+@@ -2,4 +2,4 @@
+ Name=org.freedesktop.UDisks
+ Exec=@libexecdir@/udisks-daemon
+ User=root
+-
++SystemdService=udisks-daemon.service
+diff --git a/data/udisks-daemon.service.in b/data/udisks-daemon.service.in
+new file mode 100644
+index 0000000..78379b2
+--- /dev/null
++++ b/data/udisks-daemon.service.in
+@@ -0,0 +1,12 @@
++[Unit]
++Description=Disk Manager
++After=syslog.target
++
++[Service]
++Type=dbus
++BusName=org.freedesktop.UDisks
++ExecStart=@libexecdir@/udisks-daemon
++StandardOutput=syslog
++
++[Install]
++WantedBy=graphical.target
+--
+1.7.0.1
+
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
index b6448ef13b..fc5d95bd8c 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb
@@ -5,15 +5,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0"
# optional dependencies: device-mapper parted
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+
SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
file://optional-depends.patch"
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'systemd', 'file://add-systemd-support.patch', '', d)}"
+
SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b"
SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5"
-PR = "r5"
+PR = "r9"
-inherit autotools
+inherit autotools systemd
EXTRA_OECONF = "--disable-man-pages"
@@ -24,3 +28,9 @@ FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \
"
FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "udisks-daemon.service"
+SYSTEMD_AUTO_ENABLE = "disable"