mtd-utils(-native): add v1.3.1

* also convert mtd-utils(-native) to new-style staging
* old-style ubifs commands have been removed in v1.3.1

4 files changed, 48 insertions, 22 deletions

diff --git a/recipes/mtd/mtd-utils-native.inc b/recipes/mtd/mtd-utils-native.inc
index 28696b46d5..aaef4ac666 100644
--- a/recipes/mtd/mtd-utils-native.inc
+++ b/recipes/mtd/mtd-utils-native.inc
@@ -2,12 +2,4 @@ inherit native
 DEPENDS = "zlib-native lzo-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils"
 
-do_stage () {
-        install -d ${STAGING_INCDIR}/mtd
-        for f in ${S}/include/mtd/*.h; do
-                install -m 0644 $f ${STAGING_INCDIR}/mtd/
-        done
-        for binary in ${mtd_utils}; do
-                install -m 0755 $binary ${STAGING_BINDIR}
-        done
-}
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/mtd/mtd-utils-native_1.3.1.bb b/recipes/mtd/mtd-utils-native_1.3.1.bb
new file mode 100644
index 0000000000..85692a0e91
--- /dev/null
+++ b/recipes/mtd/mtd-utils-native_1.3.1.bb
@@ -0,0 +1,7 @@
+# Doesn't build for everyone, errors range from missing includes to linking errors
+DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_angstrom = "1"
+
+require mtd-utils_${PV}.bb
+require mtd-utils-native.inc
+DEPENDS += "e2fsprogs-libs-native"
diff --git a/recipes/mtd/mtd-utils.inc b/recipes/mtd/mtd-utils.inc
index 813a09fb13..319fd9a7bc 100644
--- a/recipes/mtd/mtd-utils.inc
+++ b/recipes/mtd/mtd-utils.inc
@@ -11,18 +11,6 @@ S = "${WORKDIR}/mtd-utils-${PV}"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'"
 
-do_stage () {
-	install -d ${STAGING_INCDIR}/mtd
-	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${STAGING_INCDIR}/mtd/
-	done
-	for binary in ${mtd_utils}; do
-		if [ -f $binary ]; then
-			install -m 0755 $binary ${STAGING_BINDIR}
-		fi
-	done
-}
-
 do_install () {
 	install -d ${D}${bindir}
 	install -d ${D}${includedir}/mtd
@@ -79,7 +67,19 @@ mtd_utils = " docfdisk \
 	ubi-utils/new-utils/ubinfo \
 	ubi-utils/new-utils/ubinize \
 	ubi-utils/new-utils/ubirmvol \
-	ubi-utils/new-utils/ubiupdatevol"
+    ubi-utils/new-utils/ubirsvol \
+	ubi-utils/new-utils/ubiupdatevol \
+    ubi-utils/ubiattach \
+    ubi-utils/ubicrc32 \
+    ubi-utils/ubidetach \
+    ubi-utils/ubiformat \
+    ubi-utils/ubimkvol \
+    ubi-utils/ubinfo \
+    ubi-utils/ubinize \
+    ubi-utils/ubirmvol \
+    ubi-utils/ubirsvol \
+    ubi-utils/ubiupdatevol \
+"
 
 PACKAGES =+ "mkfs-jffs mkfs-jffs2 mkfs-ubifs"
 FILES_mkfs-jffs = "${bindir}/mkfs.jffs"
diff --git a/recipes/mtd/mtd-utils_1.3.1.bb b/recipes/mtd/mtd-utils_1.3.1.bb
new file mode 100644
index 0000000000..ee7f96298f
--- /dev/null
+++ b/recipes/mtd/mtd-utils_1.3.1.bb
@@ -0,0 +1,27 @@
+require mtd-utils.inc
+
+DEPENDS += "e2fsprogs-libs"
+
+PARALLEL_MAKE = ""
+ARM_INSTRUCTION_SET = "arm"
+
+# This is the default package, thus we lock to a specific git version so 
+# upstream changes will not break builds.
+
+TAG = "v${PV}"
+
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \
+	   file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1 \
+	   file://fix-ignoreerrors-git.patch;patch=1 \
+	   file://lzo_1x-git.patch;patch=1"
+
+S = "${WORKDIR}/git/"
+
+do_configure_prepend() {
+	for i in $(find . -name "Makefile") ; do
+		sed -i -e s:lzo2:lzo:g $i
+	done
+	if [ -e mkfs.ubifs/compr.c ]; then
+		sed -i -e s:lzo/::g mkfs.ubifs/compr.c
+	fi
+}