7 files changed, 32 insertions, 150 deletions
diff --git a/packages/images/fso-console-image.bb b/packages/images/fso-console-image.bb
index 6bfab9dca9..8d985be01c 100644
--- a/packages/images/fso-console-image.bb
+++ b/packages/images/fso-console-image.bb
@@ -2,7 +2,10 @@
 # FSO-compliant Console Image Recipe
 #------------------------------------------------------
 
-require fso-image.bb
+require fso-image.inc
+
+PV = "1.1"
+PR = "r1"
 
 IMAGE_INSTALL = "\
   task-base \
diff --git a/packages/images/fso-illume-image.bb b/packages/images/fso-illume-image.bb
index 577e738030..189c8cba69 100644
--- a/packages/images/fso-illume-image.bb
+++ b/packages/images/fso-illume-image.bb
@@ -2,7 +2,7 @@
 # FSO-compliant Illume Image Recipe
 #------------------------------------------------------
 
-require fso-image.bb
+require fso-image.inc
 
 PV = "1.1"
 PR = "r1"
diff --git a/packages/images/fso-image-light.bb b/packages/images/fso-image-light.bb
index a3bf1f7eb5..12fa2f7205 100644
--- a/packages/images/fso-image-light.bb
+++ b/packages/images/fso-image-light.bb
@@ -2,7 +2,7 @@
 # freesmartphone.org Image Recipe, Light Edition
 #------------------------------------------------------
 
-require fso-image.bb
+require fso-image.inc
 
 IMAGE_LINGUAS = ""
 
diff --git a/packages/images/fso-image-nox.bb b/packages/images/fso-image-nox.bb
index 056982e1b0..d241919367 100644
--- a/packages/images/fso-image-nox.bb
+++ b/packages/images/fso-image-nox.bb
@@ -4,7 +4,7 @@
 
 PR = "r1.0"
 
-require fso-image.bb
+require fso-image.inc
 
 export IMAGE_BASENAME = "fso-image-nox"
 
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
deleted file mode 100644
index 4e3bfee64e..0000000000
--- a/packages/images/fso-image.bb
+++ /dev/null
@@ -1,146 +0,0 @@
-#------------------------------------------------------
-# freesmartphone.org Image Recipe
-#------------------------------------------------------
-
-PV = "1.1"
-PR = "r4"
-
-# no languages for now
-IMAGE_LINGUAS = ""
-
-BASE_INSTALL = "\
-  task-base \
-"
-
-ILLUME_THEME = "illume-theme-freesmartphone"
-
-X_INSTALL = "\
-  task-x11-illume \
-  task-fonts-truetype-core \
-"
-
-X_INSTALL_append_om-gta02 = "\
-  task-fonts-truetype-chinese \
-  task-fonts-truetype-japanese \
-"
-
-# tools
-TOOLS_INSTALL = "\
-  task-cli-tools \
-  task-cli-tools-python \
-"
-
-# audio
-AUDIO_INSTALL = "\
-  alsa-oss \
-  alsa-state \
-  alsa-utils-aplay \
-  alsa-utils-amixer \
-  gst-meta-audio \
-  gst-plugin-modplug \
-  gst-plugin-sid \
-  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \
-  fso-sounds \
-"
-
-GTK_INSTALL = "\
-  hicolor-icon-theme \
-  tango-icon-theme \
-  openmoko-calculator2 \
-  vala-terminal \
-  gpe-scap \
-  tangogps \
-"
-
-GAMES_INSTALL = "\
-  numptyphysics \
-"
-
-# FIXME these should rather be part of alsa-state,
-# once Om stabilizes them...
-AUDIO_INSTALL_append_om-gta01 = "\
-  openmoko-alsa-scenarios \
-"
-AUDIO_INSTALL_append_om-gta02 = "\
-  openmoko-alsa-scenarios \
-"
-
-# python
-PYTHON_INSTALL = "\
-  task-python-efl \
-  python-codecs \
-  python-gst \
-"
-
-# fso+zhone
-ZHONE_INSTALL = "\
-  task-fso-compliance \
-  zhone \
-"
-
-# additional apps
-APPS_INSTALL = "\
-  paroli \
-  gpe-gallery \
-  gpe-sketchbook \
-  gpe-filemanager \
-  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'vagalume', d)} \
-  starling \
-"
-
-IMAGE_INSTALL = "\
-  ${BASE_INSTALL} \
-  ${X_INSTALL} \
-  ${GTK_INSTALL} \
-  ${GAMES_INSTALL} \
-  ${AUDIO_INSTALL} \
-  ${TOOLS_INSTALL} \
-  ${PYTHON_INSTALL} \
-  ${ZHONE_INSTALL} \
-  ${APPS_INSTALL} \
-"
-
-inherit image
-
-# perform some convenience tweaks to the rootfs to improve the out-of-the-box experience :M:
-fso_rootfs_postprocess() {
-    curdir=$PWD
-    cd ${IMAGE_ROOTFS}
-    # date/time
-    date "+%m%d%H%M%Y" >./etc/timestamp
-    # alias foo
-    echo "alias pico=nano" >>./etc/profile
-    echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
-    echo "alias ipkg='opkg'" >>./etc/profile
-    echo "alias vim=vi" >>./etc/profile
-    echo "alias ll='ls -al'" >>./etc/profile
-    # nfs
-    mkdir -p ./local/pkg
-    echo >>./etc/fstab
-    echo "# NFS Host" >>./etc/fstab
-    echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
-    # fix .desktop files for illume
-    desktop=`find ./usr/share/applications -name "*.desktop"`
-    for file in $desktop; do
-        echo "Categories=Office;" >>$file
-    done
-    # minimal gtk theme foo
-    mkdir -p ./etc/gtk-2.0/
-    echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
-    echo 'gtk-icon-theme-name = "Tango"' >> ./etc/gtk-2.0/gtkrc
-    # fix strange iconv/gconf bug
-    ln -s libc.so.6 ./lib/libc.so
-    # set sensible default DNS entries
-    echo "nameserver 208.67.222.222" > ./etc/resolv.conf
-    echo "nameserver 208.67.220.220" >> ./etc/resolv.conf
-    # remove autostart of gspd (if installed), we have fso-gpsd and this conflicts
-    rm -f ./etc/init.d/gpsd
-    # silence printk
-    mkdir -p ./etc/profile.d/
-    echo "echo 0 0 0 0 >/proc/sys/kernel/printk" >./etc/profile.d/printk.sh
-    chmod a+rx ./etc/profile.d/printk.sh
-    # back on track
-    cd $curdir
-}
-
-ROOTFS_POSTPROCESS_COMMAND += "fso_rootfs_postprocess"
diff --git a/packages/images/fso-paroli-image.bb b/packages/images/fso-paroli-image.bb
new file mode 100644
index 0000000000..1d4bdd5a30
--- /dev/null
+++ b/packages/images/fso-paroli-image.bb
@@ -0,0 +1,12 @@
+require fso-zhone-image.bb
+
+# no extra apps
+GTK_INSTALL = ""
+GAMES_INSTALL = ""
+APP_INSTALL = ""
+
+# fso+zhone
+ZHONE_INSTALL = "\
+  task-fso-compliance \
+  paroli \
+"
diff --git a/packages/images/fso-zhone-image.bb b/packages/images/fso-zhone-image.bb
new file mode 100644
index 0000000000..7a6cb4927a
--- /dev/null
+++ b/packages/images/fso-zhone-image.bb
@@ -0,0 +1,13 @@
+#------------------------------------------------------
+# freesmartphone.org Image Recipe
+#------------------------------------------------------
+
+require fso-image.inc
+
+PV = "1.1"
+PR = "r4"
+
+ZHONE_INSTALL = "\
+  task-fso-compliance \
+  zhone \
+"