diff options
| author | Philip Balister <philip@balister.org> | 2007-05-15 16:59:47 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-05-15 16:59:47 +0000 |
| commit | 3566a861498bd0fa8c9e9fec093561fbc6daaaa3 (patch) | |
| tree | c035e30e780e799ac7dee9d99c5de71ff1613508 /packages/tasks/task-base.bb | |
| parent | ab8f5d61db1337b8afc6842ff24e4dbcd6f13105 (diff) | |
| parent | 50e66f1bd1fba225bed5668f256b6f6cfb75a7dc (diff) | |
merge of '36a3e8d1c238807062d51987c38ef05ebad7767c'
and '56ba744369ba7e91f99f26ec49b2be38baff69d9'
Diffstat (limited to 'packages/tasks/task-base.bb')
| -rw-r--r-- | packages/tasks/task-base.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index b7f4497d92..dfada74a87 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 = "r29" +PR = "r30" PACKAGES = 'task-boot \ task-base \ @@ -139,6 +139,7 @@ RDEPENDS_task-boot = "\ initscripts \ modutils-initscripts \ netbase \ + update-alternatives \ ${DISTRO_DEV_MANAGER} \ ${DISTRO_INIT_MANAGER} \ ${DISTRO_LOGIN_MANAGER} \ @@ -204,7 +205,6 @@ RDEPENDS_task-base-pcmcia = "\ ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism3-support', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-conf', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-conf', '',d)} \ " RRECOMMENDS_task-base-pcmcia = "\ @@ -224,7 +224,6 @@ task-base-pcmcia24 = "\ task-base-pcmcia26 = "\ ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" RDEPENDS_task-base-bluetooth = "\ |