[OE-core] [PATCH v4 7/8] task-base: remove modutils reference.

[Koen Kooi]

Op 1 jul 2011, om 09:06 heeft Anders Darander het volgende geschreven:

> Also remove the other kernel24 references.
> Make everything dependent on kernel26 default.

Since there will be only one of each, can we just completely scrap there variables and put the items directly in the tasks?

regards,

Koen

> Signed-off-by: Anders Darander <anders at chargestorm.se>
> ---
> meta/recipes-core/tasks/task-base.bb |   24 ++++--------------------
> 1 files changed, 4 insertions(+), 20 deletions(-)
> 
> diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
> index 3ff57ff..62432b4 100644
> --- a/meta/recipes-core/tasks/task-base.bb
> +++ b/meta/recipes-core/tasks/task-base.bb
> @@ -45,7 +45,7 @@ PACKAGES = ' \
>             ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
>             ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
>             \
> -            ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
> +            task-base-kernel26 \
>             '
> 
> ALLOW_EMPTY = "1"
> @@ -58,12 +58,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
> #
> # linux-hotplug or none
> #
> -HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24",  "linux-hotplug","",d)} "
> +HOTPLUG ?= ""
> 
> #
> # pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others
> #
> -PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} "
> +PCMCIA_MANAGER ?= "pcmciautils"
> 
> #
> # those ones can be set in machine config to supply packages needed to get machine booting
> @@ -79,7 +79,7 @@ RDEPENDS_task-base = "\
>     task-machine-base \
>     ${HOTPLUG} \
>     \
> -    ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \
> +    task-base-kernel26 \
>     ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
>     ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
>     ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
> @@ -155,17 +155,10 @@ RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
> RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
> RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
> 
> -RDEPENDS_task-base-kernel24 = "\
> -    modutils-depmod"
> -
> RDEPENDS_task-base-kernel26 = "\
>     sysfsutils \
>     module-init-tools"
> 
> -RRECOMMENDS_task-base-kernel24 = "\
> -    kernel-module-input \
> -    kernel-module-uinput"
> -
> RRECOMMENDS_task-base-kernel26 = "\
>     kernel-module-nls-utf8 \
>     kernel-module-input \
> @@ -221,21 +214,12 @@ RDEPENDS_task-base-pcmcia = "\
> 
> 
> RRECOMMENDS_task-base-pcmcia = "\
> -    ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
>     kernel-module-pcmcia \
>     kernel-module-airo-cs \
>     kernel-module-pcnet-cs \
>     kernel-module-serial-cs \
>     kernel-module-ide-cs \
>     kernel-module-ide-disk \
> -    "
> -
> -task-base-pcmcia24 = "\
> -    ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \
> -    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \
> -    "
> -
> -task-base-pcmcia26 = "\
>     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
>     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
>     ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core