[oe-commits] Andreas Oberritter : udev: consolekit package requires x11

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 5b3974ed483418b206678acca7414b81bcf749a7
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=5b3974ed483418b206678acca7414b81bcf749a7

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Tue Mar  6 12:32:44 2012 +0000

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 at opendreambox.org>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 meta-oe/recipes-core/udev/udev_173.bb |    4 ++--
 meta-oe/recipes-core/udev/udev_175.bb |    4 +++-
 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 e4e634a..5c5ce26 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 b6484d9..e14dde2 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 1e0a02a..9ca91bf 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"