From 14a5f1174c96f25c7dffc17902043f9be0e716f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 10 Jun 2012 21:46:42 +0000 Subject: [PATCH] udisks: move systemd support to meta-systemd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- meta-oe/recipes-support/udisks/udisks_1.0.4.bb | 10 +++------- .../udisks/udisks/add-systemd-support.patch | 0 .../recipes-support/udisks/udisks_1.0.4.bbappend | 13 +++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) rename {meta-oe => meta-systemd/meta-oe}/recipes-support/udisks/udisks/add-systemd-support.patch (100%) create mode 100644 meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend 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 0018a5ffed..b6448ef13b 100644 --- a/meta-oe/recipes-support/udisks/udisks_1.0.4.bb +++ b/meta-oe/recipes-support/udisks/udisks_1.0.4.bb @@ -2,22 +2,18 @@ DESCRIPTION = "A storage daemon that implements well-defined D-Bus interfaces th LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273" -DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0 systemd" +DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0" # optional dependencies: device-mapper parted SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ - file://add-systemd-support.patch \ file://optional-depends.patch" SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b" SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5" -PR = "r4" +PR = "r5" -inherit autotools systemd - -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service" +inherit autotools EXTRA_OECONF = "--disable-man-pages" diff --git a/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch b/meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch similarity index 100% rename from meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch rename to meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend new file mode 100644 index 0000000000..f6470c9477 --- /dev/null +++ b/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend @@ -0,0 +1,13 @@ +inherit systemd + +PRINC := "${@int(PRINC) + 1}" + +# look for files in the layer first +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +DEPENDS += "systemd" + +SRC_URI += "file://add-systemd-support.patch" + +SYSTEMD_PACKAGES = "${PN}-systemd" +SYSTEMD_SERVICE_${PN}-systemd = "udisks-daemon.service"