[PATCH V2 0/3] Upgrade coreutils and pciutils

[PATCH V2 0/3] Upgrade coreutils and pciutils

[Chen Qi]

Changes in V2:
* Backport a patch from upstream git repo to fix build failure on centos7.

The following changes since commit 4469acdf1d0338220f3fe2ecb5e079eea6fda375:

  lib/oe/utils: remove param_bool() (2017-12-02 11:25:34 +0000)

are available in the git repository at:

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

Chen Qi (3):
  pciutils: upgrade to 3.5.6
  coreutils: upgrade to 8.28
  coreutils: add PACKAGECONFIG for single-binary

 .../{pciutils_3.5.5.bb => pciutils_3.5.6.bb}       |  4 +--
 ...c-fix-Up-field-of-realpath-usage-examples.patch | 40 ++++++++++++++++++++++
 .../{coreutils_8.27.bb => coreutils_8.28.bb}       | 10 +++---
 3 files changed, 48 insertions(+), 6 deletions(-)
 rename meta/recipes-bsp/pciutils/{pciutils_3.5.5.bb => pciutils_3.5.6.bb} (92%)
 create mode 100644 meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
 rename meta/recipes-core/coreutils/{coreutils_8.27.bb => coreutils_8.28.bb} (93%)

-- 
1.9.1

[PATCH 1/3] pciutils: upgrade to 3.5.6

[Chen Qi]

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-bsp/pciutils/{pciutils_3.5.5.bb => pciutils_3.5.6.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/pciutils/{pciutils_3.5.5.bb => pciutils_3.5.6.bb} (92%)

diff --git a/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb b/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
similarity index 92%
rename from meta/recipes-bsp/pciutils/pciutils_3.5.5.bb
rename to meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
index 0051fd8..b18b7da 100644
--- a/meta/recipes-bsp/pciutils/pciutils_3.5.5.bb
+++ b/meta/recipes-bsp/pciutils/pciutils_3.5.6.bb
@@ -11,8 +11,8 @@ DEPENDS = "zlib kmod"
 SRC_URI = "${KERNELORG_MIRROR}/software/utils/pciutils/pciutils-${PV}.tar.xz \
            file://configure.patch"
 
-SRC_URI[md5sum] = "238d9969cc0de8b9105d972007d9d546"
-SRC_URI[sha256sum] = "1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5"
+SRC_URI[md5sum] = "8e52278399b7b35fcfc031bc05da80a8"
+SRC_URI[sha256sum] = "f346eeb90cce0910c05b877fe49eadc760fa084c0455fd313e39d4b2c2d4bb21"
 
 inherit multilib_header pkgconfig
 
-- 
1.9.1

[PATCH 2/3] coreutils: upgrade to 8.28

[Chen Qi]

Upgrade coreutils to 8.28.

Backport a patch to fix the following build error on centos7.

  warning: unreferenced node `Realpath usage examples'

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...c-fix-Up-field-of-realpath-usage-examples.patch | 40 ++++++++++++++++++++++
 .../{coreutils_8.27.bb => coreutils_8.28.bb}       |  9 ++---
 2 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
 rename meta/recipes-core/coreutils/{coreutils_8.27.bb => coreutils_8.28.bb} (94%)

diff --git a/meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch b/meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
new file mode 100644
index 0000000..d763842
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
@@ -0,0 +1,40 @@
+From e83f10c48309b722570dc53a22deb355433f8cbc Mon Sep 17 00:00:00 2001
+From: Bernhard Voelker <mail@bernhard-voelker.de>
+Date: Tue, 5 Sep 2017 00:20:01 +0200
+Subject: [PATCH] doc: fix "Up" field of realpath usage examples
+
+Older versions of 'makeinfo' choke on a missing reference:
+
+  ./doc/coreutils.texi:14177: `Realpath usage examples' has no Up field\
+  (perhaps incorrect sectioning?).
+  makeinfo: Removing output file `doc/coreutils.info' due to errors; \
+  use --force to preserve.
+
+* doc/coreutils.texi (realpath invocation): Add a menu referencing
+the usage examples - introduced in v8.27-91-g7449f0d.
+
+Upstream-Status: Backport
+
+Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
+---
+ doc/coreutils.texi | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/doc/coreutils.texi b/doc/coreutils.texi
+index 70e2b76..d374b4a 100644
+--- a/doc/coreutils.texi
++++ b/doc/coreutils.texi
+@@ -14175,6 +14175,10 @@ Exit status:
+ 1 otherwise.
+ @end display
+ 
++@menu
++* Realpath usage examples::              Realpath usage examples.
++@end menu
++
+ 
+ @node Realpath usage examples
+ @subsection Realpath usage examples
+-- 
+2.1.0
+
diff --git a/meta/recipes-core/coreutils/coreutils_8.27.bb b/meta/recipes-core/coreutils/coreutils_8.28.bb
similarity index 94%
rename from meta/recipes-core/coreutils/coreutils_8.27.bb
rename to meta/recipes-core/coreutils/coreutils_8.28.bb
index ea8740a..a980724 100644
--- a/meta/recipes-core/coreutils/coreutils_8.27.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.28.bb
@@ -21,12 +21,13 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \
            file://0001-uname-report-processor-and-hardware-correctly.patch \
            file://disable-ls-output-quoting.patch \
            file://0001-local.mk-fix-cross-compiling-problem.patch \
+           file://0001-doc-fix-Up-field-of-realpath-usage-examples.patch \
           "
 
-SRC_URI[tarball.md5sum] = "502795792c212932365e077946d353ae"
-SRC_URI[tarball.sha256sum] = "8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b"
-SRC_URI[manpages.md5sum] = "1b31a688d06764e0e94aa20b7ea08222"
-SRC_URI[manpages.sha256sum] = "1f615819e9167646c731636b6c5ecbe79837e82a18666bacc82c3fb1dfcfaea3"
+SRC_URI[tarball.md5sum] = "e7cb20d0572cc40d9f47ede6454406d1"
+SRC_URI[tarball.sha256sum] = "1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65"
+SRC_URI[manpages.md5sum] = "3a7c626aad1c9077f254e5c2553a2f60"
+SRC_URI[manpages.sha256sum] = "d72c3fa79ae328a4fd1107102e8946755aa2e908044e1efcf1e71ef206dca042"
 
 EXTRA_OECONF_class-native = "--without-gmp"
 EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}"
-- 
1.9.1

[PATCH 3/3] coreutils: add PACKAGECONFIG for single-binary

[Chen Qi]

Add PACKAGECONFIG for single-binray. Disable it by default.

When enabled, there would only be one binary file /usr/bin/coreutils, other
files like 'ls' are text files containing contents like:

  #!/usr/bin/coreutils --coreutils-prog-shebang=ls

And the size of the rpm package reduces from 849K to 519K.

Default to disable this option to keep the traditional behaviour.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/recipes-core/coreutils/coreutils_8.28.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/coreutils/coreutils_8.28.bb b/meta/recipes-core/coreutils/coreutils_8.28.bb
index a980724..8a9e80c 100644
--- a/meta/recipes-core/coreutils/coreutils_8.28.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.28.bb
@@ -46,6 +46,7 @@ PACKAGECONFIG_class-native ??= "xattr"
 #
 PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"
 PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
+PACKAGECONFIG[single-binary] = "--enable-single-binary,--disable-single-binary,,"
 
 # [ df mktemp base64 gets a special treatment and is not included in this
 bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname du \
-- 
1.9.1