diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2017-06-06 16:36:17 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-09 17:12:05 +0100 |
| commit | 68880e7dc48df4707e2c67f7434603e516c335c6 (patch) | |
| tree | 8ae61b67346e14a9053f90cb7c5075eb772e7ac9 | |
| parent | 5639c36ab221e0764884374d7741805a93772cf7 (diff) | |
| download | openembedded-core-68880e7dc48df4707e2c67f7434603e516c335c6.tar.gz | |
kmod: upgrade to 24
Drop kcmdline_quotes.patch as it has been integrated.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch | 44 |
2 files changed, 2 insertions, 47 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index ba80fc57a3..7fb10b58c5 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -14,15 +14,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " inherit autotools gtk-doc pkgconfig manpages -SRCREV = "65a885df5f6f15222b44fd695c5eaca17e837a14" +SRCREV = "ef4257b59c4307b8c627d89f3c7f1feedb32582f" # Lookout for PV bump too when SRCREV is changed -PV = "23+git${SRCPV}" +PV = "24+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ file://avoid_parallel_tests.patch \ file://fix-O_CLOEXEC.patch \ - file://kcmdline_quotes.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch b/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch deleted file mode 100644 index 46bdec59a7..0000000000 --- a/meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4a6f92a10680e7e36807f5e2ae8e497e8d73a048 Mon Sep 17 00:00:00 2001 -From: James Minor <james.minor@ni.com> -Date: Fri, 20 Jan 2017 17:15:50 -0600 -Subject: [PATCH] libkmod: Fix handling of quotes in kernel command line - -If a module parameter on the command line contains quotes, any -spaces inside those quotes should be included as part of the -parameter. - -Signed-off-by: James Minor <james.minor@ni.com> - -Upstream-Status: Accepted ---- - libkmod/libkmod-config.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c -index 57fbe37..ea40d19 100644 ---- a/libkmod/libkmod-config.c -+++ b/libkmod/libkmod-config.c -@@ -497,6 +497,7 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) - char buf[KCMD_LINE_SIZE]; - int fd, err; - char *p, *modname, *param = NULL, *value = NULL, is_module = 1; -+ bool is_quoted = false; - - fd = open("/proc/cmdline", O_RDONLY|O_CLOEXEC); - if (fd < 0) { -@@ -514,6 +515,12 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) - } - - for (p = buf, modname = buf; *p != '\0' && *p != '\n'; p++) { -+ if (*p == '"') { -+ is_quoted = !is_quoted; -+ continue; -+ } -+ if (is_quoted) -+ continue; - switch (*p) { - case ' ': - *p = '\0'; --- -1.9.1 - |