diff options
| -rw-r--r-- | include/image.mk | 2 | ||||
| -rw-r--r-- | tools/genext2fs/Makefile | 7 | ||||
| -rw-r--r-- | tools/genext2fs/patches/01-remove_getline.patch | 52 |
3 files changed, 4 insertions, 57 deletions
diff --git a/include/image.mk b/include/image.mk index 6ac177d2e..2b239ca3a 100644 --- a/include/image.mk +++ b/include/image.mk @@ -90,7 +90,7 @@ ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024))) define Image/mkfs/ext2 - $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -I $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2 + $(STAGING_DIR_HOST)/bin/genext2fs -U -b $(E2SIZE) -N $(CONFIG_TARGET_ROOTFS_MAXINODE) -d $(TARGET_DIR)/ $(KDIR)/root.ext2 $(call Image/Build,ext2) endef endif diff --git a/tools/genext2fs/Makefile b/tools/genext2fs/Makefile index eef75ddec..5878b5c04 100644 --- a/tools/genext2fs/Makefile +++ b/tools/genext2fs/Makefile @@ -9,12 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=genext2fs -PKG_VERSION:=1.4rc1 +PKG_VERSION:=1.4.1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://superb-west.dl.sourceforge.net/sourceforge/ -PKG_MD5SUM:=664431bf6737df1c265500e1f0b5d40c -PKG_CAT:=zcat +PKG_SOURCE_URL:=@SF/genext2fs +PKG_MD5SUM:=b7b6361bcce2cedff1ae437fadafe53b include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/genext2fs/patches/01-remove_getline.patch b/tools/genext2fs/patches/01-remove_getline.patch deleted file mode 100644 index d09404c0c..000000000 --- a/tools/genext2fs/patches/01-remove_getline.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -urN genext2fs-1.4rc1/genext2fs.c genext2fs-1.4rc1.new/genext2fs.c ---- genext2fs-1.4rc1/genext2fs.c 2005-05-17 18:29:10.000000000 +0200 -+++ genext2fs-1.4rc1.new/genext2fs.c 2007-01-03 15:21:16.000000000 +0100 -@@ -243,48 +243,6 @@ - } - #endif // defined SNPRINTF_STORAGE_CLASS - --#if defined(__APPLE__) && defined(__GNUC__) --// getline() replacement for Darwin, might work on other systems --// written according to the getline man page included with Debian Linux --ssize_t --getline(char **lineptr, size_t *n, FILE *stream) --{ -- char *buf = *lineptr; // could be NULL, in which case we allocate -- size_t bufsize = *n; // current buffer size, adjust if we (re)alloc -- -- char *temp = NULL; -- size_t tempsize = 0; -- -- // temp is not a C string and we don't own the buffer it points into -- // must copy into a malloced buffer and NULL terminate -- temp = fgetln(stream, &tempsize); -- if(!temp) return -1; -- -- tempsize++; // adjust for NULL terminator -- if(buf) { -- // check if we have to reallocate -- if(bufsize < tempsize) { -- bufsize = tempsize; -- buf = (char*)realloc(buf, tempsize); -- if(!buf) return -1; -- } -- } else { -- bufsize = tempsize; -- buf = (char*)malloc(bufsize); -- if(!buf) return -1; -- } -- -- memcpy(buf, temp, tempsize-1); -- buf[tempsize-1] = '\0'; -- -- // give new pointer and size back, nondestructive if we didn't change anything.. -- *n = bufsize; -- *lineptr = buf; -- -- return (ssize_t)(tempsize-1); // don't include the NULL terminator, per getline man page --} --#endif -- - // Convert a numerical string to a float, and multiply the result by an - // SI-style multiplier if provided; supported multipliers are Ki, Mi, Gi, k, M - // and G. |