diff options
| author |   Saul Wold <sgw@linux.intel.com> | 2014-07-15 13:17:19 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-17 12:28:06 +0100 |
| commit | 5a16da19eda60992e094b38ebb185875529b3b4c (patch) | |
| tree | 6d68d852b7b21607701790afc4e03f4731e9a74a /meta/recipes-kernel | |
| parent | 12b3b7191c14a0151977a9e9b66ba446228074bf (diff) | |
| download | openembedded-core-contrib-5a16da19eda60992e094b38ebb185875529b3b4c.tar.gz | |
kmod: Upgrade to latest git
Update to version 18 with an additional patch from
the git repo to address an issue.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod/0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch | 27 |
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 \ " inherit autotools gtk-doc ptest -SRCREV = "49d8e0b59052999de577ab732b719cfbeb89504d" +SRCREV = "ae58de0fcb4a6528dd365e23d383bbe2eaf2d566" # Lookout for PV bump too when SRCREV is changed -PV = "17+git${SRCPV}" +PV = "18+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ @@ -26,6 +26,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://ptest.patch \ file://avoid_parallel_tests.patch \ file://fix-O_CLOEXEC.patch \ + file://0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch \ " S = "${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 @@ +From 74c26943f1228870022d116a1fda25be3a55a38e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org> +Date: Wed, 18 Jun 2014 20:51:00 -0400 +Subject: [PATCH] Add missing O_CLOEXEC in kmod_module_get_size() + +Upstream-Status: Backport +Signed-off-by: Saul Wold <sgw@linux.intel.com> +--- + libkmod/libkmod-module.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index e3cc5a7..b81b451 100644 +--- a/libkmod/libkmod-module.c ++++ b/libkmod/libkmod-module.c +@@ -1783,7 +1783,7 @@ KMOD_EXPORT long kmod_module_get_size(const struct kmod_module *mod) + * loaded. + */ + snprintf(line, sizeof(line), "/sys/module/%s", mod->name); +- dfd = open(line, O_RDONLY); ++ dfd = open(line, O_RDONLY|O_CLOEXEC); + if (dfd < 0) + return -errno; + +-- +1.8.3.1 + |