[oe-commits] org.oe.dev task-base: added support for 2.4 kernels

[hrw commit]

task-base: added support for 2.4 kernels

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 7d963e964e936eba57b2b0077da51b9a869407b4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7d963e964e936eba57b2b0077da51b9a869407b4
Files:
1
packages/tasks/task-base.bb
Diffs:

#
# mt diff -r0db4d78759076912f75e625b2666d1c5fe129899 -r7d963e964e936eba57b2b0077da51b9a869407b4
#
# 
# 
# patch "packages/tasks/task-base.bb"
#  from [3fd652d208ce4fa3e6c0f30241e7d5a46e9346c8]
#    to [8024fda9f7bab952ec00dcb4cc0564307ac0b2e7]
# 
============================================================
--- packages/tasks/task-base.bb	3fd652d208ce4fa3e6c0f30241e7d5a46e9346c8
+++ packages/tasks/task-base.bb	8024fda9f7bab952ec00dcb4cc0564307ac0b2e7
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r14"
+PR = "r15"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -49,6 +49,7 @@ RDEPENDS_task-base = "\
 RDEPENDS_task-base = "\
     ${DISTRO_CORE_PACKAGE} \
     kernel \
+    ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
     ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \
@@ -123,6 +124,8 @@ RRECOMMENDS_task-base-core-default = '\
 RRECOMMENDS_task-base-core-default = '\
     dropbear '
 
+task-base-kernel24-rdepends = "\
+    linux-hotplug "
 
 task-base-kernel26-rdepends = "\
     udev \
@@ -176,6 +179,13 @@ task-base-pcmcia-rrecommends = "\
     kernel-module-pcnet-cs \
     kernel-module-serial-cs \
     kernel-module-ide-cs \
+    ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
+
+task-base-pcmcia24-rrecommends = "\
+    ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \
+    ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}"
+
+task-base-pcmcia26-rrecommends = "\
     ${@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)}"