3 files changed, 12 insertions, 26 deletions

diff --git a/meta/packages/yaffs2/yaffs2-utils-native_cvs.bb b/meta/packages/yaffs2/yaffs2-utils-native_cvs.bb
deleted file mode 100644
index 72964d6457..0000000000
--- a/meta/packages/yaffs2/yaffs2-utils-native_cvs.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require yaffs2-utils.inc
-
-inherit native
-
-DEPENDS = "mtd-utils-native"
-PR = "r1"
-
-CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL"
-
-do_stage() {
-    for i in mkyaffsimage mkyaffs2image; do
-        install -m 0755 utils/$i ${STAGING_BINDIR_NATIVE}
-    done
-}
diff --git a/meta/packages/yaffs2/yaffs2-utils.inc b/meta/packages/yaffs2/yaffs2-utils.inc
index 5edc3cd9c6..a451f968c1 100644
--- a/meta/packages/yaffs2/yaffs2-utils.inc
+++ b/meta/packages/yaffs2/yaffs2-utils.inc
@@ -4,17 +4,25 @@ HOMEPAGE = "http://www.yaffs.net"
 LICENSE = "GPLv2"
 PV = "0.0.0+cvs${SRCDATE}"
 PR = "r0"
-
-#
-# NOTE: This needs pretty recent mtd-utils otherwise it fails to compile
-#
+DEPENDS = "mtd-utils"
 
 SRC_URI = "cvs://anonymous@cvs.aleph1.co.uk/home/aleph1/cvs;module=yaffs2 \
            file://mkyaffs2image.patch;patch=1"
 S = "${WORKDIR}/yaffs2"
 
 CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL"
+CFLAGS_append_virtclass-native = " -I.. -DCONFIG_YAFFS_UTIL"
 
 do_compile() {
         cd utils && oe_runmake
 }
+
+NATIVE_INSTALL_WORKS = "1"
+do_install() {
+        install -d ${D}${sbindir}/
+        for i in mkyaffsimage mkyaffs2image; do
+                install -m 0755 utils/$i ${D}${sbindir}/
+        done
+}
+
+BBCLASSEXTEND = "native"
diff --git a/meta/packages/yaffs2/yaffs2-utils_cvs.bb b/meta/packages/yaffs2/yaffs2-utils_cvs.bb
index cb9660ed85..6171fe55bd 100644
--- a/meta/packages/yaffs2/yaffs2-utils_cvs.bb
+++ b/meta/packages/yaffs2/yaffs2-utils_cvs.bb
@@ -1,11 +1,3 @@
 require yaffs2-utils.inc
-
-DEPENDS = "mtd-utils"
 PR = "r1"
 
-do_install() {
-        install -d ${D}${sbindir}
-    for i in mkyaffsimage mkyaffs2image; do
-        install -m 0755 utils/$i ${D}${sbindir}
-    done
-}