polkit and task-illume fix
cover polkit and task-illume fix
The following changes since commit 143367e4f584ea7054dca2a466f410a46d02e6b1:
busybox: create /etc/default on do_install (2012-02-20 22:55:28 +0100)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull
Martin Jansa (2):
polkit: enable and disable systemd/consolekit support explicitly
task-x11-illume: change default ETHEME from e-wm-theme-illume to
e-wm-theme-default
meta-efl/recipes-efl/tasks/task-x11-illume.bb | 6 +++--- .../recipes-extended/polkit/polkit_0.104.bbappend | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.8.4
PATCH 1/2 polkit: enable and disable systemd/consolekit support explicitly
* 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
--- .../recipes-extended/polkit/polkit_0.104.bbappend | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
meta-oe/recipes-extended/polkit/polkit_0.104.bbappend +5 -2
@@ -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"
Signature · 1 line
1.7.8.4
PATCH 2/2 task-x11-illume: change default ETHEME from e-wm-theme-illume to e-wm-theme-default
* e-wm-theme-illume is gone with illume1 (see b37564b7355af71595ac48b96bcf7d2087e47c73)
* found by accident when running distroless build, guess everybody is using own theme anyway
--- meta-efl/recipes-efl/tasks/task-x11-illume.bb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
meta-efl/recipes-efl/tasks/task-x11-illume.bb +3 -3
@@ -3,14 +3,14 @@ SECTION = "x11/wm" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${TOPDIR}/meta-openembedded/meta-efl/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PV = "1.0" -PR = "r1" +PR = "r2" # WORK IN PROGRESS inherit task -# Default illume theme -ETHEME ?= "e-wm-theme-illume" +# Default theme and config +ETHEME ?= "e-wm-theme-default" ECONFIG ?= "e-wm-config-illume2" RDEPENDS_${PN} = "\
Signature · 1 line
1.7.8.4
Re: [meta-oe][meta-efl][PATCH 1/2] polkit: enable and disable systemd/consolekit support explicitly
In reply to Martin Jansa-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Op 20-02-12 23:13, Martin Jansa schreef:
Quoted 18 lines
* 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 <[email protected]> ---.../recipes-extended/polkit/polkit_0.104.bbappend | 7 +++++-- 1 files
changed, 5 insertions(+), 2 deletions(-)(quoted diff) +0
-0b/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 @@
(quoted diff) +0
-2-DEPENDS += "systemd" +PRINC := "${@int(PRINC) + 3}" -PRINC = "1" +PACKAGECONFIG ??=
Quoted 5 lines
"${@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-----
Re: [meta-oe][meta-efl][PATCH 1/2] polkit: enable and disable systemd/consolekit support explicitly
Quoted 21 lines · Koen Kooi
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Op 20-02-12 23:13, Martin Jansa schreef:
Quoted 17 lines
* 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 <[email protected]> ---.../recipes-extended/polkit/polkit_0.104.bbappend | 7 +++++-- 1 files
changed, 5 insertions(+), 2 deletions(-)(quoted diff) +0
-0b/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}"
Quoted 8 lines
Quoted 6 lines
-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,
Quoted 14 lines
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.orgiEYEARECAAYFAk9EqLAACgkQMkyGM64RGpF9nACeJIMiWeUkdZ1f7HlDT669DohK xaEAoIbezxgzLUg97K500qpxDn1rPzH8
=XcOs
-----END PGP SIGNATURE-----_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]