From 26ca29239b96f861bf1ddd7dd3ab78785639d558 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 13 Oct 2006 12:46:00 +0000
Subject: task-base: install hostap-utils only if there is pci or pcmcia
 featured

---
 packages/tasks/task-base.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'packages/tasks/task-base.bb')

diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 02669ec2db..50ca203b9a 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 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-ipsec-rrecommends = "\
 
 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 = "\
-- 
cgit v1.2.3