Patchwork [meta-oe,2/2,resend] udev: consolekit package requires x11

login
register
mail settings
Submitter Andreas Oberritter
Date March 1, 2012, 12:20 p.m.
Message ID <1330604440-8121-2-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/22529/
State New, archived
Headers show

Comments

Andreas Oberritter - March 1, 2012, 12:20 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>
---
 meta-oe/recipes-core/udev/udev_173.bb |    2 +-
 meta-oe/recipes-core/udev/udev_175.bb |    2 +-
 meta-oe/recipes-core/udev/udev_181.bb |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Koen Kooi - March 2, 2012, 8:17 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 01-03-12 13:20, Andreas Oberritter schreef:
> * consolekit fails to build without x11, so disable creation of
> udev-consolekit, if x11 is unavailable.
> 
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- 
> meta-oe/recipes-core/udev/udev_173.bb |    2 +- 
> meta-oe/recipes-core/udev/udev_175.bb |    2 +- 
> meta-oe/recipes-core/udev/udev_181.bb |    2 +- 3 files changed, 3
> insertions(+), 3 deletions(-)
> 
> 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)}"

What does this actually accomplish? If the package is empty it won't get
generated anyway and if it isn't empty you just introduced a QA error.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk9QggsACgkQMkyGM64RGpE5IACgh7qgjWEzWhgUWGBMxCjM86GY
lD4AnRj/2+bgRdsJAt/PJ0Xm0jmK+rVb
=9tpQ
-----END PGP SIGNATURE-----
Andreas Oberritter - March 2, 2012, 2:49 p.m.
On 02.03.2012 09:17, Koen Kooi wrote:
> Op 01-03-12 13:20, Andreas Oberritter schreef:
>> * consolekit fails to build without x11, so disable creation of
>> udev-consolekit, if x11 is unavailable.
> 
>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- 
>> meta-oe/recipes-core/udev/udev_173.bb |    2 +- 
>> meta-oe/recipes-core/udev/udev_175.bb |    2 +- 
>> meta-oe/recipes-core/udev/udev_181.bb |    2 +- 3 files changed, 3
>> insertions(+), 3 deletions(-)
> 
>> 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)}"
> 
> What does this actually accomplish? If the package is empty it won't get
> generated anyway and if it isn't empty you just introduced a QA error.

The recipe contains:

RDEPENDS_${PN}-consolekit += "consolekit"

Therefore, consolekit gets built when building udev, but fails:

ERROR: Nothing RPROVIDES 'consolekit' (but .../meta-oe/recipes-core/udev/udev_181.bb RDEPENDS on or otherwise requires it)
ERROR: consolekit was skipped: 'x11' not in DISTRO_FEATURES
NOTE: Runtime target 'consolekit' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['consolekit']
ERROR: Required build target 'udev' has no buildable providers.
Missing or unbuildable dependency chain was: ['udev', 'consolekit']

That's what the patch is addressing. Which alternative
would you suggest instead? To omit the runtime dependency?

About the QA error, if this is the error you're referring to,
then the warning is not very helpful:

WARNING: For recipe udev, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/sbin

Regards,
Andreas

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_181.bb b/meta-oe/recipes-core/udev/udev_181.bb
index 1e0a02a..99b66b1 100644
--- a/meta-oe/recipes-core/udev/udev_181.bb
+++ b/meta-oe/recipes-core/udev/udev_181.bb
@@ -54,7 +54,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"