Update mtd to a current snapshot, change the mkfs.jffs2 -i cmdline option to

-I, and rename mtd and mtd-native to mtd-utils and mtd-utils-native,
respectively.

BKrev: 41cb37a93c5EX_vlgegLnIyk0WIAEQ

9 files changed, 5 insertions, 19 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index ccb740ed0b..03da65f4c0 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -167,7 +167,7 @@ IMAGE_ROOTFS_SIZE_ext2 = "65536"
 IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
 
 IMAGE_DEPENDS = ""
-IMAGE_DEPENDS_jffs2 = "mtd-native"
+IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
 IMAGE_DEPENDS_cramfs = "cramfs-native"
 IMAGE_DEPENDS_ext2 = "genext2fs-native"
 IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
diff --git a/packages/linux/linux-mtx-1_2.4.24.bb b/packages/linux/linux-mtx-1_2.4.24.bb
index ec7aecdd71..0a9e9a487e 100644
--- a/packages/linux/linux-mtx-1_2.4.24.bb
+++ b/packages/linux/linux-mtx-1_2.4.24.bb
@@ -3,8 +3,8 @@ DESCRIPTION = "Linux kernel for MTX-1 (MeshCube)"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
 KV = "${PV}"
-RDEPENDS = "mtd"
-PR="r1"
+RDEPENDS = "mtd-utils"
+PR="r2"
 
 SRC_URI = "cvs://cvs:cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_24_pre2 \
 	file://01-mtd-2004-01-27.diff;patch=1 \
diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb
index 35930986e5..af1f5d5490 100644
--- a/packages/linux/linux-mtx-1_2.4.27.bb
+++ b/packages/linux/linux-mtx-1_2.4.27.bb
@@ -3,8 +3,8 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 HOMEPAGE = "http://meshcube.org/meshwiki/"
 LICENSE = "GPL"
 KV = "${PV}"
-PR = "r1"
-RDEPENDS = "mtd"
+PR = "r2"
+RDEPENDS = "mtd-utils"
 
 SRC_URI = "cvs://cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_27 \
 	file://01-mtd-2004-01-27.diff;patch=1 \
diff --git a/packages/mtd/mtd-native_20041113.bb b/packages/mtd/mtd-native_20041113.bb
deleted file mode 100644
index 0cecc710ba..0000000000
--- a/packages/mtd/mtd-native_20041113.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "GPLv2"
-SECTION = "base"
-include mtd_${PV}.bb
-inherit native
-DEPENDS = "patcher-native zlib-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd"
-
-do_stage () {
-	for binary in ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
-		mkfs.jffs ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
-		flashcp nandwrite jffs2dump; do
-		install -m 0755 util/$binary ${STAGING_BINDIR}/
-	done
-}
diff --git a/packages/mtd/mtd/add-exclusion-to-mkfs-jffs2.patch b/packages/mtd/mtd-utils-native_20041222.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/mtd/mtd/add-exclusion-to-mkfs-jffs2.patch
+++ b/packages/mtd/mtd-utils-native_20041222.bb
diff --git a/packages/mtd/mtd/removelinuxinc.patch b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/mtd/mtd/removelinuxinc.patch
+++ b/packages/mtd/mtd-utils/add-exclusion-to-mkfs-jffs2.patch
diff --git a/packages/mtd/mtd/stdint.patch b/packages/mtd/mtd-utils/removelinuxinc.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/mtd/mtd/stdint.patch
+++ b/packages/mtd/mtd-utils/removelinuxinc.patch
diff --git a/packages/mtd/mtd_20041113.bb b/packages/mtd/mtd-utils/stdint.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/mtd/mtd_20041113.bb
+++ b/packages/mtd/mtd-utils/stdint.patch
diff --git a/packages/mtd/mtd-utils_20041222.bb b/packages/mtd/mtd-utils_20041222.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/mtd/mtd-utils_20041222.bb