diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-10-13 12:46:00 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2006-10-13 12:46:00 +0000 |
| commit | 26ca29239b96f861bf1ddd7dd3ab78785639d558 (patch) | |
| tree | 56773653c2441865ddef55bcf0faf1085b7370d3 | |
| parent | 247469b81e9d210b2c219fc0f95d3b62249c2498 (diff) | |
task-base: install hostap-utils only if there is pci or pcmcia featured
| -rw-r--r-- | packages/tasks/task-base.bb | 7 |
1 files changed, 5 insertions, 2 deletions
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 = "\ |