From: Chris Larson <clarson@kergoth.com>
Date: Sat, 16 Oct 2004 05:13:11 +0000 (+0000)
Subject: Merge openembedded@openembedded.bkbits.net:packages
X-Git-Tag: Release-2010-05/1~16600
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=601d059b879a5375f411476cfbdc845ccf0efd04;p=openembedded.git

Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/packages

2004/10/16 00:12:53-05:00 handhelds.org!kergoth
Lock down the block count for genext2fs again, for the time being.

BKrev: 4170ade7grIq0Rdh2OtmuPmfDQqGgg
---

diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index e176049f95..4d3bd326de 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -6,6 +6,9 @@ TARGET_ARCH = "armeb"
 IPKG_ARCHS = "all ${TARGET_ARCH} armv5te ${MACHINE}"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
+IMAGE_ROOTFS_SIZE_ext2 = "10240"
+IMAGE_ROOTFS_SIZE_ext2.gz = "10240"
+
 include tune-xscale.conf
 
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/oe.conf b/conf/oe.conf
index 1b90ff188a..3977b491bb 100644
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -150,8 +150,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 		   ${EXTRA_IMAGECMD}"
 IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2 = "genext2fs -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
-IMAGE_CMD_ext2.gz = "genext2fs -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
+IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
+IMAGE_CMD_ext2.gz = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2"
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
 EXTRA_IMAGECMD = ""
@@ -159,6 +159,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
 IMAGE_FSTYPE = "jffs2"
 IMAGE_FSTYPES = "${IMAGE_FSTYPE}"
+IMAGE_ROOTFS_SIZE_ext2 = "65536"
+IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
 IMAGE_DEPENDS = ""
 IMAGE_DEPENDS_jffs2 = "mtd-native"