From 2225bb697129c9be8ca2b79f7930798bf9f72167 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 18 Mar 2007 23:06:40 +0000 Subject: foonas: Update image config, move crap from distro config --- packages/images/foonas-image.bb | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'packages/images') diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index 3d2c621438..efb10335e8 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -5,12 +5,24 @@ PR = "r0" inherit image DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" + +# Various defines for Thecus N2100 DEPENDS_n2100 += "openssl-native" +EXTRA_IMAGECMD_n2100 = "--little-endian" +ERASEBLOCK_SIZE_n2100 = "0x20000" +IMAGE_FSTYPES_n2100 = "jffs2" +IMAGE_POSTPROCESS_COMMAND_n2100 += '${MACHINE}_pack_image;' + +# Various defines for QNAP Turbostation TS[12]01 +EXTRA_IMAGECMD_turbostation = "--big-endian" +ERASEBLOCK_SIZE_turbostation = "0x20000" +IMAGE_FSTYPES_turbostation = "jffs2" +IMAGE_POSTPROCESS_COMMAND_turbostation += '${MACHINE}_pack_image;' +# Various defines for Buffalo Linkstations +IMAGE_POSTPROCESS_COMMAND_lsppchd += "" +IMAGE_POSTPROCESS_COMMAND_lsppchg += "${IMAGE_POSTPROCESS_COMMAND_lsppchd}" -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;" -- cgit v1.2.3 From 5fb7f282ceab4ad5655ef46c04d14fc51bc4c245 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 18 Mar 2007 23:27:28 +0000 Subject: foonas: Move image-stuff to classes for lsppchg, lsppchd, n2100 and turbostation --- packages/images/foonas-image.bb | 90 ++--------------------------------------- 1 file changed, 3 insertions(+), 87 deletions(-) (limited to 'packages/images') diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index efb10335e8..db5ff198fc 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -6,23 +6,6 @@ inherit image DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" -# Various defines for Thecus N2100 -DEPENDS_n2100 += "openssl-native" -EXTRA_IMAGECMD_n2100 = "--little-endian" -ERASEBLOCK_SIZE_n2100 = "0x20000" -IMAGE_FSTYPES_n2100 = "jffs2" -IMAGE_POSTPROCESS_COMMAND_n2100 += '${MACHINE}_pack_image;' - -# Various defines for QNAP Turbostation TS[12]01 -EXTRA_IMAGECMD_turbostation = "--big-endian" -ERASEBLOCK_SIZE_turbostation = "0x20000" -IMAGE_FSTYPES_turbostation = "jffs2" -IMAGE_POSTPROCESS_COMMAND_turbostation += '${MACHINE}_pack_image;' - -# Various defines for Buffalo Linkstations -IMAGE_POSTPROCESS_COMMAND_lsppchd += "" -IMAGE_POSTPROCESS_COMMAND_lsppchg += "${IMAGE_POSTPROCESS_COMMAND_lsppchd}" - 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;" @@ -37,78 +20,11 @@ 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 \ + portmap 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 +inherit n2100-image turbostation-image lsppchg-image lsppchd-image \ No newline at end of file -- cgit v1.2.3 From ddf7b46c66b130f5cd3ed15709183c0fe5f8188a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Tue, 20 Mar 2007 19:44:01 +0000 Subject: foonas-image: Move preprocessing away --- packages/images/foonas-image.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'packages/images') diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb index db5ff198fc..8dc2370b5e 100644 --- a/packages/images/foonas-image.bb +++ b/packages/images/foonas-image.bb @@ -2,15 +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" -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 = " \ @@ -20,11 +16,10 @@ RDEPENDS = " \ module-init-tools-depmod modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ libgcc1 diffutils cpio findutils\ - portmap dropbear e2fsprogs-blkid \ + dropbear e2fsprogs-blkid \ mdadm hdparm mtd-utils udev \ ${FOONAS_SUPPORT} \ ${FOONAS_KERNEL} " PACKAGE_INSTALL = "${RDEPENDS}" -inherit n2100-image turbostation-image lsppchg-image lsppchd-image \ No newline at end of file -- cgit v1.2.3 From 895a9b4cabafc642d676732ac26ca6cdabc6b448 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 21 Mar 2007 10:15:15 +0000 Subject: openmoko-image: install a terminal, virtual keyboard and other stuff to make it useable --- packages/images/openmoko-image.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/images') diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 0ebddcb276..632963076c 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -14,7 +14,9 @@ export PACKAGE_INSTALL = "\ task-openmoko-phone \ task-openmoko-finger \ task-openmoko-pim \ -" + task-openmoko-demo \ + " + DEPENDS = "\ ${MACHINE_TASK_PROVIDER} \ task-openmoko \ -- cgit v1.2.3