Skip to contentSkip to conversation

mtd-utils

PATCH Superseded Michael Roth 2 participants 7 messages Mar 26, 2009 – Apr 2, 2009

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover mtd-utils

Hello,

I refurbished the mtd-utils a little bit. Hope it is ok. If not, please let me know.

Michael Roth

#1 lore raw

PATCH 1/5 mtd-utils: Prepare for version dump

Prepared for new mtd-utils version and some cleanup and clarification on configure options.

---
 package/mtd/1.1.0/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/1.1.0/mtd-utils-1.1.0-all-targets.patch    |   34 +++++
 package/mtd/1.1.0/mtd.mk                           |  128 ++++++++++++++++++++
 package/mtd/Config.in                              |   49 ++++----
 .../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 -----
 package/mtd/mtd-utils/mtd.mk                       |  128 --------------------
 package/mtd/mtd.mk                                 |    8 +-
 12 files changed, 287 insertions(+), 282 deletions(-)
 create mode 100644 package/mtd/1.1.0/mtd-utils-1.1.0-all-acl.patch
 create mode 100644 package/mtd/1.1.0/mtd-utils-1.1.0-all-flashcp-npow2-erase.patch
 create mode 100644 package/mtd/1.1.0/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch
 create mode 100644 package/mtd/1.1.0/mtd-utils-1.1.0-all-targets.patch
 create mode 100644 package/mtd/1.1.0/mtd.mk
 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
 delete mode 100644 package/mtd/mtd-utils/mtd.mk
package/mtd/1.1.0/mtd-utils-1.1.0-all-acl.patch new file +48 -0
new file mode 100644
index 0000000..953786e
@@ -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, <[email protected]>
++*/
++
++
++#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 */
package/mtd/1.1.0/mtd-utils-1.1.0-all-flashcp-npow2-erase.patch new file +23 -0
new file mode 100644
index 0000000..b9a0a60
@@ -0,0 +1,23 @@
+flashcp: handle non-power-of-2 erase size (E.G. for dataflash)
+
+Signed-off-by: Peter Korsgaard <[email protected]>
+---
+ 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 */
package/mtd/1.1.0/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch new file +23 -0
new file mode 100644
index 0000000..1fe23c8
@@ -0,0 +1,23 @@
+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);
+ 
package/mtd/1.1.0/mtd-utils-1.1.0-all-targets.patch new file +34 -0
new file mode 100644
index 0000000..e887118
@@ -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}/
package/mtd/1.1.0/mtd.mk new file +128 -0

128 lines not on this page · raw message

package/mtd/Config.in +27 -22

83 lines not on this page · raw message

package/mtd/mtd-utils/mtd-utils-1.1.0-all-acl.patch deleted +0 -48

48 lines not on this page · raw message

package/mtd/mtd-utils/mtd-utils-1.1.0-all-flashcp-npow2-erase.patch deleted +0 -23
deleted file mode 100644
index b9a0a60..0000000
@@ -1,23 +0,0 @@
-flashcp: handle non-power-of-2 erase size (E.G. for dataflash)
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- 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 */
package/mtd/mtd-utils/mtd-utils-1.1.0-all-mkfs.jffs2-device_table-fix.patch deleted +0 -23
deleted file mode 100644
index 1fe23c8..0000000
@@ -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);
- 
package/mtd/mtd-utils/mtd-utils-1.1.0-all-targets.patch deleted +0 -34
deleted file mode 100644
index e887118..0000000
@@ -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}/
package/mtd/mtd-utils/mtd.mk deleted +0 -128

128 lines not on this page · raw message

package/mtd/mtd.mk +4 -4
index c7774fd..9d66698 100644
@@ -1,10 +1,10 @@
-ifeq ($(BR2_PACKAGE_MTD_UTILS),y)
-include package/mtd/mtd-utils/mtd.mk
+ifeq ($(BR2_PACKAGE_MTD_UTILS_1_1_0),y)
+include package/mtd/1.1.0/mtd.mk
 endif
-ifeq ($(BR2_PACKAGE_MTD_20061007),y)
+ifeq ($(BR2_PACKAGE_MTD_UTILS_20061007),y)
 include package/mtd/20061007/mtd.mk
 endif
-ifeq ($(BR2_PACKAGE_MTD_20050122),y)
+ifeq ($(BR2_PACKAGE_MTD_UTILS_20050122),y)
 include package/mtd/20050122/mtd.mk
 endif
 ifeq ($(BR2_PACKAGE_MTD_UTILS_GIT),y)
Signature · 1 line
1.6.0.6
#2 lore raw

PATCH 3/5 mtd-utils: Prepare for upcoming mtd-utils with included mkfs.ubifs

In reply to Michael Roth

The upcoming mtd-utils have mkfs.ubifs included. So some minor tweaks to the jffs2 root filesystem build are necessary to distinguish it from an ubifs root filesytem build.

---
 package/mtd/1.1.0/mtd.mk    |    4 ++--
 package/mtd/1.2.0/mtd.mk    |    4 ++--
 package/mtd/20050122/mtd.mk |    4 ++--
 package/mtd/20061007/mtd.mk |    4 ++--
 target/jffs2/jffs2root.mk   |    6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)
package/mtd/1.1.0/mtd.mk +2 -2
index e89e9ce..76131a8 100644
@@ -46,11 +46,11 @@ $(SUMTOOL): $(MTD_HOST_DIR)/.unpacked
 		BUILDDIR=$(MTD_HOST_DIR) \
 		-C $(MTD_HOST_DIR) sumtool
 
-mtd-host: $(MKFS_JFFS2) $(SUMTOOL)
+mtd-host-jffs2: $(MKFS_JFFS2) $(SUMTOOL)
 
 mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
 
-mtd-host-clean:
+mtd-host-jffs2-clean:
 	-$(MAKE) -C $(MTD_HOST_DIR) clean
 
 mtd-host-dirclean:
package/mtd/1.2.0/mtd.mk +2 -2
index 76340e5..979075a 100644
@@ -44,11 +44,11 @@ $(SUMTOOL): $(MTD_HOST_DIR)/.unpacked
 		BUILDDIR=$(MTD_HOST_DIR) \
 		-C $(MTD_HOST_DIR) sumtool
 
-mtd-host: $(MKFS_JFFS2) $(SUMTOOL)
+mtd-host-jffs2: $(MKFS_JFFS2) $(SUMTOOL)
 
 mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
 
-mtd-host-clean:
+mtd-host-jffs2-clean:
 	-$(MAKE) -C $(MTD_HOST_DIR) clean
 
 mtd-host-dirclean:
package/mtd/20050122/mtd.mk +2 -2
index b5a9d5c..a456edd 100644
@@ -40,11 +40,11 @@ $(SUMTOOL): $(MTD_HOST_DIR)/.unpacked
 	CFLAGS=-I$(LINUX_HEADERS_DIR)/include $(MAKE) CC="$(HOSTCC)" CROSS= \
 		LINUXDIR=$(LINUX_DIR) -C $(MTD_HOST_DIR)/util sumtool
 
-mtd-host: $(MKFS_JFFS2) $(SUMTOOL)
+mtd-host-jffs2: $(MKFS_JFFS2) $(SUMTOOL)
 
 mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
 
-mtd-host-clean:
+mtd-host-jffs2-clean:
 	-$(MAKE) -C $(MTD_HOST_DIR) clean
 
 mtd-host-dirclean:
package/mtd/20061007/mtd.mk +2 -2
index dfd3485..f299a60 100644
@@ -38,11 +38,11 @@ $(SUMTOOL): $(MTD_HOST_DIR)/.unpacked
 	CC="$(HOSTCC)" CROSS= CFLAGS=-I$(LINUX_HEADERS_DIR)/include \
 		$(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_HOST_DIR) sumtool
 
-mtd-host: $(MKFS_JFFS2) $(SUMTOOL)
+mtd-host-jffs2: $(MKFS_JFFS2) $(SUMTOOL)
 
 mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
 
-mtd-host-clean:
+mtd-host-jffs2-clean:
 	-$(MAKE) -C $(MTD_HOST_DIR) clean
 
 mtd-host-dirclean:
target/jffs2/jffs2root.mk +3 -3
index dc176cd..d80e89e 100644
@@ -44,12 +44,12 @@ endif
 
 
 #
-# mtd-host is a dependency which builds a local copy of mkfs.jffs2 if it is needed.
+# mtd-host-jffs2 is a dependency which builds a local copy of mkfs.jffs2 if it is needed.
 # the actual build is done from package/mtd/mtd.mk and it sets the
 # value of MKFS_JFFS2 to either the previously installed copy or the one
 # just built.
 #
-$(JFFS2_TARGET): host-fakeroot makedevs mtd-host
+$(JFFS2_TARGET): host-fakeroot makedevs mtd-host-jffs2
 	- at find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
 ifneq ($(BR2_HAVE_MANPAGES),y)
 	@rm -rf $(TARGET_DIR)/usr/man
@@ -99,7 +99,7 @@ endif
 
 jffs2root-source: mtd-host-source
 
-jffs2root-clean: mtd-host-clean
+jffs2root-clean: mtd-host-jffs2-clean
 	-rm -f $(JFFS2_TARGET)
 
 jffs2root-dirclean: mtd-host-dirclean
Signature · 1 line
1.6.0.6
#3 lore raw

PATCH 4/5 mtd-utils: Version bump of the GIT source

In reply to Michael Roth

GIT version of mtd-utils bumped to 2009-03-26 and support for the included mkfs.ubifs added.

---
 package/mtd/Config.in                              |    9 +
 package/mtd/git/mtd.mk                             |  178 ++++++++++++++++++++
 package/mtd/git/remove-file-offset-bits.patch      |   11 ++
 .../mtd/mtd-utils.git/mtd-utils-all-targets.patch  |   34 ----
 .../mtd/mtd-utils.git/mtd-utils-target-acl.patch   |   48 ------
 package/mtd/mtd-utils.git/mtd.mk                   |  145 ----------------
 package/mtd/mtd.mk                                 |    2 +-
 7 files changed, 199 insertions(+), 228 deletions(-)
 create mode 100644 package/mtd/git/mtd.mk
 create mode 100644 package/mtd/git/remove-file-offset-bits.patch
 delete mode 100644 package/mtd/mtd-utils.git/mtd-utils-all-targets.patch
 delete mode 100644 package/mtd/mtd-utils.git/mtd-utils-target-acl.patch
 delete mode 100644 package/mtd/mtd-utils.git/mtd.mk
package/mtd/Config.in +9 -0
index 8c78a97..ffc02e4 100644
@@ -1,6 +1,7 @@
 menuconfig BR2_PACKAGE_MTD
 	bool "mtd/jffs2 utilities"
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LZO
 	help
 	  Build mtd/jffs utilities
 
@@ -131,6 +132,14 @@ config BR2_PACKAGE_MTD_MKFSJFFS2
 	default y
 	depends on BR2_PACKAGE_MTD
 
+config BR2_PACKAGE_MTD_MKFSUBIFS
+	bool "mkfs.ubifs"
+	default n
+	depends on BR2_PACKAGE_MTD_UTILS_GIT && BR2_LARGEFILE && BR2_PACKAGE_E2FSPROGS
+
+comment "mkfs.ubifs requires LARGEFILE support and depends on e2fsprogs"
+        depends on BR2_PACKAGE_MTD_UTILS_GIT && (!BR2_LARGEFILE || !BR2_PACKAGE_E2FSPROGS)
+
 config BR2_PACKAGE_MTD_MTD_DEBUG
 	bool "mtd_debug"
 	default y
package/mtd/git/mtd.mk new file +178 -0

178 lines not on this page · raw message

package/mtd/git/remove-file-offset-bits.patch new file +11 -0
new file mode 100644
index 0000000..1905a8a
@@ -0,0 +1,11 @@
+diff -ur mtd-utils.git/common.mk mtd-utils.work/common.mk
+--- mtd-utils.git/common.mk	2009-03-25 22:58:54.000000000 +0100
++++ mtd-utils.work/common.mk	2009-03-26 01:22:24.000000000 +0100
+@@ -12,7 +12,6 @@
+ 	$(call cc-option,-Wwrite-strings) \
+ 	$(call cc-option,-Wno-sign-compare)
+ CFLAGS += $(WFLAGS)
+-CPPFLAGS += -D_FILE_OFFSET_BITS=64
+ 
+ DESTDIR ?= /usr/local
+ PREFIX=/usr
package/mtd/mtd-utils.git/mtd-utils-all-targets.patch deleted +0 -34
deleted file mode 100644
index e887118..0000000
@@ -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}/
package/mtd/mtd-utils.git/mtd-utils-target-acl.patch deleted +0 -48

48 lines not on this page · raw message

package/mtd/mtd-utils.git/mtd.mk deleted +0 -145

145 lines not on this page · raw message

package/mtd/mtd.mk +1 -1
index 7a2c70e..f7222b3 100644
@@ -11,5 +11,5 @@ ifeq ($(BR2_PACKAGE_MTD_UTILS_20050122),y)
 include package/mtd/20050122/mtd.mk
 endif
 ifeq ($(BR2_PACKAGE_MTD_UTILS_GIT),y)
-include package/mtd/mtd-utils.git/mtd.mk
+include package/mtd/git/mtd.mk
 endif
Signature · 1 line
1.6.0.6
#4 lore raw

PATCH 4/5 mtd-utils: Version bump of the GIT source

Quoted 3 lines · Michael Roth

GIT version of mtd-utils bumped to 2009-03-26 and support for the included mkfs.ubifs added.

[...]

package/mtd/Config.in config BR2_PACKAGE_MTD_MKFSJFFS2 · line 136

Quoted 2 lines
package/mtd/Config.in +2 -0
+config BR2_PACKAGE_MTD_MKFSUBIFS
+	bool "mkfs.ubifs"

It's pretty unlikely that you would want mkfs.ubifs on your target system but I guess it's correct to include it. Actually I may need it for my current project anyway :-|

package/mtd/Config.in config BR2_PACKAGE_MTD_MKFSJFFS2 · line 137

Quoted 1 line
package/mtd/Config.in +1 -0
+	default n

That's superflous.

package/mtd/Config.in config BR2_PACKAGE_MTD_MKFSJFFS2 · line 138

Quoted 1 line
package/mtd/Config.in +1 -0
+	depends on BR2_PACKAGE_MTD_UTILS_GIT && BR2_LARGEFILE && BR2_PACKAGE_E2FSPROGS

Depending on BR2_PACKAGE_E2FSPROGS also means a bunch of other binaries get included by default. I think libuuid needs to be split out into a separate package built from the same source tarball.

Hamish

Signature · 1 line
Hamish Moffatt VK3SB <[email protected]> <[email protected]>
#5 lore raw

PATCH 5/5 target/ubifs: Switched to mkfs.ubifs included in mtd-utils

In reply to Michael Roth

The mkfs.ubifs is included in the upcomming mtd-utils. So the ubifs root filesytem target uses the mtd-utils package analog to the jffs2 root filesystem target.

---
 target/ubifs/Config.in    |    4 +++
 target/ubifs/ubifsroot.mk |   53 ++++++++++++---------------------------------
 2 files changed, 18 insertions(+), 39 deletions(-)
target/ubifs/Config.in +4 -0
index 85229f6..7544b50 100644
@@ -1,9 +1,13 @@
 config BR2_TARGET_ROOTFS_UBIFS
 	bool "ubifs root filesystem"
 	select BR2_HOST_FAKEROOT
+	depends on BR2_PACKAGE_MTD_UTILS_GIT
 	help
 	  Build a ubifs root filesystem
 
+comment "ubifs root filesystem depends on latest mtd-utils (from GIT)"
+        depends on !BR2_PACKAGE_MTD_UTILS_GIT
+
 config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
 	hex "UBI logical erase block size"
 	depends on BR2_TARGET_ROOTFS_UBIFS
target/ubifs/ubifsroot.mk +14 -39

78 lines not on this page · raw message

Signature · 1 line
1.6.0.6
#6 lore raw

PATCH 5/5 target/ubifs: Switched to mkfs.ubifs included in mtd-utils

Quoted 3 lines · Michael Roth

The mkfs.ubifs is included in the upcomming mtd-utils. So the ubifs root filesytem target uses the mtd-utils package analog to the jffs2 root filesystem target.

Thanks, I just did something similar in my own tree.

target/ubifs/Config.in line 4

Quoted 9 lines
target/ubifs/Config.in +1 -0
index 85229f6..7544b50 100644
@@ -1,9 +1,13 @@
 config BR2_TARGET_ROOTFS_UBIFS
 	bool "ubifs root filesystem"
 	select BR2_HOST_FAKEROOT
+	depends on BR2_PACKAGE_MTD_UTILS_GIT

This is needed due to the ugly multiple MTD versions stuff, but it has the unfortunate side-effect of adding target binaries too - all the default MTD utilities.

One solution would be to duplicate the mtd-utils.git stuff within a separate host-only mkfs.ubifs target. Either inside target/ubifsroot, or in toolchain or whatever. That could be switched over to mtd-utils 1.x.0 when it's released.

Hamish

Signature · 1 line
Hamish Moffatt VK3SB <[email protected]> <[email protected]>