summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2019-02-20 09:40:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-20 11:30:35 +0000
commitc1e26de9c276d2cbfb7818e23972b133db20540d (patch)
treee0aa3e41a5caeb7f4bda482d5a46b227ab7d14f1
parenta79bc39033c07e5cb0aa5ca95afe8f035c403f33 (diff)
downloadpoky-c1e26de9c276d2cbfb7818e23972b133db20540d.tar.gz
kmod: upgrade to 26
Refresh patches to avoid warning. (From OE-Core rev: 5dc170d74e932e1dbfc58d23b204bf1d9ebc6e42) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc4
-rw-r--r--meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch17
-rw-r--r--meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch15
-rw-r--r--meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch13
4 files changed, 28 insertions, 21 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 29885fbe77..ceb66ad170 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
14 " 14 "
15inherit autotools gtk-doc pkgconfig manpages 15inherit autotools gtk-doc pkgconfig manpages
16 16
17SRCREV = "aca4eca103d6699543f7ed663335c28c2e9908bb" 17SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f"
18# Lookout for PV bump too when SRCREV is changed 18# Lookout for PV bump too when SRCREV is changed
19PV = "25+git${SRCPV}" 19PV = "26+git${SRCPV}"
20 20
21SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ 21SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
22 file://depmod-search.conf \ 22 file://depmod-search.conf \
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 b722183b68..0ec20fad99 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,4 +1,7 @@
1Subject: Change to calling bswap_* instead of htobe* and be*toh 1From 38d6871d9c98e0080426ea375e390728485b2bc2 Mon Sep 17 00:00:00 2001
2From: Ting Liu <b28495@freescale.com>
3Date: Tue, 10 Sep 2013 06:00:20 +0000
4Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
2 5
3We can't use htobe* and be*toh functions because they are not 6We can't use htobe* and be*toh functions because they are not
4available on older versions of glibc, For example, shipped on Centos 5.5. 7available on older versions of glibc, For example, shipped on Centos 5.5.
@@ -9,12 +12,13 @@ Upstream-Status: Inappropriate
9 12
10Signed-off-by: Ting Liu <b28495@freescale.com> 13Signed-off-by: Ting Liu <b28495@freescale.com>
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 14Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
15
12--- 16---
13 libkmod/libkmod-signature.c | 3 ++- 17 libkmod/libkmod-signature.c | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-) 18 1 file changed, 2 insertions(+), 1 deletion(-)
15 19
16diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c 20diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
17index 6fc06fc..912185a 100644 21index 48d0145..dd2c6fa 100644
18--- a/libkmod/libkmod-signature.c 22--- a/libkmod/libkmod-signature.c
19+++ b/libkmod/libkmod-signature.c 23+++ b/libkmod/libkmod-signature.c
20@@ -18,6 +18,7 @@ 24@@ -18,6 +18,7 @@
@@ -23,9 +27,9 @@ index 6fc06fc..912185a 100644
23 #include <endian.h> 27 #include <endian.h>
24+#include <byteswap.h> 28+#include <byteswap.h>
25 #include <inttypes.h> 29 #include <inttypes.h>
26 #include <stdio.h> 30 #ifdef ENABLE_OPENSSL
27 #include <stdlib.h> 31 #include <openssl/cms.h>
28@@ -127,7 +128,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat 32@@ -343,7 +344,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
29 modsig->hash >= PKEY_HASH__LAST || 33 modsig->hash >= PKEY_HASH__LAST ||
30 modsig->id_type >= PKEY_ID_TYPE__LAST) 34 modsig->id_type >= PKEY_ID_TYPE__LAST)
31 return false; 35 return false;
@@ -34,6 +38,3 @@ index 6fc06fc..912185a 100644
34 if (sig_len == 0 || 38 if (sig_len == 0 ||
35 size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len)) 39 size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len))
36 return false; 40 return false;
37--
381.9.1
39
diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
index 5f45fce932..990c338fa9 100644
--- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
+++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
@@ -1,3 +1,8 @@
1From be6f82c54f694617c646ca1f8b5bcf93694e20ad Mon Sep 17 00:00:00 2001
2From: Tudor Florea <tudor.florea@enea.com>
3Date: Fri, 6 Sep 2013 21:11:57 +0000
4Subject: [PATCH] kmod: avoid parallel-tests
5
1Avoid parallel-tests as it remove 6Avoid parallel-tests as it remove
2buildtest-TESTS and runtest-TESTS targets required by ptest. 7buildtest-TESTS and runtest-TESTS targets required by ptest.
3In automake 1.13.4 parallel-tests is assumed by defauls. 8In automake 1.13.4 parallel-tests is assumed by defauls.
@@ -5,16 +10,16 @@ In order to have buildtest-TESTS and runtest-TESTS targets
5serial-tests is now required 10serial-tests is now required
6 11
7Signed-off-by: Tudor Florea <tudor.florea@enea.com> 12Signed-off-by: Tudor Florea <tudor.florea@enea.com>
8Upstream-Status: Inappropriate (disable feature incompatible with ptest) 13Upstream-Status: Inappropriate (disable feature incompatible with ptest)
9 14
10--- 15---
11 configure.ac | 2 +- 16 configure.ac | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
13 18
14Index: git/configure.ac 19diff --git a/configure.ac b/configure.ac
15=================================================================== 20index ee72283..60980c0 100644
16--- git.orig/configure.ac 21--- a/configure.ac
17+++ git/configure.ac 22+++ b/configure.ac
18@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS 23@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
19 AC_SYS_LARGEFILE 24 AC_SYS_LARGEFILE
20 AC_PREFIX_DEFAULT([/usr]) 25 AC_PREFIX_DEFAULT([/usr])
diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
index 5d9d40c387..07e4a1f538 100644
--- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
+++ b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
@@ -1,4 +1,4 @@
1From bd43367eee868059770188fd9e9db38520dc6fff Mon Sep 17 00:00:00 2001 1From 5f55e6806cd8ae1a6c8ec1e6cb38ad292cfc1df9 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 22 Jan 2014 01:06:40 -0500 3Date: Wed, 22 Jan 2014 01:06:40 -0500
4Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is 4Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is
@@ -14,14 +14,15 @@ This problem was reported by "Ting Liu <b28495@freescale.com>"
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15 15
16Upstream-Status: Pending 16Upstream-Status: Pending
17
17--- 18---
18 libkmod/libkmod-internal.h | 4 ++++ 19 libkmod/libkmod-internal.h | 4 ++++
19 1 file changed, 4 insertions(+) 20 1 file changed, 4 insertions(+)
20 21
21Index: git/libkmod/libkmod-internal.h 22diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
22=================================================================== 23index a65ddd1..a4f4b77 100644
23--- git.orig/libkmod/libkmod-internal.h 24--- a/libkmod/libkmod-internal.h
24+++ git/libkmod/libkmod-internal.h 25+++ b/libkmod/libkmod-internal.h
25@@ -10,6 +10,10 @@ 26@@ -10,6 +10,10 @@
26 27
27 #include "libkmod.h" 28 #include "libkmod.h"