[oe-commits] [openembedded-core] 12/25: kmod: upgrade to 24
git at git.openembedded.org
git at git.openembedded.org
Fri Jun 9 16:12:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit 68880e7dc48df4707e2c67f7434603e516c335c6
Author: Chen Qi <Qi.Chen at windriver.com>
AuthorDate: Tue Jun 6 16:36:17 2017 +0800
kmod: upgrade to 24
Drop kcmdline_quotes.patch as it has been integrated.
Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-kernel/kmod/kmod.inc | 5 +--
.../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 ba80fc5..7fb10b5 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 46bdec5..0000000
--- 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 at 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 at 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
-
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list