summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2013-10-01 22:54:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-07 09:37:31 +0100
commit17b5f2f16256c9e8c551416a8b7211e44dfa5e91 (patch)
tree0d3086c6148de85a731e69e70ab5f35c308b2ffe
parent56ea7aca3e6b4a0db3f699cc0d775d267b36e164 (diff)
downloadpoky-17b5f2f16256c9e8c551416a8b7211e44dfa5e91.tar.gz
kmod: ptest fixes
Make kmod-ptest able to compile with separated source and build dir. Since kmod test files contain kernel modules for many different architectures, strip and arch gets confused and throws errors. (From OE-Core rev: 61cb45869caaed6578a217effaa72d247395d078) Signed-off-by: Tudor Florea <tudor.florea@enea.com> Signed-off-by: Björn Stenberg <bjst@enea.com> Signed-off-by: Maxin B. John <maxin.john@enea.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kmod/kmod/ptest.patch8
-rwxr-xr-xmeta/recipes-kernel/kmod/kmod/run-ptest4
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb6
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/kmod/kmod/ptest.patch b/meta/recipes-kernel/kmod/kmod/ptest.patch
index c6479b2fb5..831dbcb909 100644
--- a/meta/recipes-kernel/kmod/kmod/ptest.patch
+++ b/meta/recipes-kernel/kmod/kmod/ptest.patch
@@ -15,10 +15,10 @@ diff -ruN a/Makefile.am b/Makefile.am
15+ @for file in $(TESTSUITE); do \ 15+ @for file in $(TESTSUITE); do \
16+ install $$file $(DESTDIR)/testsuite; \ 16+ install $$file $(DESTDIR)/testsuite; \
17+ done; 17+ done;
18+ @cp Makefile $(DESTDIR) 18+ @sed -e 's/^Makefile/_Makefile/' < Makefile > $(DESTDIR)/Makefile
19+ @sed -i 's/^Makefile/_Makefile/' ${DESTDIR}/Makefile 19+ @$(MKDIR_P) $(DESTDIR)/tools
20+ @tar -czf $(DESTDIR)/tools.tgz $(noinst_SCRIPTS) $(noinst_PROGRAMS) 20+ @cp $(noinst_SCRIPTS) $(noinst_PROGRAMS) $(DESTDIR)/tools
21+ @tar -C testsuite -czf $(DESTDIR)/testsuite.tgz rootfs-pristine .libs 21+ @cp -r testsuite/rootfs testsuite/.libs $(DESTDIR)/testsuite
22+ 22+
23 # ------------------------------------------------------------------------------ 23 # ------------------------------------------------------------------------------
24 # custom release helpers 24 # custom release helpers
diff --git a/meta/recipes-kernel/kmod/kmod/run-ptest b/meta/recipes-kernel/kmod/kmod/run-ptest
index fac24fd6e1..37adec3d2f 100755
--- a/meta/recipes-kernel/kmod/kmod/run-ptest
+++ b/meta/recipes-kernel/kmod/kmod/run-ptest
@@ -1,5 +1,3 @@
1#!/bin/sh 1#!/bin/sh
2tar -xzf tools.tgz 2touch testsuite/stamp-rootfs
3tar -C testsuite -xzf testsuite.tgz
4make rootfs
5make -k runtest-TESTS 2>/dev/null| grep -e ^PASS -e ^FAIL 3make -k runtest-TESTS 2>/dev/null| grep -e ^PASS -e ^FAIL
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index b07c06e7b4..ebecbcc82e 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -41,10 +41,12 @@ do_compile_prepend() {
41} 41}
42 42
43do_compile_ptest () { 43do_compile_ptest () {
44 oe_runmake buildtest-TESTS 44 oe_runmake buildtest-TESTS rootfs
45 oe_runmake rootfs
46} 45}
47 46
47INHIBIT_PACKAGE_STRIP = "${@base_contains("DISTRO_FEATURES", "ptest", "1", "0", d)}"
48INSANE_SKIP_${PN}-ptest = "arch"
49
48inherit update-alternatives 50inherit update-alternatives
49 51
50ALTERNATIVE_PRIORITY = "60" 52ALTERNATIVE_PRIORITY = "60"