[oe-commits] org.oe.dev task-base: Make "wifi" belong to COMBINED_FEATURES.

[pfalcon commit]

task-base: Make "wifi" belong to COMBINED_FEATURES.
* This is consistent with how "bluetooth" is handled already, and, assuming
that distro supports wifi, essentially allows machine to decide if wifi packages
go into rootfs or would be installed from feed. This is helpful for machines
which don't have wifi and devoid of any means of external card extension, or
for machines with very small ROM (like, for example, h3600 with its 16Mb,
in which wifi packages simply don't fit, so h3600 users with CF sleeve and
wifi card would need to install support manually, after deleting packages they
can sacrifice for this).
* Approved by Marcin Juszkiewicz

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

#
# mt diff -r98a9f60d428a74f8f8b42247cd8c7bcd9fc1e91a -r342f792566944087c0c655f774603539975ed2fb
#
# 
# 
# patch "packages/tasks/task-base.bb"
#  from [5d2a10da7bbd000ddda3ee1adfc278b2cb01ce0f]
#    to [a9f24c3deb5837b3182f88974eacb434f0d6d92b]
# 
============================================================
--- packages/tasks/task-base.bb	5d2a10da7bbd000ddda3ee1adfc278b2cb01ce0f
+++ packages/tasks/task-base.bb	a9f24c3deb5837b3182f88974eacb434f0d6d92b
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r16"
+PR = "r17"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -62,10 +62,10 @@ RDEPENDS_task-base = "\
     ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
     ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
     ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
-    ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
     ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
     ${MACHINE_EXTRA_RDEPENDS} \
     ${DISTRO_EXTRA_RDEPENDS}"