diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-10-14 03:20:19 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-10-14 03:20:19 +0000 |
| commit | 5a1bb609169fe06158068415d2e93dd01ad58f25 (patch) | |
| tree | 07359ca6ca02b372af5c1c1677f7c9b995a00359 | |
| parent | 4f33868fc4343468fae5cdac44d23b9f57927526 (diff) | |
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
| -rw-r--r-- | conf/machine/nslu2.conf | 3 | ||||
| -rw-r--r-- | conf/oe.conf | 6 | ||||
| -rw-r--r-- | genext2fs/genext2fs-1.3/autosize.patch | 0 | ||||
| -rw-r--r-- | genext2fs/genext2fs-native_1.3.oe | 4 | ||||
| -rw-r--r-- | genext2fs/genext2fs_1.3.oe | 6 |
5 files changed, 7 insertions, 12 deletions
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" diff --git a/genext2fs/genext2fs-1.3/autosize.patch b/genext2fs/genext2fs-1.3/autosize.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/genext2fs/genext2fs-1.3/autosize.patch diff --git a/genext2fs/genext2fs-native_1.3.oe b/genext2fs/genext2fs-native_1.3.oe index 2a70887028..2a059a00d0 100644 --- a/genext2fs/genext2fs-native_1.3.oe +++ b/genext2fs/genext2fs-native_1.3.oe @@ -1,8 +1,6 @@ -SECTION = "console/utils" include genext2fs_${PV}.oe inherit native -FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/genext2fs-${PV}" -DEPENDS = "" +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/genext2fs-${PV}', '${FILE_DIRNAME}/genext2fs', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" do_stage () { install -m 0755 genext2fs ${STAGING_BINDIR}/ diff --git a/genext2fs/genext2fs_1.3.oe b/genext2fs/genext2fs_1.3.oe index 34a54ceb36..cb59c058c1 100644 --- a/genext2fs/genext2fs_1.3.oe +++ b/genext2fs/genext2fs_1.3.oe @@ -1,9 +1,11 @@ -SECTION = "console/utils" DESCRIPTION = "A tool to generate an ext2 filesystem \ as a normal (non-root) user." +SECTION = "console/utils" +PR = "r1" SRC_URI = "${DEBIAN_MIRROR}/main/g/genext2fs/genext2fs_${PV}.orig.tar.gz \ - file://misc.patch;patch=1" + file://misc.patch;patch=1 \ + file://autosize.patch;patch=1" S = "${WORKDIR}/genext2fs-${PV}.orig" do_compile () { |