[morty][PATCH 0/2] coreutils: musl build fix for gplv2 coreutils recipe

[morty][PATCH 0/2] coreutils: musl build fix for gplv2 coreutils recipe

[Andre McCurdy]

Two minor patches backported from meta-gplv2 for the gplv2 coreutils
recipe in oe-core morty.

André Draszik (1):
  coreutils: fix musl compilation

Richard Purdie (1):
  coreutils: Disable broken man pages

 ...-need-charset.alias-when-building-for-mus.patch | 44 ++++++++++++++++++++++
 .../coreutils/coreutils-6.9/no-man.patch           | 19 ++++++++++
 meta/recipes-core/coreutils/coreutils_6.9.bb       |  2 +
 3 files changed, 65 insertions(+)
 create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch
 create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/no-man.patch

-- 
1.9.1

[morty][PATCH 1/2] coreutils: Disable broken man pages

[Andre McCurdy]

From: Richard Purdie <richard.purdie@linuxfoundation.org>

These are generated from --help output of the host tools which is clearly
incorrect, particularly given the older nature of this recipe. Simply
disable them entirely.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../recipes-core/coreutils/coreutils-6.9/no-man.patch | 19 +++++++++++++++++++
 meta/recipes-core/coreutils/coreutils_6.9.bb          |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/no-man.patch

diff --git a/meta/recipes-core/coreutils/coreutils-6.9/no-man.patch b/meta/recipes-core/coreutils/coreutils-6.9/no-man.patch
new file mode 100644
index 0000000..cc9dfc8
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-6.9/no-man.patch
@@ -0,0 +1,19 @@
+Disable manpages for coreutils. These are generated by running the host version --help
+which is going to give incorrect results so its better simply not to do this at all.
+
+RP 2017/3/9
+Upstream-Status: Inappropriate [OE cross compile specific hack]
+
+Index: coreutils-6.9/Makefile.am
+===================================================================
+--- coreutils-6.9.orig/Makefile.am
++++ coreutils-6.9/Makefile.am
+@@ -17,7 +17,7 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ # 02110-1301, USA.
+ 
+-SUBDIRS = lib src doc man po tests
++SUBDIRS = lib src doc po tests
+ EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
+   .gitignore \
+   .hgignore \
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 35700a3..6bcf8de 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -26,6 +26,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
            file://coreutils-fix-texinfo.patch \
            file://fix_for_manpage_building.patch \
            file://loadavg.patch \
+           file://no-man.patch \
            "
 
 SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
-- 
1.9.1

[morty][PATCH 2/2] coreutils: fix musl compilation

[Andre McCurdy]

From: André Draszik <adraszik@tycoint.com>

As per the patch

Signed-off-by: André Draszik <adraszik@tycoint.com>
Acked-by: Sylvain Lemieux <slemieux@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 ...-need-charset.alias-when-building-for-mus.patch | 44 ++++++++++++++++++++++
 meta/recipes-core/coreutils/coreutils_6.9.bb       |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch

diff --git a/meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch b/meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch
new file mode 100644
index 0000000..2e0bfb7
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch
@@ -0,0 +1,44 @@
+From 542811eecc05c6c43590bde3852598aa6277abf3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <adraszik@tycoint.com>
+Date: Thu, 23 Mar 2017 12:46:07 +0000
+Subject: [PATCH] build: don't need charset.alias when building for musl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [required for coreutils 6.9 (GPLv2) recipe only]
+Signed-off-by: André Draszik <adraszik@tycoint.com>
+---
+ lib/gnulib.mk | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/lib/gnulib.mk b/lib/gnulib.mk
+index e833d14..04b2b74 100644
+--- a/lib/gnulib.mk
++++ b/lib/gnulib.mk
+@@ -907,7 +907,11 @@ all-local: charset.alias ref-add.sed ref-del.sed
+ charset_alias = $(DESTDIR)$(libdir)/charset.alias
+ charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+ install-exec-local: all-local
+-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
++	case '$(host_os)' in \
++	    linux-musl*) \
++	      : ;;\
++	    *) \
++	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir) ;\
+ 	if test -f $(charset_alias); then \
+ 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+ 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+@@ -918,7 +922,8 @@ install-exec-local: all-local
+ 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+ 	    rm -f $(charset_tmp) ; \
+ 	  fi ; \
+-	fi
++	fi ;\
++	esac
+ 
+ uninstall-local: all-local
+ 	if test -f $(charset_alias); then \
+-- 
+2.11.0
+
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 6bcf8de..d04edd8 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -27,6 +27,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.bz2 \
            file://fix_for_manpage_building.patch \
            file://loadavg.patch \
            file://no-man.patch \
+           file://build-don-t-need-charset.alias-when-building-for-mus.patch \
            "
 
 SRC_URI[md5sum] = "c9607d8495f16e98906e7ed2d9751a06"
-- 
1.9.1

✗ patchtest: failure for coreutils: musl build fix for gplv2 coreutils recipe

[Patchwork]

== Series Details ==

Series: coreutils: musl build fix for gplv2 coreutils recipe
Revision: 1
URL   : https://patchwork.openembedded.org/series/9192/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] 
  Suggested fix    Sign off the added patch file (meta/recipes-core/coreutils/coreutils-6.9/no-man.patch)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe