merge of '5c7330ec43644078393961a8eb84648b758ec953'

     and 'a2feb55d5703de5d580f9a019866a69764257a81'

89 files changed, 722 insertions, 8163 deletions

diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass
index da280551d4..6aab20127a 100644
--- a/classes/lsppchd-image.bbclass
+++ b/classes/lsppchd-image.bbclass
@@ -1 +1,3 @@
-IMAGE_POSTPROCESS_COMMAND += ""
+lsppchd_pack_image() {
+:
+}
\ No newline at end of file
diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass
index da280551d4..5d9da87c7d 100644
--- a/classes/lsppchg-image.bbclass
+++ b/classes/lsppchg-image.bbclass
@@ -1 +1,3 @@
-IMAGE_POSTPROCESS_COMMAND += ""
+lsppchg_pack_image() {
+:
+}
\ No newline at end of file
diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass
index 811b1d37b7..519be213d5 100644
--- a/classes/n2100-image.bbclass
+++ b/classes/n2100-image.bbclass
@@ -1,9 +1,3 @@
-DEPENDS += "openssl-native"
-EXTRA_IMAGECMD = "--little-endian"
-ERASEBLOCK_SIZE = "0x20000"
-IMAGE_FSTYPES = "jffs2"
-IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
-
 n2100_pack_image() {
         # find latest kernel
         KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1`
diff --git a/classes/storcenter-image.bbclass b/classes/storcenter-image.bbclass
new file mode 100644
index 0000000000..de77f1b417
--- /dev/null
+++ b/classes/storcenter-image.bbclass
@@ -0,0 +1,30 @@
+storcenter_pack_image() {
+        # find latest kernel
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
+        if [ -z "$KERNEL" ]; then
+                oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-storcenter to create one."
+                exit 1
+        fi
+        ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+        OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
+        PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
+        HEX_MAX_KERN_SIZE=170000
+        DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
+        HEX_MAX_ROOT_SIZE=590000
+        DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
+        KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
+        if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
+                oefatal "Kernel too large at $KERNEL_SIZE bytes.  Max is $DEC_MAX_KERN_SIZE."
+                exit 1
+        fi
+        ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
+        if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then
+                oefatal "Rootfs is too large at $ROOT_SIZE bytes.  Max is $DEC_MAX_ROOT_SIZE."
+                exit 1
+        fi
+        PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc `
+        dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
+        cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
+        rm -f $PADFILE
+        ls -l $OUTPUT
+}
diff --git a/classes/turbostation-image.bbclass b/classes/turbostation-image.bbclass
index d82e3996d5..e61ffc825b 100644
--- a/classes/turbostation-image.bbclass
+++ b/classes/turbostation-image.bbclass
@@ -1,8 +1,3 @@
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x20000"
-IMAGE_FSTYPES = "jffs2"
-IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
-
 turbostation_pack_image() {
         # find latest kernel
         KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 4f603f4534..e4951dbf2b 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "36"
+DISTRO_REVISION = "37"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -107,16 +107,14 @@ PREFERRED_PROVIDER_dbus-glib = "dbus-glib"
 PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
 PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
 PREFERRED_PROVIDER_esound 		?= "pulseaudio"
+PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+"
 
 
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.3.1"
 PREFERRED_VERSION_freetype-native = "2.2.1"
-PREFERRED_VERSION_cairo = "1.4.0"
-
-#work around a segfault in gcc for armv4t
-PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3"
-PREFERRED_VERSION_glib-2.0_h6300  = "2.12.3"
+PREFERRED_VERSION_cairo = "1.4.2"
+PREFERRED_VERSION_glib-2.0 = "2.12.10"
 
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index b43090202d..d21e5cfe6f 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -1,3 +1,4 @@
+
 #
 # FooNAS distribution - a NAS-centric distribution
 # based on openprotium
@@ -20,6 +21,12 @@ FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
 FOONAS_SUPPORT_n2100 += "fis"
 BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm"
 
+IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
+IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
+IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
+FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
+
+
 # Various defines for QNAP Turbostation
 FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
 				kernel-module-usb-storage"
@@ -36,6 +43,8 @@ FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd}
 IMAGE_FSTYPES_lsppchd = "tar.gz"
 IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd}
 
+IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
+
 #
 # Naming schemes
 #
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index 52d58ded5b..51d0186dbe 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
 
 UBOOT_MACHINE = "linkstation_HDLAN"
+IMAGE_FSTYPES = "tar.gz"
 
 require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index b7ceb6fc95..516a3aaa98 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -3,5 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
 
 UBOOT_MACHINE = "linkstation_HGLAN"
+IMAGE_FSTYPES = "tar.gz"
 
 require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 6aee9f1b71..c84bf352da 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -7,11 +7,19 @@ SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.20"
+MACHINE_TASK_PROVIDER = "task-base"
 
 # We want udev support in the image
 udevdir = "/dev"
 
+ERASEBLOCK_SIZE = "0x20000"
+IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD = "--little-endian"
+# Creating an image that works with the webinterface required encrypting it
+# So we'll need openssl
+EXTRA_IMAGEDEPENDS = "openssl-native"
+
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index a3856dbaf1..ffa44207cd 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -9,10 +9,15 @@ SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
+MACHINE_TASK_PROVIDER = "task-base"
 
 # We want udev support in the image
 udevdir = "/dev"
 
+EXTRA_IMAGECMD = "--big-endian"
+ERASEBLOCK_SIZE = "0x20000"
+IMAGE_FSTYPES = "jffs2"
+
 require conf/machine/include/tune-ppc603e.conf
diff --git a/packages/angstrom/angstrom-e-image.bb b/packages/angstrom/angstrom-e-image.bb
new file mode 100644
index 0000000000..da40f7e00c
--- /dev/null
+++ b/packages/angstrom/angstrom-e-image.bb
@@ -0,0 +1,37 @@
+#Angstrom e image
+LICENSE = "MIT"
+PR = "r0"
+
+
+PREFERRED_PROVIDER_virtual/evas   ?= "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore  ?= "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+
+PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
+PREFERRED_PROVIDER_tslib 		    ?= "tslib"
+PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
+PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+XSERVER ?= "xserver-kdrive-fbdev"
+
+export IMAGE_BASENAME = "e-image"
+
+DEPENDS = "task-base"
+RDEPENDS = "\
+    ${XSERVER} \
+    task-base-core-default \
+    task-base \
+    angstrom-e-base-depends \
+    angstrom-e-depends \
+    angstrom-gpe-task-settings \
+    ${ANGSTROM_EXTRA_INSTALL}"
+
+
+export PACKAGE_INSTALL = "${RDEPENDS}"
+
+#zap root password for release images
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+
+inherit image
diff --git a/packages/angstrom/task-angstrom-e.bb b/packages/angstrom/task-angstrom-e.bb
new file mode 100644
index 0000000000..228c637158
--- /dev/null
+++ b/packages/angstrom/task-angstrom-e.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Task packages for the Angstrom dis