summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2017-06-06 16:36:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-09 17:12:14 +0100
commitb4337a8cc18b105dae967fb7b9cf656780651084 (patch)
tree3aeee247bcd23c9f96f429b23a05beae12b9ee38
parent4e336d2f25ac29c23061e2a92ffa1caba440ffe0 (diff)
downloadpoky-b4337a8cc18b105dae967fb7b9cf656780651084.tar.gz
kmod: upgrade to 24
Drop kcmdline_quotes.patch as it has been integrated. (From OE-Core rev: 68880e7dc48df4707e2c67f7434603e516c335c6) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc5
-rw-r--r--meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch44
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 \
14 " 14 "
15inherit autotools gtk-doc pkgconfig manpages 15inherit autotools gtk-doc pkgconfig manpages
16 16
17SRCREV = "65a885df5f6f15222b44fd695c5eaca17e837a14" 17SRCREV = "ef4257b59c4307b8c627d89f3c7f1feedb32582f"
18# Lookout for PV bump too when SRCREV is changed 18# Lookout for PV bump too when SRCREV is changed
19PV = "23+git${SRCPV}" 19PV = "24+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 \
23 file://avoid_parallel_tests.patch \ 23 file://avoid_parallel_tests.patch \
24 file://fix-O_CLOEXEC.patch \ 24 file://fix-O_CLOEXEC.patch \
25 file://kcmdline_quotes.patch \
26 " 25 "
27 26
28S = "${WORKDIR}/git" 27S = "${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 @@
1From 4a6f92a10680e7e36807f5e2ae8e497e8d73a048 Mon Sep 17 00:00:00 2001
2From: James Minor <james.minor@ni.com>
3Date: Fri, 20 Jan 2017 17:15:50 -0600
4Subject: [PATCH] libkmod: Fix handling of quotes in kernel command line
5
6If a module parameter on the command line contains quotes, any
7spaces inside those quotes should be included as part of the
8parameter.
9
10Signed-off-by: James Minor <james.minor@ni.com>
11
12Upstream-Status: Accepted
13---
14 libkmod/libkmod-config.c | 7 +++++++
15 1 file changed, 7 insertions(+)
16
17diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
18index 57fbe37..ea40d19 100644
19--- a/libkmod/libkmod-config.c
20+++ b/libkmod/libkmod-config.c
21@@ -497,6 +497,7 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
22 char buf[KCMD_LINE_SIZE];
23 int fd, err;
24 char *p, *modname, *param = NULL, *value = NULL, is_module = 1;
25+ bool is_quoted = false;
26
27 fd = open("/proc/cmdline", O_RDONLY|O_CLOEXEC);
28 if (fd < 0) {
29@@ -514,6 +515,12 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
30 }
31
32 for (p = buf, modname = buf; *p != '\0' && *p != '\n'; p++) {
33+ if (*p == '"') {
34+ is_quoted = !is_quoted;
35+ continue;
36+ }
37+ if (is_quoted)
38+ continue;
39 switch (*p) {
40 case ' ':
41 *p = '\0';
42--
431.9.1
44