From patchwork Fri Feb 8 15:20:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCHv2] packagegroup-core-boot: add VIRTUAL-RUNTIME_network_manager Date: Fri, 08 Feb 2013 15:20:33 -0000 From: ml@communistcode.co.uk X-Patchwork-Id: 44345 Message-Id: <1360336833-14523-1-git-send-email-ml@communistcode.co.uk> To: openembedded-core@lists.openembedded.org Cc: Jack Mitchell From: Jack Mitchell 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 --- 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