- bump version. Closes #1225

# genext2fs to build to target ext2 filesystems

#

#############################################################

GENEXT2_DIR=$(BUILD_DIR)/genext2fs-1.3

GENEXT2_SOURCE=genext2fs_1.3.orig.tar.gz

GENEXT2_SITE=http://ftp.debian.org/debian/pool/main/g/genext2fs

GENEXT2_VERSION=1.4

GENEXT2_DIR=$(BUILD_DIR)/genext2fs-$(GENEXT2_VERSION)

GENEXT2_SOURCE=genext2fs-$(GENEXT2_VERSION).tar.gz

GENEXT2_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs

$(DL_DIR)/$(GENEXT2_SOURCE):

	$(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE)

$(GENEXT2_DIR)/.unpacked: $(DL_DIR)/$(GENEXT2_SOURCE)

	$(ZCAT) $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf -

	mv $(GENEXT2_DIR).orig $(GENEXT2_DIR)

	toolchain/patch-kernel.sh $(GENEXT2_DIR) target/ext2/ genext2fs\*.patch

	touch $(GENEXT2_DIR)/.unpacked

endif

ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0)

EXT2_OPTS += -i $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES))

EXT2_OPTS += -N $(strip $(BR2_TARGET_ROOTFS_EXT2_INODES))

endif

ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),)

EXT2_OPTS += -r $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS))

EXT2_OPTS += -m $(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS))

endif

EXT2_BASE :=	$(subst ",,$(BR2_TARGET_ROOTFS_EXT2_OUTPUT))

endif

	# Use fakeroot so genext2fs believes the previous fakery

ifeq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)

	GENEXT2_REALSIZE=`LC_ALL=C du -l -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \

	GENEXT2_REALSIZE=`LC_ALL=C du -s -c -k $(TARGET_DIR) | grep total | sed -e "s/total//"`; \

	GENEXT2_ADDTOROOTSIZE=`if [ $$GENEXT2_REALSIZE -ge 20000 ] ; then echo 16384; else echo 2400; fi`; \

	GENEXT2_SIZE=`expr $$GENEXT2_REALSIZE + $$GENEXT2_ADDTOROOTSIZE`; \

	GENEXT2_ADDTOINODESIZE=`find $(TARGET_DIR) | wc -l`; \

	GENEXT2_INODES=`expr $$GENEXT2_ADDTOINODESIZE + 400`; \

	set -x; \

	echo "$(GENEXT2_DIR)/genext2fs -b $$GENEXT2_SIZE " \

		"-i $$GENEXT2_INODES -d $(TARGET_DIR) " \

		"-N $$GENEXT2_INODES -d $(TARGET_DIR) " \

		"$(EXT2_OPTS) $(EXT2_BASE)" >> $(STAGING_DIR)/_fakeroot.$(notdir $(EXT2_TARGET))

else

	echo "$(GENEXT2_DIR)/genext2fs -d $(TARGET_DIR) " \

--- genext2fs-1.3/genext2fs.c~	2005-02-15 02:21:18.000000000 -0700

+++ genext2fs-1.3/genext2fs.c	2005-02-15 02:17:09.000000000 -0700

@@ -1322,10 +1324,6 @@

 		}

 		else

 		{

-			if(squash_uids)

-				uid = gid = 0;

-			if(squash_perms)

-				mode &= ~(FM_IRWXG | FM_IRWXO);

 			mode &= FM_IMASK;

 			path2 = strdup(path);

 			name = basename(path);

diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c

--- genext2fs-1.4/genext2fs.c	2006-12-19 17:45:31.000000000 +0100

+++ genext2fs-1.4-nosquash/genext2fs.c	2007-02-09 10:47:05.000000000 +0100

@@ -1629,10 +1629,6 @@

 		mtime = st.st_mtime;

 		name = dent->d_name;

 		mode = get_mode(&st);

-		if(squash_uids)

-			uid = gid = 0;

-		if(squash_perms)

-			mode &= ~(FM_IRWXG | FM_IRWXO);

 		if(stats)

 			switch(st.st_mode & S_IFMT)

 			{

diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c

--- genext2fs-1.4/genext2fs.c	2007-02-09 10:54:56.000000000 +0100

+++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c	2007-02-09 10:54:30.000000000 +0100

@@ -1606,7 +1606,7 @@

 static void

 add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats)

 {

-	uint32 nod;

+	uint32 nod = 0;

 	uint32 uid, gid, mode, ctime, mtime;

 	const char *name;

 	FILE *fh;

@@ -2056,7 +2056,7 @@

 static filesystem *

 load_fs(FILE * fh, int swapit)

 {

-	size_t fssize;

+	size_t fssize = 0;

 	filesystem *fs;

 	if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1))

 		perror_msg_and_die("input filesystem image");