* [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe
@ 2017-10-03 2:15 Andre McCurdy
2017-10-03 2:15 ` [morty][PATCH v2 1/2] coreutils_6.9: Disable broken man pages Andre McCurdy
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Andre McCurdy @ 2017-10-03 2:15 UTC (permalink / raw)
To: openembedded-core
Two minor patches backported from meta-gplv2 for the gplv2 coreutils
recipe in oe-core morty.
v2: Add Signed-off-by's to both patches + reference upstream
meta-gplv2 commits and add _6.9 suffix in both commit messages.
André Draszik (1):
coreutils_6.9: fix musl compilation
Richard Purdie (1):
coreutils_6.9: Disable broken man pages
...-need-charset.alias-when-building-for-mus.patch | 46 ++++++++++++++++++++++
.../coreutils/coreutils-6.9/no-man.patch | 21 ++++++++++
meta/recipes-core/coreutils/coreutils_6.9.bb | 2 +
3 files changed, 69 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [morty][PATCH v2 1/2] coreutils_6.9: Disable broken man pages
2017-10-03 2:15 [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe Andre McCurdy
@ 2017-10-03 2:15 ` Andre McCurdy
2017-10-03 2:16 ` [morty][PATCH v2 2/2] coreutils_6.9: fix musl compilation Andre McCurdy
2017-11-07 20:33 ` [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe Andre McCurdy
2 siblings, 0 replies; 4+ messages in thread
From: Andre McCurdy @ 2017-10-03 2:15 UTC (permalink / raw)
To: openembedded-core
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>
Cherry-pick from meta-gplv2:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-gplv2/commit/?id=46349e1a8734fb94a04bf7c234c01fa175333238
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
.../coreutils/coreutils-6.9/no-man.patch | 21 +++++++++++++++++++++
meta/recipes-core/coreutils/coreutils_6.9.bb | 1 +
2 files changed, 22 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..6767d7d
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-6.9/no-man.patch
@@ -0,0 +1,21 @@
+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]
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+
+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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [morty][PATCH v2 2/2] coreutils_6.9: fix musl compilation
2017-10-03 2:15 [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe Andre McCurdy
2017-10-03 2:15 ` [morty][PATCH v2 1/2] coreutils_6.9: Disable broken man pages Andre McCurdy
@ 2017-10-03 2:16 ` Andre McCurdy
2017-11-07 20:33 ` [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe Andre McCurdy
2 siblings, 0 replies; 4+ messages in thread
From: Andre McCurdy @ 2017-10-03 2:16 UTC (permalink / raw)
To: openembedded-core; +Cc: André Draszik
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>
Cherry-pick from meta-gplv2:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-gplv2/commit/?id=e42ded0ee35d0aab0de8fa090eda9f1c08bcbb4c
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
...-need-charset.alias-when-building-for-mus.patch | 46 ++++++++++++++++++++++
meta/recipes-core/coreutils/coreutils_6.9.bb | 1 +
2 files changed, 47 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..d661e59
--- /dev/null
+++ b/meta/recipes-core/coreutils/coreutils-6.9/build-don-t-need-charset.alias-when-building-for-mus.patch
@@ -0,0 +1,46 @@
+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>
+Signed-off-by: Andre McCurdy <armccurdy@gmail.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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe
2017-10-03 2:15 [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe Andre McCurdy
2017-10-03 2:15 ` [morty][PATCH v2 1/2] coreutils_6.9: Disable broken man pages Andre McCurdy
2017-10-03 2:16 ` [morty][PATCH v2 2/2] coreutils_6.9: fix musl compilation Andre McCurdy
@ 2017-11-07 20:33 ` Andre McCurdy
2 siblings, 0 replies; 4+ messages in thread
From: Andre McCurdy @ 2017-11-07 20:33 UTC (permalink / raw)
To: OE Core mailing list; +Cc: Armin Kuster
On Mon, Oct 2, 2017 at 7:15 PM, Andre McCurdy <armccurdy@gmail.com> wrote:
> Two minor patches backported from meta-gplv2 for the gplv2 coreutils
> recipe in oe-core morty.
Ping. CCing Armin.
> v2: Add Signed-off-by's to both patches + reference upstream
> meta-gplv2 commits and add _6.9 suffix in both commit messages.
>
> André Draszik (1):
> coreutils_6.9: fix musl compilation
>
> Richard Purdie (1):
> coreutils_6.9: Disable broken man pages
>
> ...-need-charset.alias-when-building-for-mus.patch | 46 ++++++++++++++++++++++
> .../coreutils/coreutils-6.9/no-man.patch | 21 ++++++++++
> meta/recipes-core/coreutils/coreutils_6.9.bb | 2 +
> 3 files changed, 69 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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-07 20:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-03 2:15 [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe Andre McCurdy
2017-10-03 2:15 ` [morty][PATCH v2 1/2] coreutils_6.9: Disable broken man pages Andre McCurdy
2017-10-03 2:16 ` [morty][PATCH v2 2/2] coreutils_6.9: fix musl compilation Andre McCurdy
2017-11-07 20:33 ` [morty][PATCH v2 0/2] coreutils: musl build fix for gplv2 coreutils recipe Andre McCurdy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.