[oe-commits] Angus Ainslie : fso-paroli-image : fix fso-image.inc

[GIT User account]

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

Author: Angus Ainslie <nytowl at openmoko.org>
Date:   Wed Apr 15 19:40:05 2009 -0600

fso-paroli-image : fix fso-image.inc
fso-image : remove paroli install

---

 recipes/images/fso-image.inc       |    3 +--
 recipes/images/fso-paroli-image.bb |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/recipes/images/fso-image.inc b/recipes/images/fso-image.inc
index e2c854c..36f04ca 100644
--- a/recipes/images/fso-image.inc
+++ b/recipes/images/fso-image.inc
@@ -74,13 +74,12 @@ PYTHON_INSTALL = "\
 # fso+zhone
 ZHONE_INSTALL = "\
   task-fso-compliance \
-  zhone \
 "
 
 # additional apps
 APPS_INSTALL = "\
   cellhunter \
-  paroli \
+#  paroli \
   gpe-gallery \
   gpe-sketchbook \
   gpe-filemanager \
diff --git a/recipes/images/fso-paroli-image.bb b/recipes/images/fso-paroli-image.bb
index e259c62..0c90642 100644
--- a/recipes/images/fso-paroli-image.bb
+++ b/recipes/images/fso-paroli-image.bb
@@ -1,4 +1,4 @@
-require fso-image.bb
+require fso-image.inc
 
 ILLUME_THEME = ""
 
@@ -10,7 +10,7 @@ GTK_INSTALL = " \
 GAMES_INSTALL = ""
 APPS_INSTALL = ""
 
-# fso+zhone
+# fso
 ZHONE_INSTALL = "\
   paroli \
   paroli-theme \