[oe-commits] org.oe.dev task-base: install hostap-utils only if there is pci or pcmcia featured

[hrw commit]

task-base: install hostap-utils only if there is pci or pcmcia featured

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

#
# mt diff -r43309b85ab66ca9bcb9fb8dbd0b8eab532632ef7 -r27992ad903b456bde0a40788a183fd1b84d95beb
#
# 
# 
# patch "packages/tasks/task-base.bb"
#  from [9cb0bdf694812be160591679c55a3944584fbe3a]
#    to [7b6f97ddd053631a19f82f3bfe3171e9f85ebc4e]
# 
============================================================
--- packages/tasks/task-base.bb	9cb0bdf694812be160591679c55a3944584fbe3a
+++ packages/tasks/task-base.bb	7b6f97ddd053631a19f82f3bfe3171e9f85ebc4e
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r8"
+PR = "r9"
 
 PACKAGES = "task-base \
             task-base-minimal \
@@ -33,6 +33,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # bluetooth
 # ext2
 # irda
+# pci
 # pcmcia
 # usbgadget
 # usbhost
@@ -56,6 +57,7 @@ COMBINED_FEATURES = "\
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "ext2", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "irda", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pcmcia", d)} \
+    ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "pci", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
     ${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)}"
 
@@ -257,7 +259,8 @@ task-distro-wifi-rdepends = "\
 
 task-distro-wifi-rdepends = "\
     wireless-tools \
-    hostap-utils \
+    ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
+    ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
     wpa-supplicant"
 
 task-distro-wifi-rrecommends = "\