3 files changed, 30 insertions, 42 deletions
diff --git a/recipes/yaffs2/yaffs2-utils-native_cvs.bb b/recipes/yaffs2/yaffs2-utils-native_cvs.bb
deleted file mode 100644
index d192b52d03..0000000000
--- a/recipes/yaffs2/yaffs2-utils-native_cvs.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require yaffs2-utils_cvs.bb
-inherit native
-DEPENDS = "mtd-utils-native"
-
-CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL"
-
-do_stage() {
-    for i in mkyaffsimage mkyaffs2image; do
-        install -m 0755 utils/$i ${STAGING_BINDIR_NATIVE}
-    done
-}
-
-do_install() {
-	:
-}
diff --git a/recipes/yaffs2/yaffs2-utils.inc b/recipes/yaffs2/yaffs2-utils.inc
new file mode 100644
index 0000000000..a451f968c1
--- /dev/null
+++ b/recipes/yaffs2/yaffs2-utils.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "Tools for managing 'yaffs2' file systems."
+SECTION = "base"
+HOMEPAGE = "http://www.yaffs.net"
+LICENSE = "GPLv2"
+PV = "0.0.0+cvs${SRCDATE}"
+PR = "r0"
+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/recipes/yaffs2/yaffs2-utils_cvs.bb b/recipes/yaffs2/yaffs2-utils_cvs.bb
index bb974907ca..6171fe55bd 100644
--- a/recipes/yaffs2/yaffs2-utils_cvs.bb
+++ b/recipes/yaffs2/yaffs2-utils_cvs.bb
@@ -1,28 +1,3 @@
-DESCRIPTION = "Tools for managing 'yaffs2' file systems."
-SECTION = "base"
-HOMEPAGE = "http://www.yaffs.net"
-LICENSE = "GPLv2"
-SRCDATE = "20080331"
-PV = "0.0.0+cvs${SRCDATE}"
-PR = "r0"
+require yaffs2-utils.inc
+PR = "r1"
 
-#
-# NOTE: This needs pretty recent mtd-utils otherwise it fails to compile
-#
-
-SRC_URI = "cvs://anonymous@cvs.aleph1.co.uk/home/aleph1/cvs;module=yaffs2 \
-           file://mkyaffs2image.patch"
-S = "${WORKDIR}/yaffs2"
-
-CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL"
-
-do_compile() {
-	cd utils && oe_runmake
-}
-
-do_install() {
-	install -d ${D}${sbindir}
-    for i in mkyaffsimage mkyaffs2image; do
-        install -m 0755 utils/$i ${D}${sbindir}
-    done
-}