[oe-commits] Jan Lübbe : fso-image: save space on GTA01

[git version control]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 1dbe8284cde295ea4b4443dd4826db7b41c9c8f4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1dbe8284cde295ea4b4443dd4826db7b41c9c8f4

Author: Jan Lübbe <jluebbe at debian.org>
Date:   Wed Jul 15 13:19:44 2009 +0000

fso-image: save space on GTA01

---

 recipes/images/fso-image.inc      |   23 ++++++++++++++++-------
 recipes/images/fso-zhone-image.bb |    4 ----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/recipes/images/fso-image.inc b/recipes/images/fso-image.inc
index 73e922a..daf12ae 100644
--- a/recipes/images/fso-image.inc
+++ b/recipes/images/fso-image.inc
@@ -42,7 +42,6 @@ AUDIO_INSTALL = "\
 
 GTK_INSTALL = "\
   hicolor-icon-theme \
-  tango-icon-theme \
   openmoko-calculator2 \
   vala-terminal \
   gpe-scap \
@@ -50,9 +49,8 @@ GTK_INSTALL = "\
   openbmap-logger \
 "
 
-GAMES_INSTALL = "\
-  numptyphysics \
-  cellhunter \
+GTK_INSTALL_append_om-gta02 = "\
+  tango-icon-theme \
 "
 
 # FIXME these should rather be part of alsa-state,
@@ -79,18 +77,25 @@ ZHONE_INSTALL = "\
 # additional apps
 APPS_INSTALL = "\
   cellhunter \
-  gpe-gallery \
-  gpe-sketchbook \
   gpe-filemanager \
   ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'vagalume', d)} \
+"
+
+APP_INSTALL_append_om-gta02 = "\
+  gpe-gallery \
+  gpe-sketchbook \
   starling \
+  midori \
+"
+
+GAMES_INSTALL = "\
+  numptyphysics \
 "
 
 IMAGE_INSTALL = "\
   ${BASE_INSTALL} \
   ${X_INSTALL} \
   ${GTK_INSTALL} \
-  ${GAMES_INSTALL} \
   ${AUDIO_INSTALL} \
   ${TOOLS_INSTALL} \
   ${PYTHON_INSTALL} \
@@ -98,6 +103,10 @@ IMAGE_INSTALL = "\
   ${APPS_INSTALL} \
 "
 
+IMAGE_INSTALL_append_om-gta02 = "\
+  ${GAMES_INSTALL} \
+"
+
 inherit image
 
 # perform some convenience tweaks to the rootfs to improve the out-of-the-box experience :M:
diff --git a/recipes/images/fso-zhone-image.bb b/recipes/images/fso-zhone-image.bb
index 4f62592..4883cbc 100644
--- a/recipes/images/fso-zhone-image.bb
+++ b/recipes/images/fso-zhone-image.bb
@@ -11,7 +11,3 @@ ZHONE_INSTALL = "\
   task-fso-compliance \
   zhone \
 "
-
-ZHONE_INSTALL_append_om-gta02 = "\
-  midori \
-"