diff options
-rw-r--r-- | meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch (renamed from meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-support/udisks/udisks_1.0.4.bb | 14 | ||||
-rw-r--r-- | meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend | 16 |
3 files changed, 12 insertions, 18 deletions
diff --git a/meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch b/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch index 29df8a4da4..29df8a4da4 100644 --- a/meta-systemd/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch +++ b/meta-oe/recipes-support/udisks/udisks/add-systemd-support.patch 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" 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 deleted file mode 100644 index 5f30216448..0000000000 --- a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -inherit systemd - -PRINC := "${@int(PRINC) + 3}" - -# look for files in the layer first -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -DEPENDS += "systemd" - -SRC_URI += "file://add-systemd-support.patch" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "udisks-daemon.service" -SYSTEMD_AUTO_ENABLE = "disable" |