summaryrefslogtreecommitdiff
path: root/packages/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'packages/tasks')
-rw-r--r--packages/tasks/task-openmoko.bb23
1 files changed, 12 insertions, 11 deletions
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index cc9b67f8d7..3b48b674c7 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -69,25 +69,26 @@ RDEPENDS_task-openmoko-ui = "\
libnotify \
\
openmoko-session2 \
- openmoko-sound-system \
- openmoko-sound-theme-standard \
+ openmoko-sound-system2 \
+ openmoko-sound-theme-standard2 \
\
gpe-scap \
"
-# handle theming. FIXME: properly use machine database in a smart way,
+# Handle theming. FIXME: properly use machine database in a smart way,
# taking into account not only size but also PPI! Ultimately this might
# need recomputing some theme files and images on-the-fly :/ SVG and logical
# theme description anyone? Or simply Edje to the rescue! :D
-THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
-THEMES_a780 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_e680 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokre2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokre6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_magician = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
RDEPENDS_task-openmoko-ui += "${THEMES}"
+PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
#
# task-openmoko-base
@@ -106,7 +107,7 @@ RDEPENDS_task-openmoko-base = "\
openmoko-panel-bt \
openmoko-panel-clock \
openmoko-panel-usb \
- openmoko-panel-gps \
+ ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
\
openmoko-today2 \
# openmoko-appmanager \