summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-07-15 13:17:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-17 12:28:51 +0100
commit5effba27882bc35df24d2e1b5d9c8b0daecf8467 (patch)
treeb4a2729055dde46444cfd8c13ade9d0cb3727206 /meta/recipes-kernel
parent4971febcdfa573b0a359f40999c6a6ec83dec2b3 (diff)
downloadpoky-5effba27882bc35df24d2e1b5d9c8b0daecf8467.tar.gz
kmod: Upgrade to latest git
Update to version 18 with an additional patch from the git repo to address an issue. (From OE-Core rev: 5a16da19eda60992e094b38ebb185875529b3b4c) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc5
-rw-r--r--meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch27
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 504a32fcee..dda74c85b6 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -16,9 +16,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
16 " 16 "
17inherit autotools gtk-doc ptest 17inherit autotools gtk-doc ptest
18 18
19SRCREV = "49d8e0b59052999de577ab732b719cfbeb89504d" 19SRCREV = "ae58de0fcb4a6528dd365e23d383bbe2eaf2d566"
20# Lookout for PV bump too when SRCREV is changed 20# Lookout for PV bump too when SRCREV is changed
21PV = "17+git${SRCPV}" 21PV = "18+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,6 +26,7 @@ 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 \
29 " 30 "
30 31
31S = "${WORKDIR}/git" 32S = "${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
new file mode 100644
index 0000000000..77624ce151
--- /dev/null
+++ b/meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch
@@ -0,0 +1,27 @@
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