summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2014-12-26 17:35:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-27 22:53:37 +0000
commit09c1c79611e98623161063fd391a24ae925c4cea (patch)
treefdcd8046bedf9c941badced1311b88e5765595c2
parentc73a6ca2a82ee1961ede453f6c86937ce3695a0a (diff)
downloadpoky-09c1c79611e98623161063fd391a24ae925c4cea.tar.gz
kmod: upgrade to 19
0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch is dropped as it's in the new version. Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch is modified to match the new version. License chesum is changed but it is confirmed that the license information is not chagned. (From OE-Core rev: 234d61aa89deecf909938bfba39601f79bdcfaee) 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.inc7
-rw-r--r--meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch27
-rw-r--r--meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch21
3 files changed, 14 insertions, 41 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index dda74c85b6..c26ea23533 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -11,14 +11,14 @@ SECTION = "base"
11 11
12DEPENDS += "pkgconfig-native" 12DEPENDS += "pkgconfig-native"
13 13
14LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ 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 ptest
18 18
19SRCREV = "ae58de0fcb4a6528dd365e23d383bbe2eaf2d566" 19SRCREV = "fd56638aed3fe147015bfa10ed4a5f7491303cb4"
20# Lookout for PV bump too when SRCREV is changed 20# Lookout for PV bump too when SRCREV is changed
21PV = "18+git${SRCPV}" 21PV = "19+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 \
@@ -26,7 +26,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
26 file://ptest.patch \ 26 file://ptest.patch \
27 file://avoid_parallel_tests.patch \ 27 file://avoid_parallel_tests.patch \
28 file://fix-O_CLOEXEC.patch \ 28 file://fix-O_CLOEXEC.patch \
29 file://0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch \
30 " 29 "
31 30
32S = "${WORKDIR}/git" 31S = "${WORKDIR}/git"
diff --git a/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch b/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch
deleted file mode 100644
index 77624ce151..0000000000
--- a/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 74c26943f1228870022d116a1fda25be3a55a38e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
3Date: Wed, 18 Jun 2014 20:51:00 -0400
4Subject: [PATCH] Add missing O_CLOEXEC in kmod_module_get_size()
5
6Upstream-Status: Backport
7Signed-off-by: Saul Wold <sgw@linux.intel.com>
8---
9 libkmod/libkmod-module.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
13index e3cc5a7..b81b451 100644
14--- a/libkmod/libkmod-module.c
15+++ b/libkmod/libkmod-module.c
16@@ -1783,7 +1783,7 @@ KMOD_EXPORT long kmod_module_get_size(const struct kmod_module *mod)
17 * loaded.
18 */
19 snprintf(line, sizeof(line), "/sys/module/%s", mod->name);
20- dfd = open(line, O_RDONLY);
21+ dfd = open(line, O_RDONLY|O_CLOEXEC);
22 if (dfd < 0)
23 return -errno;
24
25--
261.8.3.1
27
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 2320b92eba..7c0a27510b 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,6 +1,6 @@
1From 0c4dbadc9db3cda1cfca64e44ea08c6e89919ea7 Mon Sep 17 00:00:00 2001 1From 4b68940b1ed46c54a5a0bdf6bb9d4599bc64e6f4 Mon Sep 17 00:00:00 2001
2From: Ting Liu <b28495@freescale.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 10 Sep 2013 13:44:18 +0800 3Date: Wed, 24 Dec 2014 10:12:40 +0800
4Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh 4Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
5 5
6We 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
@@ -11,12 +11,13 @@ Change to directly calling bswap_* as defined in+byteswap.h.
11Upstream-Status: Inappropriate 11Upstream-Status: Inappropriate
12 12
13Signed-off-by: Ting Liu <b28495@freescale.com> 13Signed-off-by: Ting Liu <b28495@freescale.com>
14Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14--- 15---
15 libkmod/libkmod-signature.c | 3 ++- 16 libkmod/libkmod-signature.c | 3 ++-
16 1 files changed, 2 insertions(+), 1 deletions(-) 17 1 file changed, 2 insertions(+), 1 deletion(-)
17 18
18diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c 19diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
19index 6b80caa..3544a36 100644 20index 2b976a5..ffe58c2 100644
20--- a/libkmod/libkmod-signature.c 21--- a/libkmod/libkmod-signature.c
21+++ b/libkmod/libkmod-signature.c 22+++ b/libkmod/libkmod-signature.c
22@@ -19,6 +19,7 @@ 23@@ -19,6 +19,7 @@
@@ -24,10 +25,10 @@ index 6b80caa..3544a36 100644
24 25
25 #include <endian.h> 26 #include <endian.h>
26+#include <byteswap.h> 27+#include <byteswap.h>
27 #include <stdint.h> 28 #include <inttypes.h>
29 #include <stdio.h>
28 #include <stdlib.h> 30 #include <stdlib.h>
29 #include <string.h> 31@@ -124,7 +125,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
30@@ -121,7 +122,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
31 modsig->hash >= PKEY_HASH__LAST || 32 modsig->hash >= PKEY_HASH__LAST ||
32 modsig->id_type >= PKEY_ID_TYPE__LAST) 33 modsig->id_type >= PKEY_ID_TYPE__LAST)
33 return false; 34 return false;
@@ -37,5 +38,5 @@ index 6b80caa..3544a36 100644
37 return false; 38 return false;
38 39
39-- 40--
401.7.5.4 411.9.1
41 42