From 5ef978df2ee546bb1bbb8194fd818213f5bee194 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 23 Apr 2008 15:05:04 +0000
Subject: openmoko-session2: a bit of cleanup and move RDEPENDS to
 task-openmoko-base applied changes from
 9cff472a62d80a6854306f6f304483d4be7631d1              through
 8dd89310fde529bfbf9398e9f99476ffe8af7e99

---
 packages/openmoko2/openmoko-session2.bb | 4 ++--
 packages/tasks/task-openmoko-base.bb    | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 127de3aa28..d5575f63e0 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "Custom Matchbox session files for Openmoko"
+ESCRIPTION = "Custom Matchbox session files for Openmoko"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory"
+RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS_${PN} = "openmoko-session matchbox-common"
 PR = "r68"
 
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
index c3b119c845..34739285ec 100644
--- a/packages/tasks/task-openmoko-base.bb
+++ b/packages/tasks/task-openmoko-base.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Base Task for the Openmoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r72"
+PR = "r73"
 
 inherit task
 
@@ -20,10 +20,11 @@ RDEPENDS_task-openmoko-base = "\
   openmoko-terminal2 \
 #  openmoko-keyboard \
   openmoko-panel-battery \
-  openmoko-panel-bt \
   openmoko-panel-clock \
   openmoko-panel-usb \
-  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+  ${@base_contains('MACHINE_FEATURES', 'bluetooth', 'openmoko-panel-bt', '', d)} \
+  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '', d)} \
+  ${@base_contains('MACHINE_FEATURES', 'wifi', 'openmoko-panel-wifi', '', d)} \
   \
   openmoko-today2 \
 #  openmoko-appmanager \
-- 
cgit v1.2.3