On Fri, Feb 08, 2013 at 03:20:33PM +0000, [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}"
Please use ?= here too
> +
> 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
> --
> 1.8.1.2
>
>
> _______________________________________________
> Openembedded-core mailing list
> [email protected]
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
