[OE-core] [PATCH 1/1] default-distrovars.inc, task-core-boot.bb: Create distro overridable varibales

[Koen Kooi]

Op 17 mei 2011, om 22:57 heeft Khem Raj het volgende geschreven:

> With default-setup being pulled in via bitbake.conf and task-core-boot
> being pulled into all images in distros, we need
> to have some variables that distro's can override if need be
> This is a backport from angstrom/OE. It will help distros which
> e.g. would like to use busybox-mdev instead of udev and similarly
> for login manager these variables can be defined in distro policies

The whole idea of IMAGE vars is that they can be overridden by image recipes. Putting the vars in a tasks defeats that.

regards,

Koen



> 
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
> meta/conf/distro/include/default-distrovars.inc |   13 +++++++++++++
> meta/recipes-core/tasks/task-core-boot.bb       |    8 ++++----
> 2 files changed, 17 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
> index 9b1d0ee..3b78d66 100644
> --- a/meta/conf/distro/include/default-distrovars.inc
> +++ b/meta/conf/distro/include/default-distrovars.inc
> @@ -6,6 +6,19 @@ OEINCLUDELOGS ?= "yes"
> KERNEL_CONSOLE ?= "ttyS0"
> 
> PCMCIA_MANAGER ?= "pcmciautils"
> +#
> +# udev, devfsd, busybox-mdev (from busybox) or none
> +#
> +IMAGE_DEV_MANAGER ?= "udev"
> +#
> +# sysvinit, upstart
> +#
> +IMAGE_INIT_MANAGER ?= "sysvinit"
> +IMAGE_INITSCRIPTS ?= "initscripts"
> +#
> +# tinylogin, getty
> +#
> +IMAGE_LOGIN_MANAGER ?= "tinylogin"
> 
> IMAGE_LINGUAS ?= "en-us en-gb"
> LIMIT_BUILT_LOCALES ?= "POSIX en_US en_GB"
> diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/tasks/task-core-boot.bb
> index 5aea771..af2c2ee 100644
> --- a/meta/recipes-core/tasks/task-core-boot.bb
> +++ b/meta/recipes-core/tasks/task-core-boot.bb
> @@ -21,13 +21,13 @@ RDEPENDS_task-core-boot = "\
>     base-files \
>     base-passwd \
>     busybox \
> -    initscripts \
> +    ${IMAGE_INITSCRIPTS} \
>     ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
>     modutils-initscripts \
>     netbase \
> -    sysvinit \
> -    tinylogin \
> -    udev \
> +    ${IMAGE_INIT_MANAGER} \
> +    ${IMAGE_LOGIN_MANAGER} \
> +    ${IMAGE_DEV_MANAGER} \
>     ${VIRTUAL-RUNTIME_update-alternatives} \
>     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
> 
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core