merge of '4c6f4640a8b948badde77deaaebbfc2c9959ecae'

     and 'e5e5a9814f67f07864e0b56012257f49ace89669'

5 files changed, 42 insertions, 8 deletions

diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb
index 03371c730e..e4b2427063 100644
--- a/packages/images/beagleboard-demo-image.bb
+++ b/packages/images/beagleboard-demo-image.bb
@@ -15,18 +15,21 @@ IMAGE_INSTALL = "\
     angstrom-gpe-task-settings \
     ${ANGSTROM_EXTRA_INSTALL} \
     angstrom-zeroconf-audio \
-    gpe-scap \
+   	angstrom-led-config \ 
+	gpe-scap \
     psplash \
     e-wm exhibit \
     xterm xmms epiphany-firefox-replacement \
-    hicolor-icon-theme gnome-icon-theme \
+    swfdec-mozilla \
+	hicolor-icon-theme gnome-icon-theme \
     jaaa nmap iperf gnuplot \
     abiword \
 #    gnumeric \
 #    gimp \
-    powertop \
+    powertop oprofile \
     pidgin \
 #    irssi \
+    mplayer omapfbplay \
 "
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
diff --git a/packages/images/dsplink-test-image.bb b/packages/images/dsplink-test-image.bb
new file mode 100644
index 0000000000..10c3401e1f
--- /dev/null
+++ b/packages/images/dsplink-test-image.bb
@@ -0,0 +1,7 @@
+# This image is a bare-bones image to test the TI dsplink modules
+
+require minimal-image.bb
+IMAGE_INSTALL += "dsplink"
+
+export IMAGE_BASENAME = "dsplink-testing-image"
+
diff --git a/packages/images/fso-console-image.bb b/packages/images/fso-console-image.bb
new file mode 100644
index 0000000000..3de1e51da9
--- /dev/null
+++ b/packages/images/fso-console-image.bb
@@ -0,0 +1,12 @@
+#------------------------------------------------------
+# freesmartphone.org Console Image Recipe
+#------------------------------------------------------
+
+require fso-image.bb
+
+IMAGE_INSTALL = "\
+  ${BASE_INSTALL} \
+  ${AUDIO_INSTALL} \
+  ${TOOLS_INSTALL} \
+  ${PYTHON_INSTALL} \
+"
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index 292cb9b5f3..261b3655aa 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -18,7 +18,9 @@ BASE_INSTALL = "\
 
 # getting an X window system up
 X_INSTALL = "\
-  matchbox-wm \
+  e-wm \
+  illume \
+  illume-theme \
   ${XSERVER} \
   xserver-kdrive-common \
   xserver-nodm-init \
@@ -39,6 +41,8 @@ X_INSTALL = "\
 TOOLS_INSTALL = "\
 #  bash \
   htop \
+  lsof \
+  mickeydbus \
   mickeyterm \
   mtd-utils \
   nano \
diff --git a/packages/images/neuros-osd-base-image.bb b/packages/images/neuros-osd-base-image.bb
index ddf524574a..d2e39760c8 100644
--- a/packages/images/neuros-osd-base-image.bb
+++ b/packages/images/neuros-osd-base-image.bb
@@ -1,7 +1,15 @@
 # This image is intended to be the base for further neuros images
 
+inherit image
+
+export IMAGE_BASENAME = "Neuros-OSD2-base-image"
+
+PR = "r1"
+
 # Select which Secure Shell Daemon gets included into the rootfs
 DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_DEV_MANAGER = "mdev"
+PREFERRED_PROVIDER_hotplug = "mdev"
 
 # Include a timestamp that initscripts can use to set the time to a 
 # more sane value after a reboot  
@@ -9,10 +17,10 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 IMAGE_INSTALL = "task-boot \
                  util-linux-mount util-linux-umount \
+                 e2fsprogs dosfstools \
+                 wireless-tools zd1211-firmware \
                  ${DISTRO_SSH_DAEMON} \
-	         "
+                 qt-embedded dbus \
+                "
 
 IMAGE_LINGUAS = ""
-
-inherit image
-