merge of '6c7f9afdafc67f5e5a8263301ca0cfce430be173'

     and '8ee01e7aef977a6c51cf71b7d11f65f42e0dc413'

1 files changed, 4 insertions, 81 deletions

diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb
index 3d2c621438..8dc2370b5e 100644
--- a/packages/images/foonas-image.bb
+++ b/packages/images/foonas-image.bb
@@ -2,20 +2,11 @@ DESCRIPTION = "Foonas image"
 LICENSE = "GPL"
 PR = "r0"
 
-inherit image
+inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native"
-DEPENDS_n2100 += "openssl-native"
 
-
-IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
-PACK_IMAGE_DEPENDS = ""
-PACK_IMAGE = '${MACHINE}_pack_image;'
-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')}"
-EXTRA_IMAGECMD_jffs2 += " --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}"
+EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
 
 RDEPENDS = " \
@@ -25,78 +16,10 @@ RDEPENDS = " \
 	module-init-tools-depmod modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	libgcc1 diffutils cpio findutils\
-	portmap \
-	dropbear \
-	e2fsprogs-blkid \
-	mdadm \
-	hdparm \
-	mtd-utils \
-	udev \
+	dropbear e2fsprogs-blkid \
+	mdadm hdparm mtd-utils udev \
 	${FOONAS_SUPPORT} \
 	${FOONAS_KERNEL} "
 
 PACKAGE_INSTALL = "${RDEPENDS}"
 
-# At this point you have to make a ${MACHINE}_pack_image for your machine.
-
-turbostation_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-turbostation 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=200000
-	DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
-	HEX_MAX_ROOT_SIZE=D00000
-	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
-}
-
-n2100_pack_image() {
-        # find latest kernel
-        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1`
-        if [ -z "$KERNEL" ]; then
-                oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux 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=1C0000
-        DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
-        HEX_MAX_ROOT_SIZE=DC0000
-        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
-}
\ No newline at end of file