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

login
register
mail settings
Submitter Martin Jansa
Date Feb. 22, 2012, 10:31 a.m.
Message ID <1156045bbeeb9730bc8a3243dd15c3285e196f2f.1329906640.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/21563/
State Accepted
Commit c81d25cd9b9ec6a20e19ef92c8e6dabc93e3feba
Headers show

Comments

Martin Jansa - Feb. 22, 2012, 10:31 a.m.
* people using sysvinit need to add something like
  PACKAGECONFIG = "${@base_contains('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'consolekit', 'systemd', d)}"
  or just
  PACKAGECONFIG = "consolekit"
  to their own .bbappend if they don't want to get systemd in their
  images.
* and for the rest it will 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(-)

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..1e2cccd 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 ??= "systemd"
+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"