[oe-commits] org.oe.dev task-base: make task-boot machine specific

[koen commit]

task-base: make task-boot machine specific

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

#
# mt diff -rfb5940a0605a415bd4ca2d3ceee188a5f1da10c9 -r46a4a2ecf44f4339cc7dc7abad48e7c20f490825
#
# 
# 
# patch "packages/tasks/task-base.bb"
#  from [90cce60dc8f85e7f343c2d67ef90b56dbc8b7452]
#    to [ed0ce0f5bd8f741006c8ba90bbe09cda33f82c83]
# 
============================================================
--- packages/tasks/task-base.bb	90cce60dc8f85e7f343c2d67ef90b56dbc8b7452
+++ packages/tasks/task-base.bb	ed0ce0f5bd8f741006c8ba90bbe09cda33f82c83
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r27"
+PR = "r28"
 
 PACKAGES = 'task-boot \
             task-base \
@@ -41,6 +41,7 @@ PACKAGE_ARCH_task-base = "${MACHINE_ARCH
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
 PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
+PACKAGE_ARCH_task-boot = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
 PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
@@ -199,7 +200,7 @@ RDEPENDS_task-base-pcmcia = "\
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \
     ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \
-    ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-conf', '',d)}"
+    "
 
 RRECOMMENDS_task-base-pcmcia = "\
     ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \
@@ -213,11 +214,10 @@ task-base-pcmcia24 = "\
 
 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)}"
 
 RDEPENDS_task-base-bluetooth = "\