Patchwork [meta-oe,meta-efl,1/2] polkit: enable and disable systemd/consolekit support explicitly

login
register
mail settings
Submitter Martin Jansa
Date Feb. 20, 2012, 10:13 p.m.
Message ID <39ee8c2d0d24a2c80eca0afdff9b19ced16f6034.1329775974.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/21441/
State Superseded
Headers show

Comments

Martin Jansa - Feb. 20, 2012, 10:13 p.m.
* people using sysvinit already have or can set something like
  task-core-boot.bb does VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
  to disable systemd explicitly (so it's not picked by shlib when it's
  available because other packages).
* and for the rest it will disable consolekit and enable systemd
  explititly

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-extended/polkit/polkit_0.104.bbappend  |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
Koen Kooi - Feb. 22, 2012, 8:35 a.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 20-02-12 23:13, Martin Jansa schreef:
> * people using sysvinit already have or can set something like 
> task-core-boot.bb does VIRTUAL-RUNTIME_init_manager ?= "sysvinit" to
> disable systemd explicitly (so it's not picked by shlib when it's 
> available because other packages). * and for the rest it will disable
> consolekit and enable systemd explititly
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- 
> .../recipes-extended/polkit/polkit_0.104.bbappend  |    7 +++++-- 1 files
> changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend index
> 3c43970..d649f61 100644 ---
> a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend +++
> b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend @@ -1,3 +1,6 @@ 
> -DEPENDS += "systemd" +PRINC := "${@int(PRINC) + 3}"
> 
> -PRINC = "1" +PACKAGECONFIG ??=
> "${@base_contains('VIRTUAL-RUNTIME_init_manager', 'sysvinit',
> 'consolekit', 'systemd', d)}" +PACKAGECONFIG[systemd] =
> "--enable-systemd,--disable-systemd,systemd" +# there is no
> --enable/--disable option for consolekit and it's not picked by shlibs,
> so add it to RDEPENDS +PACKAGECONFIG[consolekit] = ",,,consolekit"

I really don't want to use runtime vars to trigger buildtime deps :(
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk9EqLAACgkQMkyGM64RGpF9nACeJIMiWeUkdZ1f7HlDT669DohK
xaEAoIbezxgzLUg97K500qpxDn1rPzH8
=XcOs
-----END PGP SIGNATURE-----
Martin Jansa - Feb. 22, 2012, 8:56 a.m.
On Wed, Feb 22, 2012 at 09:35:09AM +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Op 20-02-12 23:13, Martin Jansa schreef:
> > * people using sysvinit already have or can set something like 
> > task-core-boot.bb does VIRTUAL-RUNTIME_init_manager ?= "sysvinit" to
> > disable systemd explicitly (so it's not picked by shlib when it's 
> > available because other packages). * and for the rest it will disable
> > consolekit and enable systemd explititly
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- 
> > .../recipes-extended/polkit/polkit_0.104.bbappend  |    7 +++++-- 1 files
> > changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
> > b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend index
> > 3c43970..d649f61 100644 ---
> > a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend +++
> > b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend @@ -1,3 +1,6 @@ 
> > -DEPENDS += "systemd" +PRINC := "${@int(PRINC) + 3}"
> > 
> > -PRINC = "1" +PACKAGECONFIG ??=
> > "${@base_contains('VIRTUAL-RUNTIME_init_manager', 'sysvinit',
> > 'consolekit', 'systemd', d)}" +PACKAGECONFIG[systemd] =
> > "--enable-systemd,--disable-systemd,systemd" +# there is no
> > --enable/--disable option for consolekit and it's not picked by shlibs,
> > so add it to RDEPENDS +PACKAGECONFIG[consolekit] = ",,,consolekit"
> 
> I really don't want to use runtime vars to trigger buildtime deps :(

But as VIRTUAL-RUNTIME_* should be consistent for whole build, then you
can consider them as distro level PREFERRED_PROVIDERS for runtime.

But if you want I'll send v2 with just PACKAGECONFIG definition changed
to

PACKAGECONFIG ??= "systemd"

so that people with sysvinit can still easily overwrite it from .bbappend.

Cheers,

> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (Darwin)
> Comment: GPGTools - http://gpgtools.org
> 
> iEYEARECAAYFAk9EqLAACgkQMkyGM64RGpF9nACeJIMiWeUkdZ1f7HlDT669DohK
> xaEAoIbezxgzLUg97K500qpxDn1rPzH8
> =XcOs
> -----END PGP SIGNATURE-----
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
index 3c43970..d649f61 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
+++ b/meta-oe/recipes-extended/polkit/polkit_0.104.bbappend
@@ -1,3 +1,6 @@ 
-DEPENDS += "systemd"
+PRINC := "${@int(PRINC) + 3}"
 
-PRINC = "1"
+PACKAGECONFIG ??= "${@base_contains('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'consolekit', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
+# there is no --enable/--disable option for consolekit and it's not picked by shlibs, so add it to RDEPENDS
+PACKAGECONFIG[consolekit] = ",,,consolekit"