Patchwork [meta-oe] udev: consolekit package requires x11

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 10, 2012, 10:11 p.m.
Message ID <4F359623.9080505@opendreambox.org>
Download mbox | patch
Permalink /patch/21149/
State New, archived
Headers show

Comments

Andreas Oberritter - Feb. 10, 2012, 10:11 p.m.
* consolekit fails to build without x11, so disable
  creation of udev-consolekit, if x11 is unavailable.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
* I build-tested udev-180 only.
* Related patch for OE-core:
  http://lists.linuxtogo.org/pipermail/openembedded-core/2012-February/017681.html

 meta-oe/recipes-core/udev/udev_173.bb |    2 +-
 meta-oe/recipes-core/udev/udev_175.bb |    2 +-
 meta-oe/recipes-core/udev/udev_180.bb |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

diff --git a/meta-oe/recipes-core/udev/udev_173.bb b/meta-oe/recipes-core/udev/udev_173.bb
index e4e634a..cbbe910 100644
--- a/meta-oe/recipes-core/udev/udev_173.bb
+++ b/meta-oe/recipes-core/udev/udev_173.bb
@@ -59,7 +59,7 @@  do_configure_prepend() {
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 04 S ."
 
-PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils udev-consolekit"
+PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils ${@base_contains('DISTRO_FEATURES', 'x11', 'udev-consolekit', '', d)}"
 
 FILES_${PN}-systemd = "${base_libdir}/systemd"
 RDEPENDS_${PN}-systemd += "udev"
diff --git a/meta-oe/recipes-core/udev/udev_175.bb b/meta-oe/recipes-core/udev/udev_175.bb
index b6484d9..6560b5d 100644
--- a/meta-oe/recipes-core/udev/udev_175.bb
+++ b/meta-oe/recipes-core/udev/udev_175.bb
@@ -55,7 +55,7 @@  do_configure_prepend() {
 	cp ${WORKDIR}/gtk-doc.make ${S}
 }
 
-PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils udev-consolekit"
+PACKAGES =+ "${PN}-systemd libudev libgudev udev-utils ${@base_contains('DISTRO_FEATURES', 'x11', 'udev-consolekit', '', d)}"
 
 FILES_${PN}-systemd = "${base_libdir}/systemd"
 RDEPENDS_${PN}-systemd += "udev"
diff --git a/meta-oe/recipes-core/udev/udev_180.bb b/meta-oe/recipes-core/udev/udev_180.bb
index 4cabcce..bc1b8a4 100644
--- a/meta-oe/recipes-core/udev/udev_180.bb
+++ b/meta-oe/recipes-core/udev/udev_180.bb
@@ -53,7 +53,7 @@  do_configure_prepend() {
 	cp ${WORKDIR}/gtk-doc.make ${S}
 }
 
-PACKAGES =+ "${PN}-systemd libudev libgudev udev-consolekit udev-utils"
+PACKAGES =+ "${PN}-systemd libudev libgudev ${@base_contains('DISTRO_FEATURES', 'x11', 'udev-consolekit', '', d)} udev-utils"
 
 FILES_${PN}-systemd = "${base_libdir}/systemd"
 RDEPENDS_${PN}-systemd += "udev"