[PATCH V2 0/1] coreutils: upgrade to 8.29

[PATCH V2 0/1] coreutils: upgrade to 8.29

[Chen Qi]

Changes in V2:
* Drop the backported patch 0001-doc-fix-Up-field-of-realpath-usage-examples.
  This fixes do_compile failure on opensuse.

The following changes since commit 205cfd702190026e64eed9cae27c05ff62d1637e:

  bitbake: fetch2/__init__: Disable pseudo in runfetchcmd() (2018-01-08 08:48:54 +0000)

are available in the git repository at:

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

Chen Qi (1):
  coreutils: upgrade to 8.29

 ...c-fix-Up-field-of-realpath-usage-examples.patch | 40 ----------------------
 .../man-decouple-manpages-from-build.patch         | 27 ---------------
 .../{coreutils_8.28.bb => coreutils_8.29.bb}       | 25 ++++----------
 3 files changed, 6 insertions(+), 86 deletions(-)
 delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
 delete mode 100644 meta/recipes-core/coreutils/coreutils/man-decouple-manpages-from-build.patch
 rename meta/recipes-core/coreutils/{coreutils_8.28.bb => coreutils_8.29.bb} (79%)

-- 
1.9.1

[PATCH V2 1/1] coreutils: upgrade to 8.29

[Chen Qi]

* ls.c license checksum is changed, but the license remains the same.

* The backported patch 0001-doc-fix-Up-field-of-realpath-usage-examples.patch
  is dropped.

* The new version provides native manual page support, there's no
  need to download extra manual page from gentoo site.

* man-decouple-manpages-from-build.patch is removed, as new version
  has manual page support in environment lacking of perl.

* hostname is explicitly enabled to keep the same with previous recipe's
  behaviour.

* ALTERNATIVE_XXX settings for lbracket.1 are removed as there's no such
  file.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 ...c-fix-Up-field-of-realpath-usage-examples.patch | 40 ----------------------
 .../man-decouple-manpages-from-build.patch         | 27 ---------------
 .../{coreutils_8.28.bb => coreutils_8.29.bb}       | 25 ++++----------
 3 files changed, 6 insertions(+), 86 deletions(-)
 delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
 delete mode 100644 meta/recipes-core/coreutils/coreutils/man-decouple-manpages-from-build.patch
 rename meta/recipes-core/coreutils/{coreutils_8.28.bb => coreutils_8.29.bb} (79%)

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
deleted file mode 100644
index d763842..0000000
--- a/meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils/man-decouple-manpages-from-build.patch
deleted file mode 100644
index 3c896a1..0000000
--- a/meta/recipes-core/coreutils/coreutils/man-decouple-manpages-from-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001
-From: Paul Gortmaker <paul.gortmaker@windriver.com>
-Date: Sun, 8 Feb 2015 16:51:57 -0500
-Subject: [PATCH] man: decouple manpages from build
-
-The use of "help2man" doesn't work at all for cross compile, in
-addition to the extra requirement of perl it adds.
-
-Just decouple the manpages from the build in order to pave the way for
-importing prebuilt manpages that can be used in a cross build situation.
-
-Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.]
-Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-
-diff --git a/Makefile.am b/Makefile.am
-index fb4af27..7576b2c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -214,5 +214,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src
- include $(top_srcdir)/lib/local.mk
- include $(top_srcdir)/src/local.mk
- include $(top_srcdir)/doc/local.mk
--include $(top_srcdir)/man/local.mk
- include $(top_srcdir)/tests/local.mk
--- 
-2.2.2
-
diff --git a/meta/recipes-core/coreutils/coreutils_8.28.bb b/meta/recipes-core/coreutils/coreutils_8.29.bb
similarity index 79%
rename from meta/recipes-core/coreutils/coreutils_8.28.bb
rename to meta/recipes-core/coreutils/coreutils_8.29.bb
index 8a9e80c..8df8802 100644
--- a/meta/recipes-core/coreutils/coreutils_8.28.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.29.bb
@@ -6,31 +6,26 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/"
 BUGTRACKER = "http://debbugs.gnu.org/coreutils"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
-                    file://src/ls.c;beginline=5;endline=16;md5=38b79785ca88537b75871782a2a3c6b8"
+                    file://src/ls.c;beginline=1;endline=15;md5=1c3f9411e1842a062ce5ce9210beee0e"
 DEPENDS = "gmp libcap"
 DEPENDS_class-native = ""
 
 inherit autotools gettext texinfo
 
-SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \
-           http://distfiles.gentoo.org/distfiles/${BP}-man.tar.xz;name=manpages \
-           file://man-decouple-manpages-from-build.patch \
+SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://remove-usr-local-lib-from-m4.patch \
            file://fix-selinux-flask.patch \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
            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] = "e7cb20d0572cc40d9f47ede6454406d1"
-SRC_URI[tarball.sha256sum] = "1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65"
-SRC_URI[manpages.md5sum] = "3a7c626aad1c9077f254e5c2553a2f60"
-SRC_URI[manpages.sha256sum] = "d72c3fa79ae328a4fd1107102e8946755aa2e908044e1efcf1e71ef206dca042"
+SRC_URI[md5sum] = "960cfe75a42c9907c71439f8eb436303"
+SRC_URI[sha256sum] = "92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e"
 
 EXTRA_OECONF_class-native = "--without-gmp"
-EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}"
+EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
 EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch"
 
 # acl and xattr are not default features
@@ -95,20 +90,13 @@ do_install_append() {
 	# in update-alternatives to fail, therefore use lbracket - the name used
 	# for the actual source file.
 	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN}
-
-	# prebuilt man pages
-	install -d ${D}/${mandir}/man1
-	install -t ${D}/${mandir}/man1 ${S}/man/*.1
-	# prebuilt man pages don't do a separate man page for [ vs test.
-	# see comment above r.e. sed and update-alternatives
-	cp -R --no-dereference --preserve=mode,links -v ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN}
 }
 
 inherit update-alternatives
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df"
-ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1  hostname.1"
+ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1  hostname.1"
 
 ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
 
@@ -126,7 +114,6 @@ ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1"
 
 ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/["
 ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}"
-ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1"
 
 ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1"
 ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1"
-- 
1.9.1

Re: [PATCH V2 1/1] coreutils: upgrade to 8.29

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 384 bytes --]

On 9 January 2018 at 01:40, Chen Qi <Qi.Chen@windriver.com> wrote:

> * hostname is explicitly enabled to keep the same with previous recipe's
>   behaviour.
>

But buildhistory-diff:

packages/corei7-64-poky-linux/coreutils/coreutils: FILELIST: added
"/usr/bin/hostname"

So the old coreutils wasn't building hostname at all (we use /bin/hostname
from busybox).

Ross

[-- Attachment #2: Type: text/html, Size: 839 bytes --]

Re: [PATCH V2 1/1] coreutils: upgrade to 8.29

[Randy MacLeod]

On 2018-01-11 11:18 AM, Burton, Ross wrote:
> On 9 January 2018 at 01:40, Chen Qi <Qi.Chen@windriver.com 
> <mailto:Qi.Chen@windriver.com>> wrote:
> 
>     * hostname is explicitly enabled to keep the same with previous recipe's
>        behaviour.
> 
> 
> But buildhistory-diff:
> 
> packages/corei7-64-poky-linux/coreutils/coreutils: FILELIST: added 
> "/usr/bin/hostname"
> 
> So the old coreutils wasn't building hostname at all (we use 
> /bin/hostname from busybox).

Ross,
Are you asking Chen to package coreutils.hostname and
use the alternatives mechanism with busybox's hostname as the default?
(busybox hostname has annoyed me in a past life!)

../Randy

> 
> Ross
> 
> 


-- 
# Randy MacLeod.  WR Linux
# Wind River an Intel Company

Re: [PATCH V2 1/1] coreutils: upgrade to 8.29

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]

On 18 January 2018 at 16:47, Randy MacLeod <randy.macleod@windriver.com>
wrote:

> On 2018-01-11 11:18 AM, Burton, Ross wrote:
>
>> On 9 January 2018 at 01:40, Chen Qi <Qi.Chen@windriver.com <mailto:
>> Qi.Chen@windriver.com>> wrote:
>>
>>     * hostname is explicitly enabled to keep the same with previous
>> recipe's
>>        behaviour.
>>
>>
>> But buildhistory-diff:
>>
>> packages/corei7-64-poky-linux/coreutils/coreutils: FILELIST: added
>> "/usr/bin/hostname"
>>
>> So the old coreutils wasn't building hostname at all (we use
>> /bin/hostname from busybox).
>>
>

> Are you asking Chen to package coreutils.hostname and
> use the alternatives mechanism with busybox's hostname as the default?
> (busybox hostname has annoyed me in a past life!)
>

I'm not sure what I'm asking, just pointing out that the log is wrong as
the old coreutils wasn't building a hostname binary.

If someone sets base_bindir and bindir to the same directory then there
will be a conflict, so this does need to be sorted somehow.

Ross

[-- Attachment #2: Type: text/html, Size: 1856 bytes --]

Re: [PATCH V2 1/1] coreutils: upgrade to 8.29

[ChenQi]

[-- Attachment #1: Type: text/plain, Size: 1719 bytes --]

On 01/19/2018 01:34 AM, Burton, Ross wrote:
> On 18 January 2018 at 16:47, Randy MacLeod 
> <randy.macleod@windriver.com <mailto:randy.macleod@windriver.com>> wrote:
>
>     On 2018-01-11 11:18 AM, Burton, Ross wrote:
>
>         On 9 January 2018 at 01:40, Chen Qi <Qi.Chen@windriver.com
>         <mailto:Qi.Chen@windriver.com> <mailto:Qi.Chen@windriver.com
>         <mailto:Qi.Chen@windriver.com>>> wrote:
>
>             * hostname is explicitly enabled to keep the same with
>         previous recipe's
>                behaviour.
>
>
>         But buildhistory-diff:
>
>         packages/corei7-64-poky-linux/coreutils/coreutils: FILELIST:
>         added "/usr/bin/hostname"
>
>         So the old coreutils wasn't building hostname at all (we use
>         /bin/hostname from busybox).
>
>     Are you asking Chen to package coreutils.hostname and
>     use the alternatives mechanism with busybox's hostname as the default?
>     (busybox hostname has annoyed me in a past life!)
>
>
> I'm not sure what I'm asking, just pointing out that the log is wrong 
> as the old coreutils wasn't building a hostname binary.
>
> If someone sets base_bindir and bindir to the same directory then 
> there will be a conflict, so this does need to be sorted somehow.
>
> Ross

Hi Ross,

You are right about this. The old coreutils doesn't build out hostname. 
I cannot recall why I thought it did. Anyway I can see from this mistake 
that using buildhistory is indeed a big help, and I'll use it in my 
future work.

I've sent out a fix to resolve the conflict problem about hostname 
between coreutils and other packages (busybox and net-tools).

Best Regards,
Chen Qi



[-- Attachment #2: Type: text/html, Size: 3738 bytes --]