Also remove the other kernel24 references.
Make everything dependent on kernel26 default.
Move the RDEPENDS- and RRECOMMENDS_task-base-kernel26 to _task-base.
Signed-off-by: Anders Darander <and...@chargestorm.se>
---
meta/recipes-core/tasks/task-base.bb | 49 ++++++++++-----------------------
1 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/meta/recipes-core/tasks/task-base.bb
b/meta/recipes-core/tasks/task-base.bb
index 3ff57ff..7726698 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -45,7 +45,6 @@ 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)}
\
'
ALLOW_EMPTY = "1"
@@ -58,12 +57,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 +78,8 @@ RDEPENDS_task-base = "\
task-machine-base \
${HOTPLUG} \
\
- ${@base_contains('MACHINE_FEATURES',
'kernel26','task-base-kernel26','task-base-kernel24',d)} \
+ sysfsutils \
+ module-init-tools \
${@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)} \
@@ -112,6 +112,17 @@ RDEPENDS_task-base = "\
"
# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS
on it in
+
+RRECOMMENDS_task-base = "\
+ kernel-module-nls-utf8 \
+ kernel-module-input \
+ kernel-module-uinput \
+ kernel-module-rtc-dev \
+ kernel-module-rtc-proc \
+ kernel-module-rtc-sysfs \
+ kernel-module-rtc-sa1100 \
+ kernel-module-unix"
+
RDEPENDS_task-base-extended = "\
task-base \
${ADD_WIFI} \
@@ -155,27 +166,6 @@ 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 \
- kernel-module-uinput \
- kernel-module-rtc-dev \
- kernel-module-rtc-proc \
- kernel-module-rtc-sysfs \
- kernel-module-rtc-sa1100 \
- kernel-module-unix"
-
RDEPENDS_task-base-keyboard = "\
keymaps"
@@ -221,21 +211,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@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
