5 files changed, 176 insertions, 34 deletions
diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb
new file mode 100644
index 0000000000..03371c730e
--- /dev/null
+++ b/packages/images/beagleboard-demo-image.bb
@@ -0,0 +1,37 @@
+# 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 nmap iperf gnuplot \
+    abiword \
+#    gnumeric \
+#    gimp \
+    powertop \
+    pidgin \
+#    irssi \
+"
+
+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-light.bb b/packages/images/fso-image-light.bb
new file mode 100644
index 0000000000..921c636b12
--- /dev/null
+++ b/packages/images/fso-image-light.bb
@@ -0,0 +1,32 @@
+#------------------------------------------------------
+# freesmartphone.org Image Recipe, Light Edition
+#------------------------------------------------------
+
+require fso-image.bb
+
+IMAGE_LINGUAS = ""
+
+IMAGE_INSTALL = "\
+  ${BASE_INSTALL} \
+  ${X_INSTALL} \
+  ${PYTHON_INSTALL} \
+  ${ZHONE_INSTALL} \
+"
+
+inherit image
+
+# 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/fso-image.bb b/packages/images/fso-image.bb
index 72cbfd71c6..a08dac18b7 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -3,33 +3,9 @@
 #------------------------------------------------------
 
 IMAGE_LINGUAS = ""
- 
-ADD_INSTALL = "\
-  fontconfig-utils \
-  \
-  ttf-dejavu-common \
-  ttf-dejavu-sans \
-  ttf-dejavu-serif \
-  \
-"
- 
-MICKEY_INSTALL = "\
-  htop \
-  mickeyterm \
-  nano \
-  powertop \
-  s3c24xx-gpio \
-"
- 
-ZHONE_INSTALL = "\
-  gsm0710muxd \
-  python-odeviced \
-  python-ophoned \
-  python-ousaged \
-  zhone \
-"
- 
-IMAGE_INSTALL = "\
+
+# getting the base system up
+BASE_INSTALL = "\
   ${MACHINE_TASK_PROVIDER} \
   netbase \
   sysfsutils \
@@ -38,7 +14,10 @@ IMAGE_INSTALL = "\
   screen \
   fbset \
   fbset-modes \
-  \
+"
+
+# getting an X window system up
+X_INSTALL = "\
   matchbox-wm \
   ${XSERVER} \
   xserver-kdrive-common \
@@ -48,14 +27,84 @@ IMAGE_INSTALL = "\
   xset \
   xrandr \
   \
-  python-codecs \
+  fontconfig-utils \
   \
-  ${ADD_INSTALL} \
-  ${MICKEY_INSTALL} \
+  ttf-dejavu-common \
+  ttf-dejavu-sans \
+  ttf-dejavu-serif \
+  \
+"
+
+# useful command line tools
+TOOLS_INSTALL = "\
+#  bash \
+  htop \
+  mickeyterm \
+  mplayer \
+  nano \
+  powertop \
+  s3c24xx-gpio \
+"
+
+# audio
+AUDIO_INSTALL = "\
+  alsa-oss \
+  alsa-state \
+  alsa-utils-aplay \
+  gst-meta-audio \
+  gst-plugin-mad \
+  gst-plugin-modplug \
+  gst-plugin-sid \
+  fso-sounds \
+"
+
+# 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 \
+"
+
+# zhone
+ZHONE_INSTALL = "\
+  gsm0710muxd \
+  frameworkd \
+  zhone \
+"
+
+IMAGE_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
+    echo "alias ipkg='opkg'" >>./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
diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb
new file mode 100644
index 0000000000..ddf524574a
--- /dev/null
+++ b/packages/images/neuros-osd-base-image.bb
@@ -0,0 +1,18 @@
+# This image is intended to be the base for further neuros images
+
+# Select which Secure Shell Daemon gets included into the rootfs
+DISTRO_SSH_DAEMON ?= "dropbear"
+
+# Include a timestamp that initscripts can use to set the time to a 
+# more sane value after a reboot  
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+IMAGE_INSTALL = "task-boot \
+                 util-linux-mount util-linux-umount \
+                 ${DISTRO_SSH_DAEMON} \
+	         "
+
+IMAGE_LINGUAS = ""
+
+inherit image
+