3 files changed, 110 insertions, 36 deletions
diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb
new file mode 100644
index 0000000000..5d7b0981b8
--- /dev/null
+++ b/packages/images/beagleboard-demo-image.bb
@@ -0,0 +1,33 @@
+# Demo image for beagleboard
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+
+export IMAGE_BASENAME = "Beagleboard-demo-image"
+
+DEPENDS = "task-base"
+IMAGE_INSTALL = "\
+    ${XSERVER} \
+    task-base-extended \
+    angstrom-x11-base-depends \
+    angstrom-gpe-task-base \
+    angstrom-gpe-task-settings \
+    ${ANGSTROM_EXTRA_INSTALL} \
+    angstrom-zeroconf-audio \
+    gpe-scap \
+    psplash \
+    e-wm exhibit \
+    xterm xmms epiphany-firefox-replacement \
+    hicolor-icon-theme gnome-icon-theme \
+    jaaa octave nmap iperf gnuplot \
+    abiword gnumeric gimp minimo \
+    powertop \
+"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index 1d90b5c35f..a5bd9a39ac 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -3,8 +3,30 @@
 #------------------------------------------------------
 
 IMAGE_LINGUAS = ""
- 
-ADD_INSTALL = "\
+
+# getting the base system up
+BASE_INSTALL = "\
+  ${MACHINE_TASK_PROVIDER} \
+  netbase \
+  sysfsutils \
+  module-init-tools-depmod \
+  rsync \
+  screen \
+  fbset \
+  fbset-modes \
+"
+
+# getting an X window system up
+X_INSTALL = "\
+  matchbox-wm \
+  ${XSERVER} \
+  xserver-kdrive-common \
+  xserver-nodm-init \
+  xauth \
+  xhost \
+  xset \
+  xrandr \
+  \
   fontconfig-utils \
   \
   ttf-dejavu-common \
@@ -12,55 +34,68 @@ ADD_INSTALL = "\
   ttf-dejavu-serif \
   \
 "
- 
-MICKEY_INSTALL = "\
+
+# useful command line tools
+TOOLS_INSTALL = "\
   htop \
   mickeyterm \
   nano \
   powertop \
   s3c24xx-gpio \
 "
- 
+
+# audio
+AUDIO_INSTALL = "\
+  openmoko-sound-system2 \
+  openmoko-sound-theme-standard2 \
+"
+
+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 \
+"
+
+# zhone
 ZHONE_INSTALL = "\
   gsm0710muxd \
   python-odeviced \
-  python-oeventd \
   python-ophoned \
   python-ousaged \
   zhone \
 "
- 
+
 IMAGE_INSTALL = "\
-  ${MACHINE_TASK_PROVIDER} \
-  netbase \
-  sysfsutils \
-  module-init-tools-depmod \
-  rsync \
-  screen \
-  fbset \
-  fbset-modes \
-  \
-  matchbox-wm \
-  ${XSERVER} \
-  xserver-kdrive-common \
-  xserver-nodm-init \
-  xauth \
-  xhost \
-  xset \
-  xrandr \
-  \
-  python-codecs \
-  \
-  openmoko-alsa-scenarios \
-  openmoko-sound-system2 \
-  openmoko-sound-theme-standard2 \
-  \
-  ${ADD_INSTALL} \
-  ${MICKEY_INSTALL} \
+  ${BASE_INSTALL} \
+  ${X_INSTALL} \
+  ${AUDIO_INSTALL} \
+  ${TOOLS_INSTALL} \
+  ${PYTHON_INSTALL} \
   ${ZHONE_INSTALL} \
 "
- 
+
 inherit image
- 
-ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
 
+# perform some convenience tweaks to the rootfs
+mickey_rootfs_postprocess() {
+    curdir=$PWD
+    cd ${IMAGE_ROOTFS}
+    date "+%m%d%H%M%Y" >./etc/timestamp
+    echo "alias pico=nano" >>./etc/profile
+    echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
+    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
+    cd $curdir
+}
+
+ROOTFS_POSTPROCESS_COMMAND += "mickey_rootfs_postprocess"
diff --git a/packages/images/moko-underground-image.bb b/packages/images/moko-underground-image.bb
index 5752ce6037..590aaf941f 100644
--- a/packages/images/moko-underground-image.bb
+++ b/packages/images/moko-underground-image.bb
@@ -13,6 +13,11 @@ ADD_INSTALL = "\
   \
 "  
 
+TOOLS_INSTALL = "\
+  nano \
+  powertop \
+  htop \
+"
 
 IMAGE_INSTALL = "\
   ${MACHINE_TASK_PROVIDER} \
@@ -27,6 +32,7 @@ IMAGE_INSTALL = "\
   task-pyneo \
   \
   ${ADD_INSTALL} \
+  ${TOOLS_INSTALL} \
 "
 
 inherit image