diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2007-01-10 08:27:15 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2007-01-10 08:27:15 +0000 |
| commit | 16d5d68588a7c0151bccd7572a524084d608ab51 (patch) | |
| tree | d20064b8b076c34f9330a68372e32a9153e6945e /packages/tasks | |
| parent | 6f1172ac1e082bae9fc921d3f8cf2b422890427e (diff) | |
disapproval of revision '032fe15bf3fd23dc5d753a8cd906ce2402067a78'
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-base.bb | 20 | ||||
| -rw-r--r-- | packages/tasks/task-gpe.bb | 37 |
2 files changed, 43 insertions, 14 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 256ebadf5f..b4266a0940 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -169,20 +169,20 @@ task-base-alsa-rrecommends = "\ kernel-module-snd-pcm-oss" task-base-pcmcia-rdepends = "\ - ${PCMCIA_MANAGER}" -# ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \ -# ${@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)}" + ${PCMCIA_MANAGER} \ + ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \ + ${@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)}" task-base-pcmcia-rrecommends = "\ kernel-module-pcmcia \ kernel-module-airo-cs \ kernel-module-pcnet-cs \ kernel-module-serial-cs \ - kernel-module-ide-cs" -# ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " + kernel-module-ide-cs \ + ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} " task-base-pcmcia24-rrecommends = "\ ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \ @@ -265,8 +265,8 @@ task-distro-ipsec-rrecommends = "\ task-distro-wifi-rdepends = "\ wireless-tools \ -# ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \ -# ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \ wpa-supplicant" task-distro-wifi-rrecommends = "\ diff --git a/packages/tasks/task-gpe.bb b/packages/tasks/task-gpe.bb index 1ca5f03a63..b59b3ceea3 100644 --- a/packages/tasks/task-gpe.bb +++ b/packages/tasks/task-gpe.bb @@ -11,7 +11,10 @@ PACKAGES = "\ gpe-task-apps \ gpe-task-games \ gpe-task-connectivity \ - gpe-task-apps-extra" + gpe-task-apps-extra \ + gpe-task-web \ + gpe-task-desktopapps \ + gpe-task-sectest" RDEPENDS_gpe-base-depends := "\ diet-x11 \ @@ -19,7 +22,7 @@ RDEPENDS_gpe-base-depends := "\ RDEPENDS_gpe-task-base := "\ gpe-bootsplash \ - bluez-utils \ + bluez-utils-dbus \ matchbox \ xcursor-transparent-theme \ rxvt-unicode \ @@ -98,12 +101,38 @@ RDEPENDS_gpe-task-games := "\ RDEPENDS_gpe-task-connectivity := "\ gpe-mini-browser" -# gaim" +# gaim # linphone-hh RDEPENDS_gpe-task-apps-extra := "\ gpe-filemanager \ -# gpe-nmf \ gpe-soundbite \ mbmerlin" + +RDEPENDS_gpe-task-web := "\ + gpe-irc \ + minimo \ + gaim" + +RDEPENDS_gpe-task-desktopapps := "\ + firefox \ + thunderbird \ + galculator \ + gnumeric \ + gpdf \ + totem" + +RDEPENDS_gpe-task-sectest := "\ + mbmerlin \ + nmap \ + ettercap \ + stunnel \ + curl \ + dsniff \ + prismstumbler \ + tcpdump \ + kismet \ + hydra \ + thcrut \ + miniclipboard" # driftnet \ |