diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-03-06 12:32:44 +0000 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-03-07 15:17:13 +0100 |
commit | 5b3974ed483418b206678acca7414b81bcf749a7 (patch) | |
tree | 22af4e51ba49139ecd9d7100c1ba6946f4a1192e /meta-oe/recipes-core | |
parent | ba71c678ef8dd90b9c3ee075846ffa5f4c2605be (diff) | |
download | meta-openembedded-5b3974ed483418b206678acca7414b81bcf749a7.tar.gz |
udev: consolekit package requires x11
* consolekit fails to build without x11, so drop the
runtime dependency on consolekit if x11 is unavailable.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r-- | meta-oe/recipes-core/udev/udev_173.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-core/udev/udev_175.bb | 4 | ||||
-rw-r--r-- | meta-oe/recipes-core/udev/udev_181.bb | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/meta-oe/recipes-core/udev/udev_173.bb b/meta-oe/recipes-core/udev/udev_173.bb index e4e634ab8..5c5ce26b2 100644 --- a/meta-oe/recipes-core/udev/udev_173.bb +++ b/meta-oe/recipes-core/udev/udev_173.bb | |||
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
16 | # Needed for udev-extras | 16 | # Needed for udev-extras |
17 | DEPENDS = "gperf-native usbutils acl glib-2.0" | 17 | DEPENDS = "gperf-native usbutils acl glib-2.0" |
18 | 18 | ||
19 | PR = "r2" | 19 | PR = "r3" |
20 | 20 | ||
21 | # version specific SRC_URI | 21 | # version specific SRC_URI |
22 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ | 22 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ |
@@ -81,7 +81,7 @@ FILES_${PN} += "/lib/udev*" | |||
81 | FILES_${PN}-dbg += "/lib/udev/.debug" | 81 | FILES_${PN}-dbg += "/lib/udev/.debug" |
82 | 82 | ||
83 | FILES_${PN}-consolekit += "${libdir}/ConsoleKit" | 83 | FILES_${PN}-consolekit += "${libdir}/ConsoleKit" |
84 | RDEPENDS_${PN}-consolekit += "consolekit" | 84 | RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" |
85 | 85 | ||
86 | do_install () { | 86 | do_install () { |
87 | install -d ${D}${usrsbindir} \ | 87 | install -d ${D}${usrsbindir} \ |
diff --git a/meta-oe/recipes-core/udev/udev_175.bb b/meta-oe/recipes-core/udev/udev_175.bb index b6484d956..e14dde2b6 100644 --- a/meta-oe/recipes-core/udev/udev_175.bb +++ b/meta-oe/recipes-core/udev/udev_175.bb | |||
@@ -18,6 +18,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ | |||
18 | # Needed for udev-extras | 18 | # Needed for udev-extras |
19 | DEPENDS = "gperf-native usbutils acl glib-2.0" | 19 | DEPENDS = "gperf-native usbutils acl glib-2.0" |
20 | 20 | ||
21 | PR = "r1" | ||
22 | |||
21 | # 6f410b81aa6d588b03ae795c9b76468591ef7efa -> 175 tag | 23 | # 6f410b81aa6d588b03ae795c9b76468591ef7efa -> 175 tag |
22 | SRCREV = "6f410b81aa6d588b03ae795c9b76468591ef7efa" | 24 | SRCREV = "6f410b81aa6d588b03ae795c9b76468591ef7efa" |
23 | 25 | ||
@@ -77,7 +79,7 @@ FILES_${PN} += "/lib/udev*" | |||
77 | FILES_${PN}-dbg += "/lib/udev/.debug" | 79 | FILES_${PN}-dbg += "/lib/udev/.debug" |
78 | 80 | ||
79 | FILES_${PN}-consolekit += "${libdir}/ConsoleKit" | 81 | FILES_${PN}-consolekit += "${libdir}/ConsoleKit" |
80 | RDEPENDS_${PN}-consolekit += "consolekit" | 82 | RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" |
81 | 83 | ||
82 | do_install () { | 84 | do_install () { |
83 | install -d ${D}${usrsbindir} \ | 85 | install -d ${D}${usrsbindir} \ |
diff --git a/meta-oe/recipes-core/udev/udev_181.bb b/meta-oe/recipes-core/udev/udev_181.bb index 1e0a02a6d..9ca91bfca 100644 --- a/meta-oe/recipes-core/udev/udev_181.bb +++ b/meta-oe/recipes-core/udev/udev_181.bb | |||
@@ -19,6 +19,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | |||
19 | # kmod: needed for libkmod | 19 | # kmod: needed for libkmod |
20 | DEPENDS = "gperf-native usbutils acl glib-2.0 util-linux kmod" | 20 | DEPENDS = "gperf-native usbutils acl glib-2.0 util-linux kmod" |
21 | 21 | ||
22 | PR = "r1" | ||
23 | |||
22 | # version specific SRC_URI | 24 | # version specific SRC_URI |
23 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/${P}.tar.gz \ | 25 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/${P}.tar.gz \ |
24 | file://gtk-doc.make" | 26 | file://gtk-doc.make" |
@@ -73,7 +75,7 @@ FILES_${PN} += "/lib/udev*" | |||
73 | FILES_${PN}-dbg += "/lib/udev/.debug" | 75 | FILES_${PN}-dbg += "/lib/udev/.debug" |
74 | 76 | ||
75 | FILES_${PN}-consolekit += "${libdir}/ConsoleKit" | 77 | FILES_${PN}-consolekit += "${libdir}/ConsoleKit" |
76 | RDEPENDS_${PN}-consolekit += "consolekit" | 78 | RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" |
77 | 79 | ||
78 | FILES_udev-utils = "${bindir}/udevadm" | 80 | FILES_udev-utils = "${bindir}/udevadm" |
79 | 81 | ||