3 files changed, 26 insertions, 26 deletions

diff --git a/meta/packages/yaffs2/yaffs2-utils-native_cvs.bb b/meta/packages/yaffs2/yaffs2-utils-native_cvs.bb
index d192b52d03..f64c4d950c 100644
--- a/meta/packages/yaffs2/yaffs2-utils-native_cvs.bb
+++ b/meta/packages/yaffs2/yaffs2-utils-native_cvs.bb
@@ -1,15 +1,11 @@
-require yaffs2-utils_cvs.bb
+require yaffs2-utils.inc
+
 inherit native
-DEPENDS = "mtd-utils-native"
 
-CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL"
+DEPENDS = "mtd-utils-native"
 
 do_stage() {
     for i in mkyaffsimage mkyaffs2image; do
         install -m 0755 utils/$i ${STAGING_BINDIR_NATIVE}
     done
 }
-
-do_install() {
-        :
-}
diff --git a/meta/packages/yaffs2/yaffs2-utils.inc b/meta/packages/yaffs2/yaffs2-utils.inc
new file mode 100644
index 0000000000..5edc3cd9c6
--- /dev/null
+++ b/meta/packages/yaffs2/yaffs2-utils.inc
@@ -0,0 +1,20 @@
+DESCRIPTION = "Tools for managing 'yaffs2' file systems."
+SECTION = "base"
+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
+#
+
+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"
+
+do_compile() {
+        cd utils && oe_runmake
+}
diff --git a/meta/packages/yaffs2/yaffs2-utils_cvs.bb b/meta/packages/yaffs2/yaffs2-utils_cvs.bb
index 439136e2eb..cb9660ed85 100644
--- a/meta/packages/yaffs2/yaffs2-utils_cvs.bb
+++ b/meta/packages/yaffs2/yaffs2-utils_cvs.bb
@@ -1,23 +1,7 @@
-DESCRIPTION = "Tools for managing 'yaffs2' file systems."
-SECTION = "base"
-HOMEPAGE = "http://www.yaffs.net"
-LICENSE = "GPLv2"
-PV = "0.0.0+cvs${SRCDATE}"
-PR = "r0"
+require yaffs2-utils.inc
 
-#
-# 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;patch=1"
-S = "${WORKDIR}/yaffs2"
-
-CFLAGS += "-I.. -DCONFIG_YAFFS_UTIL"
-
-do_compile() {
-        cd utils && oe_runmake
-}
+DEPENDS = "mtd-utils"
+PR = "r1"
 
 do_install() {
         install -d ${D}${sbindir}