diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2007-03-22 18:01:19 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2007-03-22 18:01:19 +0000 |
| commit | b2cf68047b3775511c137b6c01545ca82ebcf714 (patch) | |
| tree | edec974bffa7b63d0c04574f9e03cac5982f0315 /packages/tasks | |
| parent | 5f96bdfd284a81a45cf7999ec858287fb3d1b8be (diff) | |
| parent | c72e871b23455c2e2aec864ebb46976b943e73f3 (diff) | |
merge of '30ed2981d1b51e1b7515fb7bad6e1447ce6ab4e5'
and 'bbd309bb8f001be39eda61e970699d345467347c'
Diffstat (limited to 'packages/tasks')
| -rw-r--r-- | packages/tasks/task-base.bb | 3 | ||||
| -rw-r--r-- | packages/tasks/task-openmoko.bb | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 5bc38f6a79..4d16501d6b 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 = "r20" +PR = "r21" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -273,6 +273,7 @@ task-distro-wifi-rrecommends = "\ kernel-module-ieee80211-crypt-ccmp \ kernel-module-ieee80211-crypt-tkip \ kernel-module-ieee80211-crypt-wep \ + kernel-module-ecb \ kernel-module-arc4 \ kernel-module-michael-mic \ kernel-module-aes" diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index ae705dd387..cad921020e 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r29" +PR = "r30" PACKAGES = "\ task-openmoko-linux \ @@ -19,7 +19,6 @@ PACKAGES = "\ task-openmoko-demo \ task-openmoko-examples \ task-openmoko-debug \ - task-openmoko-native-sdk \ " RDEPENDS_task-openmoko-everything := "${PACKAGES}" @@ -92,6 +91,8 @@ RDEPENDS_task-openmoko-ui = "\ openmoko-common \ openmoko-session \ openmoko-theme-standard \ + openmoko-icon-theme-standard \ + settings-daemon \ # psplash \ " @@ -134,6 +135,7 @@ RDEPENDS_task-openmoko-pim = "\ eds-dbus \ openmoko-contacts \ openmoko-dates \ + openmoko-today \ " # @@ -166,7 +168,6 @@ RDEPENDS_task-openmoko-demo = "\ openmoko-panel-gsm \ openmoko-panel-mainmenu \ xcursor-transparent-theme \ - settings-daemon \ web \ rxvt-unicode \ gpe-terminal \ |