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 | |
| parent | ba71c678ef8dd90b9c3ee075846ffa5f4c2605be (diff) | |
| download | meta-openembedded-contrib-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')
| -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 e4e634ab85..5c5ce26b26 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 \ # Needed for udev-extras DEPENDS = "gperf-native usbutils acl glib-2.0" -PR = "r2" +PR = "r3" # version specific SRC_URI SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ @@ -81,7 +81,7 @@ FILES_${PN} += "/lib/udev*" FILES_${PN}-dbg += "/lib/udev/.debug" FILES_${PN}-consolekit += "${libdir}/ConsoleKit" -RDEPENDS_${PN}-consolekit += "consolekit" +RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" do_install () { 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 b6484d9563..e14dde2b62 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 \ # Needed for udev-extras DEPENDS = "gperf-native usbutils acl glib-2.0" +PR = "r1" + # 6f410b81aa6d588b03ae795c9b76468591ef7efa -> 175 tag SRCREV = "6f410b81aa6d588b03ae795c9b76468591ef7efa" @@ -77,7 +79,7 @@ FILES_${PN} += "/lib/udev*" FILES_${PN}-dbg += "/lib/udev/.debug" FILES_${PN}-consolekit += "${libdir}/ConsoleKit" -RDEPENDS_${PN}-consolekit += "consolekit" +RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" do_install () { 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 1e0a02a6d4..9ca91bfcaa 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 \ # kmod: needed for libkmod DEPENDS = "gperf-native usbutils acl glib-2.0 util-linux kmod" +PR = "r1" + # version specific SRC_URI SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/${P}.tar.gz \ file://gtk-doc.make" @@ -73,7 +75,7 @@ FILES_${PN} += "/lib/udev*" FILES_${PN}-dbg += "/lib/udev/.debug" FILES_${PN}-consolekit += "${libdir}/ConsoleKit" -RDEPENDS_${PN}-consolekit += "consolekit" +RDEPENDS_${PN}-consolekit += "${@base_contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d)}" FILES_udev-utils = "${bindir}/udevadm" |