On 08/02/13 15:20, [email protected] wrote:
From: Jack Mitchell <[email protected]>
Now netbase has been split into netbase and init-ifupdown, the user should
be able to make a choice on which network manager to install, and not be
forced to install init-ifupdown alongside if they wish to use a vanilla copy
of packagegroup-core-boot
v2:
- Update packagage-core-x11-sato to use the new variable
Signed-off-by: Jack Mitchell <[email protected]>
---
meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 3 ++-
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index b9183a8..a714879 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -29,6 +29,7 @@ VIRTUAL-RUNTIME_login_manager ?= "tinylogin"
VIRTUAL-RUNTIME_init_manager ?= "${DISTRO_FEATURES_INITMAN}"
VIRTUAL-RUNTIME_initscripts ?= "${@base_contains('DISTRO_FEATURES', 'sysvinit',
'initscripts', '',d)}"
VIRTUAL-RUNTIME_keymaps ?= "keymaps"
+VIRTUAL-RUNTIME_network_manager ?= "init-ifupdown"
RDEPENDS_${PN} = "\
base-files \
@@ -38,7 +39,7 @@ RDEPENDS_${PN} = "\
${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}",
"", d)} \
modutils-initscripts \
netbase \
- init-ifupdown \
+ ${VIRTUAL-RUNTIME_network_manager} \
${VIRTUAL-RUNTIME_login_manager} \
${VIRTUAL-RUNTIME_init_manager} \
${VIRTUAL-RUNTIME_initscripts} \
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index a4413be..7c000ab 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -26,6 +26,8 @@ RDEPENDS_${PN} = "\
NETWORK_MANAGER ?= "connman-gnome"
NETWORK_MANAGER_libc-uclibc = ""
+VIRTUAL-RUNTIME_network_manager = "${NETWORK_MANAGER}"
+
SUMMARY_${PN}-base = "Sato desktop - base packages"
RDEPENDS_${PN}-base = "\
matchbox-desktop \
@@ -40,7 +42,6 @@ RDEPENDS_${PN}-base = "\
gtk-sato-engine \
shutdown-desktop \
libsdl \
- ${NETWORK_MANAGER} \
"
# pcmanfm doesn't work on mips
Ok, this isn't going to work as I intended, VIRTUAL-RUNTIME can only be
set in the distro configuration so we can't have it set on a per image
basis. I'm not sure how the best way to solve this is now, suggestions
welcomed...
Regards,
--
Jack Mitchell ([email protected])
Embedded Systems Engineer
http://www.embed.me.uk
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
