[oe-commits] org.oe.dev openmoko-session2: a bit of cleanup and move RDEPENDS to task-openmoko-base

[john_lee commit]

openmoko-session2: a bit of cleanup and move RDEPENDS to task-openmoko-base

applied changes from 9cff472a62d80a6854306f6f304483d4be7631d1
             through 8dd89310fde529bfbf9398e9f99476ffe8af7e99

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: b26c03b5efcdc3167ff678b7b44a5c7d93feed3d
ViewMTN: http://monotone.openembedded.org/revision/info/b26c03b5efcdc3167ff678b7b44a5c7d93feed3d
Files:
1
packages/openmoko2/openmoko-session2.bb
packages/tasks/task-openmoko-base.bb
Diffs:

#
# mt diff -r8f47ba39f1d79dea2ff259e09a67e4aa05616b8b -rb26c03b5efcdc3167ff678b7b44a5c7d93feed3d
#
#
#
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [55400c33a1430f1af17b981a8763a0065d062c04]
#    to [6fe69290b46b2f786d58a307cb32b533ea009587]
# 
# patch "packages/tasks/task-openmoko-base.bb"
#  from [71e3246b0804a4c56a13031ceff61a72c5522177]
#    to [72583fbfa39f082e79d4673df5144b1684c830ca]
#
============================================================
--- packages/openmoko2/openmoko-session2.bb	55400c33a1430f1af17b981a8763a0065d062c04
+++ packages/openmoko2/openmoko-session2.bb	6fe69290b46b2f786d58a307cb32b533ea009587
@@ -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"
 
============================================================
--- packages/tasks/task-openmoko-base.bb	71e3246b0804a4c56a13031ceff61a72c5522177
+++ packages/tasks/task-openmoko-base.bb	72583fbfa39f082e79d4673df5144b1684c830ca
@@ -1,7 +1,7 @@ LICENSE = "MIT"
 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 \