3 files changed, 8 insertions, 29 deletions

diff --git a/meta/packages/mtd/mtd-utils-native.inc b/meta/packages/mtd/mtd-utils-native.inc
deleted file mode 100644
index 01337697ef..0000000000
--- a/meta/packages/mtd/mtd-utils-native.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-inherit native
-DEPENDS = "zlib-native lzo-native"
-
-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
-}
-
diff --git a/meta/packages/mtd/mtd-utils-native_1.1.0+git.bb b/meta/packages/mtd/mtd-utils-native_1.1.0+git.bb
deleted file mode 100644
index 6f9d71e10c..0000000000
--- a/meta/packages/mtd/mtd-utils-native_1.1.0+git.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require mtd-utils_${PV}.bb
-require mtd-utils-native.inc
diff --git a/meta/packages/mtd/mtd-utils_1.1.0+git.bb b/meta/packages/mtd/mtd-utils_1.1.0+git.bb
index a6b8b4df29..fa62475f4b 100644
--- a/meta/packages/mtd/mtd-utils_1.1.0+git.bb
+++ b/meta/packages/mtd/mtd-utils_1.1.0+git.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=b995f89a81589be8d8a41c374a6df109d0ee12b3 \
            file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \
@@ -14,22 +14,16 @@ S = "${WORKDIR}/git/"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR'"
 
-do_stage () {
-        install -d ${STAGING_INCDIR}/mtd
+do_install () {
+        oe_runmake install DESTDIR=${D}
+        install -d ${D}${includedir}/mtd/
         for f in ${S}/include/mtd/*.h; do
-                install -m 0644 $f ${STAGING_INCDIR}/mtd/
+                install -m 0644 $f ${D}${includedir}/mtd/
         done
-        for binary in ${mtd_utils}; do
-                install -m 0755 $binary ${STAGING_BINDIR}
-        done
-}
 
-mtd_utils = "ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
-             ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info mtd_debug \
-             flashcp nandwrite jffs2dump sumtool"
-
-do_install () {
-        oe_runmake install DESTDIR=${D}
 }
 
 PARALLEL_MAKE = ""
+
+BBCLASSEXTEND = "native"
+NATIVE_INSTALL_WORKS = "1"