Commit 9400c735 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

Bump mtd-utils to 1.2.0



Closes #827.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent b21c77cc
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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:

+0 −23
Original line number Diff line number Diff line
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);
 
+24 −0
Original line number Diff line number Diff line
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
Loading