[PATCH 0/3] Package Upgrade -- sysstat, kmod, util-linux

[PATCH 0/3] Package Upgrade -- sysstat, kmod, util-linux

[Chen Qi]

The following changes since commit 02417b149623c3042c257d1c1074f915dc02b7c7:

  oeqa/selftest: lock down Meson git revision for reliability (2017-06-05 17:59:38 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib ChenQi/PU-20170606
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/PU-20170606

Chen Qi (3):
  sysstat: upgrade to 11.5.5
  kmod: upgrade to 24
  util-linux: upgrade to 2.29.2

 .../{util-linux_2.29.1.bb => util-linux_2.29.2.bb} |  4 +-
 .../{sysstat_11.5.4.bb => sysstat_11.5.5.bb}       |  4 +-
 meta/recipes-kernel/kmod/kmod.inc                  |  5 +--
 .../recipes-kernel/kmod/kmod/kcmdline_quotes.patch | 44 ----------------------
 4 files changed, 6 insertions(+), 51 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.29.1.bb => util-linux_2.29.2.bb} (86%)
 rename meta/recipes-extended/sysstat/{sysstat_11.5.4.bb => sysstat_11.5.5.bb} (53%)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch

-- 
1.9.1

[PATCH 1/3] sysstat: upgrade to 11.5.5

[Chen Qi]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../recipes-extended/sysstat/{sysstat_11.5.4.bb => sysstat_11.5.5.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/sysstat/{sysstat_11.5.4.bb => sysstat_11.5.5.bb} (53%)

diff --git a/meta/recipes-extended/sysstat/sysstat_11.5.4.bb b/meta/recipes-extended/sysstat/sysstat_11.5.5.bb
similarity index 53%
rename from meta/recipes-extended/sysstat/sysstat_11.5.4.bb
rename to meta/recipes-extended/sysstat/sysstat_11.5.5.bb
index 7ff363b..65c81e9 100644
--- a/meta/recipes-extended/sysstat/sysstat_11.5.4.bb
+++ b/meta/recipes-extended/sysstat/sysstat_11.5.5.bb
@@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
 
 SRC_URI += "file://0001-Include-needed-headers-explicitly.patch"
 
-SRC_URI[md5sum] = "f16ae8edd462f5199ee033f7c0e2c197"
-SRC_URI[sha256sum] = "1e1008656575e70486b456e79775e98d3b8732d7e2cb408559209bd0318e0807"
+SRC_URI[md5sum] = "f6072bcfd5d2b02f033722f863171d0f"
+SRC_URI[sha256sum] = "f4c5b333827cb588df1842d7a8f46947f486c95b305edbbce7565925e88e86c3"
-- 
1.9.1

[PATCH 2/3] kmod: upgrade to 24

[Chen Qi]

Drop kcmdline_quotes.patch as it has been integrated.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-kernel/kmod/kmod.inc                  |  5 +--
 .../recipes-kernel/kmod/kmod/kcmdline_quotes.patch | 44 ----------------------
 2 files changed, 2 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-kernel/kmod/kmod/kcmdline_quotes.patch

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@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
-
-- 
1.9.1

[PATCH 3/3] util-linux: upgrade to 2.29.2

[Chen Qi]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 .../util-linux/{util-linux_2.29.1.bb => util-linux_2.29.2.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux_2.29.1.bb => util-linux_2.29.2.bb} (86%)

diff --git a/meta/recipes-core/util-linux/util-linux_2.29.1.bb b/meta/recipes-core/util-linux/util-linux_2.29.2.bb
similarity index 86%
rename from meta/recipes-core/util-linux/util-linux_2.29.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.29.2.bb
index 1395b47..11303f8 100644
--- a/meta/recipes-core/util-linux/util-linux_2.29.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.29.2.bb
@@ -16,8 +16,8 @@ SRC_URI += "file://configure-sbindir.patch \
             file://avoid_parallel_tests.patch \
             file://uuid-test-error-api.patch \
 "
-SRC_URI[md5sum] = "0cbb6d16ab9c5736e5649ef1264bee6e"
-SRC_URI[sha256sum] = "0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f"
+SRC_URI[md5sum] = "63c40c2068fcbb7e1d5c1d281115d973"
+SRC_URI[sha256sum] = "accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3"
 
 CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
 
-- 
1.9.1