diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-10-09 15:35:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-18 15:49:56 +0100 |
commit | e83640d9dc1145c052ed235ba822afcc5dfe0d67 (patch) | |
tree | 62486a595cec7fe1d7100ba1e3ec853a4101d86c /meta | |
parent | ead4a7d6e25af14b686ebb1b0272f8cb3eaaa266 (diff) | |
download | poky-e83640d9dc1145c052ed235ba822afcc5dfe0d67.tar.gz |
kmod: Add patch to fix seperate build dir of ptest
(From OE-Core rev: 68322eadd1d9456e606b375c2f4181725784c292)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 1 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index 633258b05e..880a53aa07 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc | |||
@@ -20,6 +20,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ | |||
20 | file://run-ptest \ | 20 | file://run-ptest \ |
21 | file://ptest.patch \ | 21 | file://ptest.patch \ |
22 | file://remove_parallel_tests.patch \ | 22 | file://remove_parallel_tests.patch \ |
23 | file://fix-seperatebuilddir.patch \ | ||
23 | " | 24 | " |
24 | 25 | ||
25 | SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85" | 26 | SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85" |
diff --git a/meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch b/meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch new file mode 100644 index 0000000000..b090eb56a5 --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod/fix-seperatebuilddir.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | |||
2 | If we are not building in the existing source tree, the testsuite | ||
3 | directory will not exist so the cp of the stamp-rootfs would fail. | ||
4 | |||
5 | Also added buildtest-TESTS so they could be build in the cross env, | ||
6 | without running the tests. | ||
7 | |||
8 | Upstream-Status: Accepted | ||
9 | |||
10 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
11 | |||
12 | Index: git/Makefile.am | ||
13 | =================================================================== | ||
14 | --- git.orig/Makefile.am | ||
15 | +++ git/Makefile.am | ||
16 | @@ -131,7 +131,7 @@ endif | ||
17 | |||
18 | ROOTFS = testsuite/rootfs | ||
19 | ROOTFS_PRISTINE = $(top_srcdir)/testsuite/rootfs-pristine | ||
20 | -CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && \ | ||
21 | +CREATE_ROOTFS = $(AM_V_GEN) ( $(RM) -rf $(ROOTFS) && mkdir -p $(dir $(ROOTFS)) && \ | ||
22 | cp -r $(ROOTFS_PRISTINE) $(ROOTFS) && \ | ||
23 | touch testsuite/stamp-rootfs && \ | ||
24 | find $(ROOTFS) -type d -exec chmod +w {} \; ) | ||
25 | @@ -217,6 +217,9 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-d | ||
26 | |||
27 | distclean-local: $(DISTCLEAN_LOCAL_HOOKS) | ||
28 | |||
29 | +buildtest-TESTS: | ||
30 | + $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) | ||
31 | + | ||
32 | install-ptest: | ||
33 | @$(MKDIR_P) $(DESTDIR)/testsuite | ||
34 | @for file in $(TESTSUITE); do \ | ||