merge of '1d0e13e8c6528e7a7037276e3c01cb21dfa085e4'

     and '86581f7de9bc72fe5e21778b4442cc0e59e96fbf'

4 files changed, 66 insertions, 2 deletions

diff --git a/packages/mtd/mtd-utils-native.inc b/packages/mtd/mtd-utils-native.inc
index da9759f02f..8ac4673524 100644
--- a/packages/mtd/mtd-utils-native.inc
+++ b/packages/mtd/mtd-utils-native.inc
@@ -3,8 +3,12 @@ DEPENDS = "zlib-native lzo-native"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/mtd-utils"
 
 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
 }
-									
\ No newline at end of file
+
diff --git a/packages/mtd/mtd-utils-native_1.0.0+git.bb b/packages/mtd/mtd-utils-native_1.0.0+git.bb
index 6f9d71e10c..6e310cb1b4 100644
--- a/packages/mtd/mtd-utils-native_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils-native_1.0.0+git.bb
@@ -1,2 +1,3 @@
 require mtd-utils_${PV}.bb
 require mtd-utils-native.inc
+
diff --git a/packages/mtd/mtd-utils-tests_1.0.0+git.bb b/packages/mtd/mtd-utils-tests_1.0.0+git.bb
new file mode 100644
index 0000000000..b5240009a7
--- /dev/null
+++ b/packages/mtd/mtd-utils-tests_1.0.0+git.bb
@@ -0,0 +1,59 @@
+require mtd-utils_1.0.0+git.bb
+
+# this can probably be integrated into the main mtd-utils package
+# but I did not want to risk breakage -- but would be glad to 
+# integrate them if that is best -- cbrake
+
+SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG}"
+
+PR = "r1"
+
+S = "${WORKDIR}/git/tests/fs-tests"
+
+FILES_${PN} = "${datadir}/mtd-utils"
+
+do_compile () {
+	make || die "Make failed"
+}
+
+do_stage () {
+}
+
+INHIBIT_PACKAGE_STRIP = "1"
+
+mtd_utils_tests = " \
+	help_all.sh \
+	run_all.sh \
+	integrity/integck \
+	simple/ftrunc \
+	simple/test_1 \	
+	simple/test_2 \	
+	stress/stress00.sh \
+	stress/stress01.sh \
+	stress/atoms/fwrite00 \
+	stress/atoms/gcd_hupper \
+	stress/atoms/pdfrun \
+	stress/atoms/rmdir00 \
+	stress/atoms/rndrm00 \
+	stress/atoms/rndrm99 \
+	stress/atoms/rndwrite00 \
+	stress/atoms/stress_1 \
+	stress/atoms/stress_2 \
+	stress/atoms/stress_3 \
+	utils/free_space \
+	utils/fstest_monitor \
+	"
+	
+do_install () {
+	install -d ${D}${datadir}/mtd-utils/tests
+	install -d ${D}${datadir}/mtd-utils/tests/integrity  
+	install -d ${D}${datadir}/mtd-utils/tests/simple  
+	install -d ${D}${datadir}/mtd-utils/tests/stress
+	install -d ${D}${datadir}/mtd-utils/tests/stress/atoms
+	install -d ${D}${datadir}/mtd-utils/tests/utils
+	for app in ${mtd_utils_tests}; do
+		install -m 0755 $app ${D}${datadir}/mtd-utils/tests/$app
+	done
+}
+
+
diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb
index 8b14faa1d6..33f95853f6 100644
--- a/packages/mtd/mtd-utils_1.0.0+git.bb
+++ b/packages/mtd/mtd-utils_1.0.0+git.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 DEPENDS = "zlib lzo"
 HOMEPAGE = "http://www.linux-mtd.infradead.org/"
 LICENSE = "GPLv2"
-PR = "r5"
+PR = "r6"
 
 # This is the default package, thus we lock to a specific git version so 
 # upstream changes will not break builds.