From 5a1bb609169fe06158068415d2e93dd01ad58f25 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 14 Oct 2004 03:20:19 +0000
Subject: Merge openembedded@openembedded.bkbits.net:packages into
 handhelds.org:/home/kergoth/code/packages

2004/10/13 22:20:07-05:00 handhelds.org!kergoth
genext2fs:  Add, and use, patch from Christopher Edmonds which calculates the
# of blocks which are necessary automatically, along with my modifications to
calculate the # of inodes as well.  Also stop using the fixed ext2 image
sizes in the builds, and move SECTION from genext2fs-native to genext2fs.

BKrev: 416df073t4Enw5HMEsshdWbMy2JdyQ
---
 conf/machine/nslu2.conf | 3 ---
 conf/oe.conf            | 6 ++----
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'conf')

diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 4d3bd326de..e176049f95 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -6,9 +6,6 @@ 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 3977b491bb..1b90ff188a 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 -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_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_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,8 +159,6 @@ 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"
-- 
cgit v1.2.3