diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-10-13 13:02:53 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-10-13 13:02:53 +0000 |
| commit | 5dee75a79132a577fd665f82ac453f0b4edfb9a4 (patch) | |
| tree | 25bf9c3c29ec8bcc844050ed34c29d8b093820e4 /packages | |
| parent | 4fa2c89ec61664ea9842db12b1df01d879640ac1 (diff) | |
| parent | 88ef57373e921bf59253f8fb2939763b3036444a (diff) | |
merge of '2af10c8f8ecac83cfb23286aebb3172d45a4a12f'
and '51b5481655e96906c986a4ff927a78ce129f0109'
Diffstat (limited to 'packages')
| -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 = "\ |