diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-18 18:38:21 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-02-18 18:38:21 +0000 |
| commit | 4f8343ce4d85f0665cf909e241a0a7a235349cc3 (patch) | |
| tree | aaa28634ac5ec8413a1b729b0cd673fc6be6a7a8 /packages/tasks/task-base.bb | |
| parent | 071a9b8f76a5c031cdf5a0b3b11278cf8fdce1d6 (diff) | |
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
Diffstat (limited to 'packages/tasks/task-base.bb')
| -rw-r--r-- | packages/tasks/task-base.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index b4266a0940..fdbf9f75d2 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 = "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}" |