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

login
register
mail settings
Submitter Andreas Oberritter
Date March 5, 2012, 10:35 p.m.
Message ID <1330986957-24272-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/22719/
State New, archived
Headers show

Comments

Andreas Oberritter - March 5, 2012, 10:35 p.m.
* 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>
---
v1->v2: Instead of removing the package, drop the runtime
        dependency on consolekit.

 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 6, 2012, 8:54 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 05-03-12 23:35, Andreas Oberritter schreef:
> * 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> --- v1->v2:
> Instead of removing the package, drop the runtime dependency on
> consolekit.

It's only missing a PR bump now :)

regards,

Koen


> 
> 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..a111f11 100644 ---
> a/meta-oe/recipes-core/udev/udev_173.bb +++
> b/meta-oe/recipes-core/udev/udev_173.bb @@ -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..114dbe9 100644 ---
> a/meta-oe/recipes-core/udev/udev_175.bb +++
> b/meta-oe/recipes-core/udev/udev_175.bb @@ -77,7 +77,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..5e27706 100644 ---
> a/meta-oe/recipes-core/udev/udev_181.bb +++
> b/meta-oe/recipes-core/udev/udev_181.bb @@ -73,7 +73,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"
> 

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk9V0N8ACgkQMkyGM64RGpEd0gCcC49CpgTooJffNtAtfnDqUJhG
AzYAnA3AWyRgf+wGGXvHQeYIGlOjvHWM
=Zt3c
-----END PGP SIGNATURE-----
Andreas Oberritter - March 6, 2012, 12:26 p.m.
On 06.03.2012 09:54, Koen Kooi wrote:
> Op 05-03-12 23:35, Andreas Oberritter schreef:
>> * 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> --- v1->v2:
>> Instead of removing the package, drop the runtime dependency on
>> consolekit.
> 
> It's only missing a PR bump now :)

I don't thinks so, because with x11 nothing changes and without x11 udev
couldn't be built before (this is what the patch addresses).

Albeit, I'm going to send a patch with bumped PRs.

Regards,
Andreas

> 
> regards,
> 
> Koen
> 
> 
> 
>> 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..a111f11 100644 ---
>> a/meta-oe/recipes-core/udev/udev_173.bb +++
>> b/meta-oe/recipes-core/udev/udev_173.bb @@ -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..114dbe9 100644 ---
>> a/meta-oe/recipes-core/udev/udev_175.bb +++
>> b/meta-oe/recipes-core/udev/udev_175.bb @@ -77,7 +77,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..5e27706 100644 ---
>> a/meta-oe/recipes-core/udev/udev_181.bb +++
>> b/meta-oe/recipes-core/udev/udev_181.bb @@ -73,7 +73,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"
> 
> 
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Otavio Salvador - March 6, 2012, 1:01 p.m.
On Tue, Mar 6, 2012 at 09:26, Andreas Oberritter <obi@opendreambox.org> wrote:
> I don't thinks so, because with x11 nothing changes and without x11 udev
> couldn't be built before (this is what the patch addresses).
>
> Albeit, I'm going to send a patch with bumped PRs.

I think it is always safe to bump PR so it can trigger, if it is the
case,  a regression as soon as possible otherwise a subtle change chan
break stuff and being unnoticed for loooong time.
Andreas Oberritter - March 6, 2012, 1:20 p.m.
On 06.03.2012 14:01, Otavio Salvador wrote:
> On Tue, Mar 6, 2012 at 09:26, Andreas Oberritter <obi@opendreambox.org> wrote:
>> I don't thinks so, because with x11 nothing changes and without x11 udev
>> couldn't be built before (this is what the patch addresses).
>>
>> Albeit, I'm going to send a patch with bumped PRs.
> 
> I think it is always safe to bump PR so it can trigger, if it is the
> case,  a regression as soon as possible otherwise a subtle change chan
> break stuff and being unnoticed for loooong time.

Well, I don't share your opinion, but I guess it would save quite some
of my time submitting patches if I just blindly bumped every PR, no
matter whether the patch changes existing packages or not.

AFAIR, modified content of packages was the main criterion for PR bumps
in OE-classic.

Regards,
Andreas
Otavio Salvador - March 6, 2012, 2:14 p.m.
On Tue, Mar 6, 2012 at 10:20, Andreas Oberritter <obi@opendreambox.org> wrote:
> AFAIR, modified content of packages was the main criterion for PR bumps
> in OE-classic.

And sometimes content can change in subtle ways and being unnoticed
for loong time.

Patch

diff --git a/meta-oe/recipes-core/udev/udev_173.bb b/meta-oe/recipes-core/udev/udev_173.bb
index e4e634a..a111f11 100644
--- a/meta-oe/recipes-core/udev/udev_173.bb
+++ b/meta-oe/recipes-core/udev/udev_173.bb
@@ -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..114dbe9 100644
--- a/meta-oe/recipes-core/udev/udev_175.bb
+++ b/meta-oe/recipes-core/udev/udev_175.bb
@@ -77,7 +77,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..5e27706 100644
--- a/meta-oe/recipes-core/udev/udev_181.bb
+++ b/meta-oe/recipes-core/udev/udev_181.bb
@@ -73,7 +73,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"