1 files changed, 8 insertions, 1 deletions

diff --git a/meta/packages/matchbox-sato/matchbox-session-sato/session b/meta/packages/matchbox-sato/matchbox-session-sato/session
index 010772a8c4..68aacd1d5f 100644
--- a/meta/packages/matchbox-sato/matchbox-session-sato/session
+++ b/meta/packages/matchbox-sato/matchbox-session-sato/session
@@ -10,6 +10,13 @@ fi
 
 matchbox-desktop &
 
-matchbox-panel --titlebar --start-applets showdesktop,windowselector --end-applets clock,battery,systray,startup-notify,notify &
+# Lines containing feature-[foo] are removed at build time if the machine
+# doesn't have the feature "foo".
+
+START_APPLETS=showdesktop,windowselector
+END_APPLETS=clock,battery,systray,startup-notify,notify
+END_APPETS=openmoko-panel-gsm,$APPLETS # feature-phone
+
+matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &
 
 exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@