From 9400c73582326c543fae82120af3904836145655 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Wed, 23 Dec 2009 10:41:36 -0300 Subject: Bump mtd-utils to 1.2.0 Closes #827. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- CHANGES | 1 + .../mtd/mtd-utils/mtd-utils-1.1.0-all-acl.patch | 48 ---------------------- .../mtd-utils-1.1.0-all-flashcp-npow2-erase.patch | 23 ----------- ...ils-1.1.0-all-mkfs.jffs2-device_table-fix.patch | 23 ----------- .../mtd-utils/mtd-utils-1.1.0-all-targets.patch | 34 --------------- .../mtd/mtd-utils/mtd-utils-1.2.0-all-acl.patch | 48 ++++++++++++++++++++++ .../mtd-utils-1.2.0-all-disable-ubi.patch | 24 +++++++++++ .../mtd-utils-1.2.0-all-flashcp-npow2-erase.patch | 23 +++++++++++ .../mtd-utils/mtd-utils-1.2.0-all-no-errorh.patch | 22 ++++++++++ .../mtd-utils/mtd-utils-1.2.0-all-targets.patch | 34 +++++++++++++++ package/mtd/mtd-utils/mtd.mk | 2 +- 11 files changed, 153 insertions(+), 129 deletions(-) delete mode 100644 package/mtd/mtd-utils/mtd-utils-1.1.0-all-acl.patch delete mode 100644 package/mtd/mtd-utils/mtd-utils-1.1.0-all-flashcp-npow2-erase.patch delete mode 100644 package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch delete mode 100644 package/mtd/mtd-utils/mtd-utils-1.1.0-all-targets.patch create mode 100644 package/mtd/mtd-utils/mtd-utils-1.2.0-all-acl.patch create mode 100644 package/mtd/mtd-utils/mtd-utils-1.2.0-all-disable-ubi.patch create mode 100644 package/mtd/mtd-utils/mtd-utils-1.2.0-all-flashcp-npow2-erase.patch create mode 100644 package/mtd/mtd-utils/mtd-utils-1.2.0-all-no-errorh.patch create mode 100644 package/mtd/mtd-utils/mtd-utils-1.2.0-all-targets.patch diff --git a/CHANGES b/CHANGES index 6b6a6e84f..9894db92b 100644 --- a/CHANGES +++ b/CHANGES @@ -25,6 +25,7 @@ #773: [SECURITY] Update bind to 9.5.2-P1 #795: Minor edits to fix typos, grammar, spelling, usage in documen... #823: Editor backup files (~) is copied from the target_skeleton + #827: Bump mtd-utils package to version 1.2.0 2009.11, Released December 1st, 2009: diff --git a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-acl.patch b/package/mtd/mtd-utils/mtd-utils-1.1.0-all-acl.patch deleted file mode 100644 index 953786eb1..000000000 --- a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-acl.patch +++ /dev/null @@ -1,48 +0,0 @@ -Author: Ulf Samuelsson -Date: 2007-01-25 - -Log: -Patch adding "sys/acl.h" needed to compile mtd. - -Modified: - package/mtd/mtd_acl.patch - -Changeset - package/mtd/mtd_acl.patch - -diff -urN mtd_orig-0rig/include/sys/acl.h mtd_orig/include/sys/acl.h ---- mtd_orig-0rig/include/sys/acl.h 1970-01-01 01:00:00.000000000 +0100 -+++ mtd_orig/include/sys/acl.h 2007-01-17 20:11:22.000000000 +0100 -@@ -0,0 +1,32 @@ -+/* -+ File: linux/posix_acl.h -+ -+ (C) 2002 Andreas Gruenbacher, -+*/ -+ -+ -+#ifndef __LINUX_POSIX_ACL_H -+#define __LINUX_POSIX_ACL_H -+ -+#define ACL_UNDEFINED_ID (-1) -+ -+/* a_type field in acl_user_posix_entry_t */ -+#define ACL_TYPE_ACCESS (0x8000) -+#define ACL_TYPE_DEFAULT (0x4000) -+ -+/* e_tag entry in struct posix_acl_entry */ -+#define ACL_USER_OBJ (0x01) -+#define ACL_USER (0x02) -+#define ACL_GROUP_OBJ (0x04) -+#define ACL_GROUP (0x08) -+#define ACL_MASK (0x10) -+#define ACL_OTHER (0x20) -+ -+/* permissions in the e_perm field */ -+#define ACL_READ (0x04) -+#define ACL_WRITE (0x02) -+#define ACL_EXECUTE (0x01) -+//#define ACL_ADD (0x08) -+//#define ACL_DELETE (0x10) -+ -+#endif /* __LINUX_POSIX_ACL_H */ diff --git a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-flashcp-npow2-erase.patch b/package/mtd/mtd-utils/mtd-utils-1.1.0-all-flashcp-npow2-erase.patch deleted file mode 100644 index b9a0a607c..000000000 --- a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-flashcp-npow2-erase.patch +++ /dev/null @@ -1,23 +0,0 @@ -flashcp: handle non-power-of-2 erase size (E.G. for dataflash) - -Signed-off-by: Peter Korsgaard ---- - flashcp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: mtd-utils-1.1.0/flashcp.c -=================================================================== ---- mtd-utils-1.1.0.orig/flashcp.c 2007-08-03 15:55:51.000000000 +0200 -+++ mtd-utils-1.1.0/flashcp.c 2009-02-17 14:02:09.000000000 +0100 -@@ -255,8 +255,9 @@ - #warning "Check for smaller erase regions" - - erase.start = 0; -- erase.length = filestat.st_size & ~(mtd.erasesize - 1); -- if (filestat.st_size % mtd.erasesize) erase.length += mtd.erasesize; -+ erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize; -+ erase.length *= mtd.erasesize; -+ - if (flags & FLAG_VERBOSE) - { - /* if the user wants verbose output, erase 1 block at a time and show him/her what's going on */ diff --git a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch b/package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch deleted file mode 100644 index 1fe23c8c0..000000000 --- a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -mkfs.jffs2.c: fix device_table handling - -find_filesystem_entry would ignore device_table entries for existing elements -if the device type / permissions weren't exactly the same, effectively -rendering device_table useless. ---- - mkfs.jffs2.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -Index: mtd-utils-1.1.0/mkfs.jffs2.c -=================================================================== ---- mtd-utils-1.1.0.orig/mkfs.jffs2.c -+++ mtd-utils-1.1.0/mkfs.jffs2.c -@@ -246,8 +246,7 @@ - e = dir->files; - } - while (e) { -- /* Only bother to do the expensive strcmp on matching file types */ -- if (type == (e->sb.st_mode & S_IFMT)) { -+ if (1) { - if (S_ISDIR(e->sb.st_mode)) { - int len = strlen(e->fullname); - diff --git a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-targets.patch b/package/mtd/mtd-utils/mtd-utils-1.1.0-all-targets.patch deleted file mode 100644 index e887118e2..000000000 --- a/package/mtd/mtd-utils/mtd-utils-1.1.0-all-targets.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -urN mtd-utils-1.1.0-0rig/Makefile mtd-utils-1.1.0/Makefile ---- mtd-utils-1.1.0-0rig/Makefile 2007-08-03 15:55:51.000000000 +0200 -+++ mtd-utils-1.1.0/Makefile 2007-09-27 08:20:55.000000000 +0200 -@@ -72,6 +72,30 @@ - $(BUILDDIR)/sumtool: $(BUILDDIR)/sumtool.o $(BUILDDIR)/crc32.o - $(CC) $(LDFLAGS) -o $@ $^ - -+ftl_format: $(BUILDDIR)/ftl_format -+flash_erase: $(BUILDDIR)/flash_erase -+flash_eraseall: $(BUILDDIR)/flash_eraseall -+nanddump: $(BUILDDIR)/nanddump -+doc_loadbios: $(BUILDDIR)/doc_loadbios -+mkfs.jffs: $(BUILDDIR)/mkfs.jffs -+ftl_check: $(BUILDDIR)/ftl_check -+mkfs.jffs2: $(BUILDDIR)/mkfs.jffs2 -+flash_lock: $(BUILDDIR)/flash_lock -+flash_unlock: $(BUILDDIR)/flash_unlock -+flash_info: $(BUILDDIR)/flash_info -+flash_otp_info: $(BUILDDIR)/flash_otp_info -+flash_otp_dump: $(BUILDDIR)/flash_otp_dump -+mtd_debug: $(BUILDDIR)/mtd_debug -+flashcp: $(BUILDDIR)/flashcp -+nandwrite: $(BUILDDIR)/nandwrite -+jffs2dump: $(BUILDDIR)/jffs2dump -+nftldump: $(BUILDDIR)/nftldump -+nftl_format: $(BUILDDIR)/nftl_format -+docfdisk: $(BUILDDIR)/docfdisk -+rfddump: $(BUILDDIR)/rfddump -+rfdformat: $(BUILDDIR)/rfdformat -+sumtool: $(BUILDDIR)/sumtool -+ - install: ${TARGETS} - mkdir -p ${DESTDIR}/${SBINDIR} - install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/ diff --git a/package/mtd/mtd-utils/mtd-utils-1.2.0-all-acl.patch b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-acl.patch new file mode 100644 index 000000000..953786eb1 --- /dev/null +++ b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-acl.patch @@ -0,0 +1,48 @@ +Author: Ulf Samuelsson +Date: 2007-01-25 + +Log: +Patch adding "sys/acl.h" needed to compile mtd. + +Modified: + package/mtd/mtd_acl.patch + +Changeset + package/mtd/mtd_acl.patch + +diff -urN mtd_orig-0rig/include/sys/acl.h mtd_orig/include/sys/acl.h +--- mtd_orig-0rig/include/sys/acl.h 1970-01-01 01:00:00.000000000 +0100 ++++ mtd_orig/include/sys/acl.h 2007-01-17 20:11:22.000000000 +0100 +@@ -0,0 +1,32 @@ ++/* ++ File: linux/posix_acl.h ++ ++ (C) 2002 Andreas Gruenbacher, ++*/ ++ ++ ++#ifndef __LINUX_POSIX_ACL_H ++#define __LINUX_POSIX_ACL_H ++ ++#define ACL_UNDEFINED_ID (-1) ++ ++/* a_type field in acl_user_posix_entry_t */ ++#define ACL_TYPE_ACCESS (0x8000) ++#define ACL_TYPE_DEFAULT (0x4000) ++ ++/* e_tag entry in struct posix_acl_entry */ ++#define ACL_USER_OBJ (0x01) ++#define ACL_USER (0x02) ++#define ACL_GROUP_OBJ (0x04) ++#define ACL_GROUP (0x08) ++#define ACL_MASK (0x10) ++#define ACL_OTHER (0x20) ++ ++/* permissions in the e_perm field */ ++#define ACL_READ (0x04) ++#define ACL_WRITE (0x02) ++#define ACL_EXECUTE (0x01) ++//#define ACL_ADD (0x08) ++//#define ACL_DELETE (0x10) ++ ++#endif /* __LINUX_POSIX_ACL_H */ diff --git a/package/mtd/mtd-utils/mtd-utils-1.2.0-all-disable-ubi.patch b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-disable-ubi.patch new file mode 100644 index 000000000..606cb46d7 --- /dev/null +++ b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-disable-ubi.patch @@ -0,0 +1,24 @@ +diff -Nura mtd-utils-1.2.0/Makefile mtd-utils-1.2.0-noubi/Makefile +--- mtd-utils-1.2.0/Makefile 2008-06-27 13:21:28.000000000 -0300 ++++ mtd-utils-1.2.0-noubi/Makefile 2009-12-23 10:26:25.000000000 -0300 +@@ -45,7 +45,6 @@ + .SUFFIXES: + + all: $(TARGETS) +- make -C $(BUILDDIR)/ubi-utils + + IGNORE=${wildcard $(BUILDDIR)/.*.c.dep} + -include ${IGNORE} +@@ -53,7 +52,6 @@ + clean: + rm -f $(BUILDDIR)/*.o $(TARGETS) $(BUILDDIR)/.*.c.dep $(SYMLINKS) + if [ "$(BUILDDIR)x" != ".x" ]; then rm -rf $(BUILDDIR); fi +- make -C $(BUILDDIR)/ubi-utils clean + + $(SYMLINKS): + ln -sf ../fs/jffs2/$@ $@ +@@ -95,4 +93,3 @@ + install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/ + mkdir -p ${DESTDIR}/${MANDIR}/man1 + gzip -9c mkfs.jffs2.1 > ${DESTDIR}/${MANDIR}/man1/mkfs.jffs2.1.gz +- make -C $(BUILDDIR)/ubi-utils install diff --git a/package/mtd/mtd-utils/mtd-utils-1.2.0-all-flashcp-npow2-erase.patch b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-flashcp-npow2-erase.patch new file mode 100644 index 000000000..b9a0a607c --- /dev/null +++ b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-flashcp-npow2-erase.patch @@ -0,0 +1,23 @@ +flashcp: handle non-power-of-2 erase size (E.G. for dataflash) + +Signed-off-by: Peter Korsgaard +--- + flashcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: mtd-utils-1.1.0/flashcp.c +=================================================================== +--- mtd-utils-1.1.0.orig/flashcp.c 2007-08-03 15:55:51.000000000 +0200 ++++ mtd-utils-1.1.0/flashcp.c 2009-02-17 14:02:09.000000000 +0100 +@@ -255,8 +255,9 @@ + #warning "Check for smaller erase regions" + + erase.start = 0; +- erase.length = filestat.st_size & ~(mtd.erasesize - 1); +- if (filestat.st_size % mtd.erasesize) erase.length += mtd.erasesize; ++ erase.length = (filestat.st_size + mtd.erasesize - 1) / mtd.erasesize; ++ erase.length *= mtd.erasesize; ++ + if (flags & FLAG_VERBOSE) + { + /* if the user wants verbose output, erase 1 block at a time and show him/her what's going on */ diff --git a/package/mtd/mtd-utils/mtd-utils-1.2.0-all-no-errorh.patch b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-no-errorh.patch new file mode 100644 index 000000000..1fde16b1e --- /dev/null +++ b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-no-errorh.patch @@ -0,0 +1,22 @@ +diff -Nura mtd-utils-1.2.0/recv_image.c mtd-utils-1.2.0-noerror/recv_image.c +--- mtd-utils-1.2.0/recv_image.c 2008-06-27 13:21:28.000000000 -0300 ++++ mtd-utils-1.2.0-noerror/recv_image.c 2009-12-23 10:19:22.000000000 -0300 +@@ -2,7 +2,6 @@ + #define _XOPEN_SOURCE 500 + + #include +-#include + #include + #define __USE_GNU + #include +diff -Nura mtd-utils-1.2.0/serve_image.c mtd-utils-1.2.0-noerror/serve_image.c +--- mtd-utils-1.2.0/serve_image.c 2008-06-27 13:21:28.000000000 -0300 ++++ mtd-utils-1.2.0-noerror/serve_image.c 2009-12-23 10:19:33.000000000 -0300 +@@ -3,7 +3,6 @@ + #include + + #include +-#include + #include + #include + #include diff --git a/package/mtd/mtd-utils/mtd-utils-1.2.0-all-targets.patch b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-targets.patch new file mode 100644 index 000000000..e887118e2 --- /dev/null +++ b/package/mtd/mtd-utils/mtd-utils-1.2.0-all-targets.patch @@ -0,0 +1,34 @@ +diff -urN mtd-utils-1.1.0-0rig/Makefile mtd-utils-1.1.0/Makefile +--- mtd-utils-1.1.0-0rig/Makefile 2007-08-03 15:55:51.000000000 +0200 ++++ mtd-utils-1.1.0/Makefile 2007-09-27 08:20:55.000000000 +0200 +@@ -72,6 +72,30 @@ + $(BUILDDIR)/sumtool: $(BUILDDIR)/sumtool.o $(BUILDDIR)/crc32.o + $(CC) $(LDFLAGS) -o $@ $^ + ++ftl_format: $(BUILDDIR)/ftl_format ++flash_erase: $(BUILDDIR)/flash_erase ++flash_eraseall: $(BUILDDIR)/flash_eraseall ++nanddump: $(BUILDDIR)/nanddump ++doc_loadbios: $(BUILDDIR)/doc_loadbios ++mkfs.jffs: $(BUILDDIR)/mkfs.jffs ++ftl_check: $(BUILDDIR)/ftl_check ++mkfs.jffs2: $(BUILDDIR)/mkfs.jffs2 ++flash_lock: $(BUILDDIR)/flash_lock ++flash_unlock: $(BUILDDIR)/flash_unlock ++flash_info: $(BUILDDIR)/flash_info ++flash_otp_info: $(BUILDDIR)/flash_otp_info ++flash_otp_dump: $(BUILDDIR)/flash_otp_dump ++mtd_debug: $(BUILDDIR)/mtd_debug ++flashcp: $(BUILDDIR)/flashcp ++nandwrite: $(BUILDDIR)/nandwrite ++jffs2dump: $(BUILDDIR)/jffs2dump ++nftldump: $(BUILDDIR)/nftldump ++nftl_format: $(BUILDDIR)/nftl_format ++docfdisk: $(BUILDDIR)/docfdisk ++rfddump: $(BUILDDIR)/rfddump ++rfdformat: $(BUILDDIR)/rfdformat ++sumtool: $(BUILDDIR)/sumtool ++ + install: ${TARGETS} + mkdir -p ${DESTDIR}/${SBINDIR} + install -m0755 ${TARGETS} ${DESTDIR}/${SBINDIR}/ diff --git a/package/mtd/mtd-utils/mtd.mk b/package/mtd/mtd-utils/mtd.mk index 664737391..9b114de68 100644 --- a/package/mtd/mtd-utils/mtd.mk +++ b/package/mtd/mtd-utils/mtd.mk @@ -3,7 +3,7 @@ # mtd provides jffs2 utilities # ############################################################# -MTD_VERSION:=1.1.0 +MTD_VERSION:=1.2.0 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils MTD_HOST_DIR:= $(TOOLCHAIN_DIR)/mtd_orig -- cgit v1.2.3