summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-04-13 09:55:04 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-15 14:19:44 +0100
commit7ad628e0ef3817532916df090cc98672341415bb (patch)
treecf9ce0b14c352be624e63d90e902072dfc22853c /meta/recipes-kernel
parent710b01e01e670c00b60587443d56025a4ba81c33 (diff)
downloadpoky-7ad628e0ef3817532916df090cc98672341415bb.tar.gz
kmod: upgrade to 20
The following patches are rebased. -- Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch -- avoid_parallel_tests.patch The ptest part of kmod is removed because new version of kmod port all tests to use modules from module-playground instead of copying prebuilt modules to the repository. So, we cannot use ptest as before. Remove it so that kmod can build successfully. (From OE-Core rev: f80d136bdd578468035a88125fa1b84973fd912b) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc8
-rw-r--r--meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch29
-rw-r--r--meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch15
-rw-r--r--meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch30
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb15
5 files changed, 57 insertions, 40 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 899881e1fb..53574b6e39 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -14,16 +14,14 @@ DEPENDS += "pkgconfig-native"
14LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 14LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
15 file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 15 file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
16 " 16 "
17inherit autotools gtk-doc ptest 17inherit autotools gtk-doc
18 18
19SRCREV = "fd56638aed3fe147015bfa10ed4a5f7491303cb4" 19SRCREV = "d9c71758595cad72c8278179eabf17017615f704"
20# Lookout for PV bump too when SRCREV is changed 20# Lookout for PV bump too when SRCREV is changed
21PV = "19+git${SRCPV}" 21PV = "20+git${SRCPV}"
22 22
23SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ 23SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
24 file://depmod-search.conf \ 24 file://depmod-search.conf \
25 file://run-ptest \
26 file://ptest.patch \
27 file://avoid_parallel_tests.patch \ 25 file://avoid_parallel_tests.patch \
28 file://fix-O_CLOEXEC.patch \ 26 file://fix-O_CLOEXEC.patch \
29 " 27 "
diff --git a/meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch b/meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
new file mode 100644
index 0000000000..49b0209029
--- /dev/null
+++ b/meta/recipes-kernel/kmod/kmod/0001-Makefile.am-fix-parallel-build-problem.patch
@@ -0,0 +1,29 @@
1Upstream-Status: Pending
2
3Subject: Makefile.am: fix parallel build problem
4
5Fix parallel build problem to avoid errors like below.
6
7 install: cannot stat 'testsuite/module-playground/mod-fake-cciss.ko': No such file or directory
8
9Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
10---
11 Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index 9457655..d5b02eb 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -237,7 +237,7 @@ rootfs: build-module-playground
19
20 .PHONY: rootfs build-playground
21
22-$(ROOTFS): $(ROOTFS_PRISTINE)
23+$(ROOTFS): $(ROOTFS_PRISTINE) build-module-playground
24 $(CREATE_ROOTFS)
25
26 TESTSUITE_OVERRIDE_LIBS = \
27--
281.9.1
29
diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
index 7c0a27510b..b722183b68 100644
--- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
@@ -1,7 +1,4 @@
1From 4b68940b1ed46c54a5a0bdf6bb9d4599bc64e6f4 Mon Sep 17 00:00:00 2001 1Subject: Change to calling bswap_* instead of htobe* and be*toh
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 24 Dec 2014 10:12:40 +0800
4Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
5 2
6We can't use htobe* and be*toh functions because they are not 3We can't use htobe* and be*toh functions because they are not
7available on older versions of glibc, For example, shipped on Centos 5.5. 4available on older versions of glibc, For example, shipped on Centos 5.5.
@@ -17,10 +14,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
17 1 file changed, 2 insertions(+), 1 deletion(-) 14 1 file changed, 2 insertions(+), 1 deletion(-)
18 15
19diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c 16diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
20index 2b976a5..ffe58c2 100644 17index 6fc06fc..912185a 100644
21--- a/libkmod/libkmod-signature.c 18--- a/libkmod/libkmod-signature.c
22+++ b/libkmod/libkmod-signature.c 19+++ b/libkmod/libkmod-signature.c
23@@ -19,6 +19,7 @@ 20@@ -18,6 +18,7 @@
24 */ 21 */
25 22
26 #include <endian.h> 23 #include <endian.h>
@@ -28,15 +25,15 @@ index 2b976a5..ffe58c2 100644
28 #include <inttypes.h> 25 #include <inttypes.h>
29 #include <stdio.h> 26 #include <stdio.h>
30 #include <stdlib.h> 27 #include <stdlib.h>
31@@ -124,7 +125,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat 28@@ -127,7 +128,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
32 modsig->hash >= PKEY_HASH__LAST || 29 modsig->hash >= PKEY_HASH__LAST ||
33 modsig->id_type >= PKEY_ID_TYPE__LAST) 30 modsig->id_type >= PKEY_ID_TYPE__LAST)
34 return false; 31 return false;
35- sig_len = be32toh(get_unaligned(&modsig->sig_len)); 32- sig_len = be32toh(get_unaligned(&modsig->sig_len));
36+ sig_len = bswap_32(get_unaligned(&modsig->sig_len)); 33+ sig_len = bswap_32(get_unaligned(&modsig->sig_len));
37 if (size < (off_t)(modsig->signer_len + modsig->key_id_len + sig_len)) 34 if (sig_len == 0 ||
35 size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len))
38 return false; 36 return false;
39
40-- 37--
411.9.1 381.9.1
42 39
diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
index 4c37d44836..feafcb9b7c 100644
--- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
+++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
@@ -7,15 +7,23 @@ serial-tests is now required
7Signed-off-by: Tudor Florea <tudor.florea@enea.com> 7Signed-off-by: Tudor Florea <tudor.florea@enea.com>
8Upstream-Status: Inappropriate (disable feature incompatible with ptest) 8Upstream-Status: Inappropriate (disable feature incompatible with ptest)
9 9
10diff -ruN a/configure.ac b/configure.ac 10---
11--- a/configure.ac 2013-09-02 15:05:18.662366800 +0200 11 configure.ac | 2 +-
12+++ b/configure.ac 2013-11-28 09:26:49.557066764 +0200 12 1 file changed, 1 insertion(+), 1 deletion(-)
13@@ -8,7 +8,7 @@ 13
14 AC_CONFIG_SRCDIR([libkmod/libkmod.c]) 14diff --git a/configure.ac b/configure.ac
15 AC_CONFIG_AUX_DIR([build-aux]) 15index eb0f9d1..a539968 100644
16 AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules 16--- a/configure.ac
17- tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) 17+++ b/configure.ac
18+ tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) 18@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
19 AC_PROG_CC_STDC
20 AC_USE_SYSTEM_EXTENSIONS
21 AC_SYS_LARGEFILE 19 AC_SYS_LARGEFILE
20 AC_PREFIX_DEFAULT([/usr])
21 AM_MAINTAINER_MODE([enable])
22-AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests])
23+AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests])
24 AM_SILENT_RULES([yes])
25 LT_INIT([disable-static pic-only])
26
27--
281.9.1
29
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index 08dd81569c..ba4d85eda4 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -33,27 +33,12 @@ do_install_append () {
33 33
34 # install depmod.d file for search/ dir 34 # install depmod.d file for search/ dir
35 install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" 35 install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf"
36
37 if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then
38 find testsuite -name *.ko -exec tar rf testmodule.tar {} \;
39 find testsuite -name *.ko -exec rm -f {} \;
40 fi
41} 36}
42 37
43do_compile_prepend() { 38do_compile_prepend() {
44 sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status 39 sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status
45} 40}
46 41
47do_compile_ptest () {
48 oe_runmake buildtest-TESTS rootfs
49}
50
51do_install_ptest () {
52 install testmodule.tar ${D}${PTEST_PATH}
53}
54
55INSANE_SKIP_${PN}-ptest = "arch"
56
57inherit update-alternatives 42inherit update-alternatives
58 43
59ALTERNATIVE_PRIORITY = "60" 44ALTERNATIVE_PRIORITY = "60"