From fc132cbdba6780990fc6041c612396256fbc39bc Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sun, 5 Jul 2015 22:39:52 +0300
Subject: [PATCH] mtd-utils: update to 1.5.0

---
 recipes/lzo/lzo2_2.09.bb                  | 23 +++++++++++++++
 recipes/mtd/mtd-utils-native.inc          |  5 ----
 recipes/mtd/mtd-utils-native_1.1.0.bb     |  5 ----
 recipes/mtd/mtd-utils-native_1.2.0+git.bb |  7 -----
 recipes/mtd/mtd-utils-native_1.3.1.bb     |  7 -----
 recipes/mtd/mtd-utils_1.5.0.bb            | 34 +++++++++++++++++++++++
 6 files changed, 57 insertions(+), 24 deletions(-)
 create mode 100644 recipes/lzo/lzo2_2.09.bb
 delete mode 100644 recipes/mtd/mtd-utils-native.inc
 delete mode 100644 recipes/mtd/mtd-utils-native_1.1.0.bb
 delete mode 100644 recipes/mtd/mtd-utils-native_1.2.0+git.bb
 delete mode 100644 recipes/mtd/mtd-utils-native_1.3.1.bb
 create mode 100644 recipes/mtd/mtd-utils_1.5.0.bb

diff --git a/recipes/lzo/lzo2_2.09.bb b/recipes/lzo/lzo2_2.09.bb
new file mode 100644
index 0000000000..a3bc4fd596
--- /dev/null
+++ b/recipes/lzo/lzo2_2.09.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Lossless data compression library"
+HOMEPAGE = "http://www.oberhumer.com/opensource/lzo/"
+LICENSE = "GPLv2+"
+SECTION = "libs"
+PRIORITY = "optional"
+
+SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz"
+SRC_URI[md5sum] = "c7ffc9a103afe2d1bba0b015e7aa887f"
+SRC_URI[sha256sum] = "f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c"
+
+S = "${WORKDIR}/lzo-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--enable-shared"
+
+do_configure() {
+	gnu-configize --force
+	oe_runconf
+}
+
+BBCLASSEXTEND = "native"
+
diff --git a/recipes/mtd/mtd-utils-native.inc b/recipes/mtd/mtd-utils-native.inc
deleted file mode 100644
index aaef4ac666..0000000000
--- a/recipes/mtd/mtd-utils-native.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-inherit native
-DEPENDS = "zlib-native lzo-native"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils"
-
-NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/mtd/mtd-utils-native_1.1.0.bb b/recipes/mtd/mtd-utils-native_1.1.0.bb
deleted file mode 100644
index 2b8d925c90..0000000000
--- a/recipes/mtd/mtd-utils-native_1.1.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-# scheduled to enable 15-03-2008
-DEFAULT_PREFERENCE = "-1"
-
-require mtd-utils_${PV}.bb
-require mtd-utils-native.inc
diff --git a/recipes/mtd/mtd-utils-native_1.2.0+git.bb b/recipes/mtd/mtd-utils-native_1.2.0+git.bb
deleted file mode 100644
index 5d06844588..0000000000
--- a/recipes/mtd/mtd-utils-native_1.2.0+git.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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 += "util-linux-ng-native"
diff --git a/recipes/mtd/mtd-utils-native_1.3.1.bb b/recipes/mtd/mtd-utils-native_1.3.1.bb
deleted file mode 100644
index 5d06844588..0000000000
--- a/recipes/mtd/mtd-utils-native_1.3.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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 += "util-linux-ng-native"
diff --git a/recipes/mtd/mtd-utils_1.5.0.bb b/recipes/mtd/mtd-utils_1.5.0.bb
new file mode 100644
index 0000000000..b86e36f280
--- /dev/null
+++ b/recipes/mtd/mtd-utils_1.5.0.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Tools for managing memory technology devices."
+SECTION = "base"
+DEPENDS = "zlib util-linux-ng lzo2"
+#DEPENDS = "zlib lzo e2fsprogs util-linux"
+HOMEPAGE = "http://www.linux-mtd.infradead.org/"
+LICENSE = "GPLv2+"
+PR = "r0"
+
+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 \
+          "
+
+S = "${WORKDIR}/git/"
+
+EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
+
+do_install () {
+        oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
+        install -d ${D}${includedir}/mtd/
+        for f in ${S}/include/mtd/*.h; do
+        install -m 0644 $f ${D}${includedir}/mtd/
+        done
+}
+
+PACKAGES =+ "mkfs-jffs2 mkfs-ubifs"
+FILES_mkfs-jffs2 = "${sbindir}/mkfs.jffs2"
+FILES_mkfs-ubifs = "${sbindir}/mkfs.ubifs"
+
+PARALLEL_MAKE = ""
+
+BBCLASSEXTEND = "native"
+NATIVE_INSTALL_WORKS = "1"
-- 
2.39.5