diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-05-15 14:41:42 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-05-15 14:41:42 +0000 |
| commit | 582d64948ae2e1abbd7d5476076feccd90fe5204 (patch) | |
| tree | f5579d1b1fd5a61ddf81610c4fb22c7fea6a2267 | |
| parent | 28e00515f2a910387221a0ee7ec340eb25829d82 (diff) | |
task-base: merge r1692 from poky:
task-boot: added modutils-initscripts and update-alternatives
- busybox use update-alternatives
- modutils-initscripts is small and needed for devices with kernel modules in minimal image
| -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 = "\ |