diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:23:17 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:04 +0200 |
commit | ab198bbcfae9239c761e412e800d497bdd8bedf4 (patch) | |
tree | 6527c5ffa4c262abf6e6ef473e53d89a6286da90 | |
parent | 443ea30263cf4a6382ff7c647130bbe7604f6296 (diff) | |
download | meta-openembedded-ab198bbcfae9239c761e412e800d497bdd8bedf4.tar.gz |
udisks: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-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 29df8a4da..29df8a4da 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 b6448ef13..fc5d95bd8 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" | |||
5 | DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0" | 5 | DEPENDS = "libatasmart sg3-utils polkit udev dbus-glib glib-2.0" |
6 | # optional dependencies: device-mapper parted | 6 | # optional dependencies: device-mapper parted |
7 | 7 | ||
8 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | ||
9 | |||
8 | SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ | 10 | SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ |
9 | file://optional-depends.patch" | 11 | file://optional-depends.patch" |
10 | 12 | ||
13 | SRC_URI += "${@base_contains('DISTRO_FEATURES', 'systemd', 'file://add-systemd-support.patch', '', d)}" | ||
14 | |||
11 | SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b" | 15 | SRC_URI[udisks.md5sum] = "86c63b2b5484f2060499a052b5b6256b" |
12 | SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5" | 16 | SRC_URI[udisks.sha256sum] = "854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5" |
13 | 17 | ||
14 | PR = "r5" | 18 | PR = "r9" |
15 | 19 | ||
16 | inherit autotools | 20 | inherit autotools systemd |
17 | 21 | ||
18 | EXTRA_OECONF = "--disable-man-pages" | 22 | EXTRA_OECONF = "--disable-man-pages" |
19 | 23 | ||
@@ -24,3 +28,9 @@ FILES_${PN} += "${libdir}/polkit-1/extensions/*.so \ | |||
24 | " | 28 | " |
25 | 29 | ||
26 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug" | 30 | FILES_${PN}-dbg += "${base_libdir}/udev/.debug" |
31 | |||
32 | RPROVIDES_${PN} += "${PN}-systemd" | ||
33 | RREPLACES_${PN} += "${PN}-systemd" | ||
34 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
35 | SYSTEMD_SERVICE_${PN} = "udisks-daemon.service" | ||
36 | 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 5f3021644..000000000 --- a/meta-systemd/meta-oe/recipes-support/udisks/udisks_1.0.4.bbappend +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | inherit systemd | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 3}" | ||
4 | |||
5 | # look for files in the layer first | ||
6 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
7 | |||
8 | DEPENDS += "systemd" | ||
9 | |||
10 | SRC_URI += "file://add-systemd-support.patch" | ||
11 | |||
12 | RPROVIDES_${PN} += "${PN}-systemd" | ||
13 | RREPLACES_${PN} += "${PN}-systemd" | ||
14 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
15 | SYSTEMD_SERVICE_${PN} = "udisks-daemon.service" | ||
16 | SYSTEMD_AUTO_ENABLE = "disable" | ||