diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-01 18:27:11 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-13 05:51:39 +0300 |
commit | 6e60e8b2b2bab889379b380a28a167a0edd9d1d3 (patch) | |
tree | f12f54d5ba8e74e67e5fad3651a1e125bb8f4191 /import-layers/yocto-poky/meta/recipes-extended/groff | |
parent | 509842add85b53e13164c1569a1fd43d5b8d91c5 (diff) | |
download | openbmc-6e60e8b2b2bab889379b380a28a167a0edd9d1d3.tar.xz |
Yocto 2.3
Move OpenBMC to Yocto 2.3(pyro).
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I50744030e771f4850afc2a93a10d3507e76d36bc
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Resolves: openbmc/openbmc#2461
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/groff')
8 files changed, 105 insertions, 261 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/fix-narrowing-conversion-error.patch b/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/fix-narrowing-conversion-error.patch deleted file mode 100644 index 4b0176fcd..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/fix-narrowing-conversion-error.patch +++ /dev/null @@ -1,61 +0,0 @@ -From fc289ab69c6d7e4ad489172509a85f68afec43ea Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Fri, 29 Jul 2016 03:19:39 -0400 -Subject: [PATCH] fix narrowing conversion error - -While gcc6 used, build old groff (for anti-GPLv3 reasons) failed: -..... -|groff-1.18.1.4/src/devices/grolbp/charset.h:69:1: error: narrowing -conversion of '130' from 'int' to 'char' inside { } [-Wnarrowing] -...... - -In upstream git://git.savannah.gnu.org/groff.git, -the following commit fix the issue, but the license is GPLV3, -we could not backport it to the old groff which license is GPLV2. -... -commit d180038ae0da19655bc2760ae2043efa0550a76c -Author: Werner LEMBERG <wl@gnu.org> -Date: Wed Apr 16 21:11:07 2003 +0000 - * src/devices/grolbp/charset.h (symset): Use `unsigned char'. -... - -We use another different way to fix the issue. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - src/devices/grolbp/charset.h | 2 +- - src/devices/grolbp/lbp.cc | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/devices/grolbp/charset.h b/src/devices/grolbp/charset.h -index adc76f4..e9c6c5b 100644 ---- a/src/devices/grolbp/charset.h -+++ b/src/devices/grolbp/charset.h -@@ -1,6 +1,6 @@ - // Definition of the WP54 character set - --char symset[] = { -+int symset[] = { - 0x57,0x50,0x35,0x34,0x00,0x41,0x76,0x61,0x6e,0x74,0x47,0x61, - 0x72,0x64,0x65,0x2d,0x42,0x6f,0x6f,0x6b,0x00,0x41,0x76, - 0x61,0x6e,0x74,0x47,0x61,0x72,0x64,0x65,0x2d,0x44,0x65, -diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cc -index 76db32a..00d4ca7 100644 ---- a/src/devices/grolbp/lbp.cc -+++ b/src/devices/grolbp/lbp.cc -@@ -152,8 +152,8 @@ static void wp54charset() - { - unsigned int i; - lbpputs("\033[714;100;29;0;32;120.}"); -- for (i = 0; i < sizeof(symset); i++) -- lbpputc(symset[i]); -+ for (i = 0; i < sizeof(symset)/sizeof(symset[0]); i++) -+ lbpputc((char)symset[i]&0xFF); - lbpputs("\033[100;0 D"); - return; - } --- -2.8.1 - diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch b/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch deleted file mode 100644 index 559ae7289..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-fix-bindir.patch +++ /dev/null @@ -1,39 +0,0 @@ -Upstream-Status: Inappropriate [embedded] - -Signed-off-by: Ming Liu <ming.liu@windriver.com> ---- - Makefile.sub | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/contrib/groffer/Makefile.sub -+++ b/contrib/groffer/Makefile.sub -@@ -38,16 +38,16 @@ groffer: groffer.sh groffer2.sh version. - $(RM) $@; - sed \ - -e "s|@g@|$(g)|g" \ -- -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \ -+ -e "s|@BINDIR@|$(bindir)|g" \ - -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \ - -e "s|@VERSION@|$(version)$(revision)|g" \ - $(srcdir)/groffer.sh >$@; - chmod +x $@ - - install_data: groffer -- -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) -- -$(RM) $(DESTDIR)$(bindir)/groffer -- $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer -+ -test -d $(bindir) || $(mkinstalldirs) $(bindir) -+ -$(RM) $(bindir)/groffer -+ $(INSTALL_SCRIPT) groffer $(bindir)/groffer - -test -d $(DESTDIR)$(libdir)/groff/groffer || \ - $(mkinstalldirs) $(DESTDIR)$(libdir)/groff/groffer - -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh -@@ -58,7 +58,7 @@ install_data: groffer - $(DESTDIR)$(libdir)/groff/groffer/version.sh - - uninstall_sub: -- -$(RM) $(DESTDIR)$(bindir)/groffer -+ -$(RM) $(bindir)/groffer - -$(RM) $(DESTDIR)$(libdir)/groff/groffer/groffer2.sh - -$(RM) $(DESTDIR)$(libdir)/groff/groffer/version.sh - -rmdir $(DESTDIR)$(libdir)/groff/groffer diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch b/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch deleted file mode 100644 index c24eff9af..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/groff-1.18.1.4-remove-mom.patch +++ /dev/null @@ -1,39 +0,0 @@ - -Upstream-Status: Inappropriate [embedded] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> ---- - groff-1.18.1.4/Makefile.in | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -460,27 +460,22 @@ OTHERDIRS=\ - src/roff/grog \ - src/roff/nroff \ - contrib/mm \ - contrib/pic2graph \ - contrib/eqn2graph \ -- contrib/groffer \ -- contrib/mom \ -- doc -+ contrib/groffer - ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \ - $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS) - EXTRADIRS=\ - font/devps/generate \ - font/devdvi/generate \ - font/devlj4/generate \ -- src/xditview \ - doc - NOMAKEDIRS=\ - arch/djgpp \ - contrib/mm/examples \ - contrib/mm/mm \ -- contrib/mom/examples \ -- contrib/mom/momdoc \ - src/libs/snprintf - DISTDIRS=\ - $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDEVDIRS) \ - $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS) - TARGETS=all install install_bin install_data clean distclean mostlyclean \ diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch b/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch deleted file mode 100644 index e3f1aa6a4..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/man-local.patch +++ /dev/null @@ -1,36 +0,0 @@ -Upstream-Status: Inappropriate [embedded] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: groff-1.18.1.4/tmac/man.local -=================================================================== ---- groff-1.18.1.4.orig/tmac/man.local 2000-10-26 22:15:17.000000000 +0800 -+++ groff-1.18.1.4/tmac/man.local 2010-08-24 14:17:52.070006664 +0800 -@@ -1,2 +1,27 @@ - .\" This file is loaded after an-old.tmac. - .\" Put any local modifications to an-old.tmac here. -+. -+.if n \{\ -+. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other -+. \" than utf8. -+. if !'\*[.T]'utf8' \ -+. tr \[oq]' -+. -+. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by -+. \" grotty. -+. if '\V[GROFF_SGR]'' \ -+. output x X tty: sgr 0 -+. -+. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make -+. \" searching in man pages easier. -+. if '\*[.T]'utf8' \ -+. char \- \N'45' -+. -+. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such -+. \" as those in command-line options. This is a bug in those pages, but -+. \" too many fonts are missing the Unicode HYPHEN character, so we render -+. \" this as the ASCII-compatible HYPHEN-MINUS instead. -+. if '\*[.T]'utf8' \ -+. char - \N'45' -+.\} -+ diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch b/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch deleted file mode 100644 index 409c1a5a1..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.18.1.4/mdoc-local.patch +++ /dev/null @@ -1,36 +0,0 @@ - -Upstream-Status: Inappropriate [embedded] - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: groff-1.18.1.4/tmac/mdoc.local -=================================================================== ---- groff-1.18.1.4.orig/tmac/mdoc.local 2001-03-23 08:17:51.000000000 +0800 -+++ groff-1.18.1.4/tmac/mdoc.local 2010-08-24 14:20:22.014006846 +0800 -@@ -1,2 +1,26 @@ - .\" This file is loaded after doc.tmac. - .\" Put any local modifications to doc.tmac here. -+. -+.if n \{\ -+. \" Debian: Map \(oq to ' rather than ` in nroff mode for devices other -+. \" than utf8. -+. if !'\*[.T]'utf8' \ -+. tr \[oq]' -+. -+. \" Debian: Disable the use of SGR (ANSI colour) escape sequences by -+. \" grotty. -+. if '\V[GROFF_SGR]'' \ -+. output x X tty: sgr 0 -+. -+. \" Debian: Map \- to the Unicode HYPHEN-MINUS character, to make -+. \" searching in man pages easier. -+. if '\*[.T]'utf8' \ -+. char \- \N'45' -+. -+. \" Debian: Many UTF-8 man pages use "-" instead of "\-" for dashes such -+. \" as those in command-line options. This is a bug in those pages, but -+. \" too many fonts are missing the Unicode HYPHEN character, so we render -+. \" this as the ASCII-compatible HYPHEN-MINUS instead. -+. if '\*[.T]'utf8' \ -+. char - \N'45' -+.\} diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch b/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch new file mode 100644 index 000000000..f1db5b065 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/groff/groff-1.22.3/0001-replace-perl-w-with-use-warnings.patch @@ -0,0 +1,102 @@ +From 5b574542070db286c89b3827e8f15ed4b3b39034 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 6 Apr 2017 01:46:00 -0700 +Subject: [PATCH] replace "perl -w" with "use warnings" + +The shebang's max length is usually 128 as defined in +/usr/include/linux/binfmts.h: + #define BINPRM_BUF_SIZE 128 + +There would be errors when @PERL@ is longer than 128, use +'/usr/bin/env perl' can fix the problem, but '/usr/bin/env perl -w' +doesn't work: + +/usr/bin/env: perl -w: No such file or directory + +So replace "perl -w" with "use warnings" to make it work. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + font/devpdf/util/BuildFoundries.pl | 3 ++- + src/devices/gropdf/gropdf.pl | 3 ++- + src/devices/gropdf/pdfmom.pl | 3 ++- + src/utils/afmtodit/afmtodit.pl | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/font/devpdf/util/BuildFoundries.pl b/font/devpdf/util/BuildFoundries.pl +index 39f2f0d..a2bfd8e 100644 +--- a/font/devpdf/util/BuildFoundries.pl ++++ b/font/devpdf/util/BuildFoundries.pl +@@ -1,4 +1,4 @@ +-#!/usr/bin/perl -w ++#!/usr/bin/perl + # + # BuildFoundries : Given a Foundry file generate groff and download files + # Deri James : Monday 07 Feb 2011 +@@ -22,6 +22,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + use strict; ++use warnings; + + my $where=shift||''; + my $devps=shift||'../devps'; +diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl +index 035d123..b933b32 100644 +--- a/src/devices/gropdf/gropdf.pl ++++ b/src/devices/gropdf/gropdf.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # gropdf : PDF post processor for groff + # +@@ -21,6 +21,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + use strict; ++use warnings; + use Getopt::Long qw(:config bundling); + use Compress::Zlib; + +diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl +index beec820..4b46ea4 100644 +--- a/src/devices/gropdf/pdfmom.pl ++++ b/src/devices/gropdf/pdfmom.pl +@@ -1,4 +1,4 @@ +-#!@PERL@ -w ++#!@PERL@ + # + # pdfmom : Frontend to run groff -mom to produce PDFs + # Deri James : Friday 16 Mar 2012 +@@ -24,6 +24,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + use strict; ++use warnings; + use File::Temp qw/tempfile/; + my @cmd; + my $dev='pdf'; +diff --git a/src/utils/afmtodit/afmtodit.pl b/src/utils/afmtodit/afmtodit.pl +index 4f2ce83..5c078ff 100644 +--- a/src/utils/afmtodit/afmtodit.pl ++++ b/src/utils/afmtodit/afmtodit.pl +@@ -1,4 +1,4 @@ +-#! /usr/bin/perl -w ++#! /usr/bin/perl + # -*- Perl -*- + # Copyright (C) 1989-2014 Free Software Foundation, Inc. + # Written by James Clark (jjc@jclark.com) +@@ -19,6 +19,7 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + + use strict; ++use warnings; + + @afmtodit.tables@ + +-- +2.10.2 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.18.1.4.bb b/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.18.1.4.bb deleted file mode 100644 index fc7eb4478..000000000 --- a/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.18.1.4.bb +++ /dev/null @@ -1,50 +0,0 @@ -SUMMARY = "GNU Troff software" -DESCRIPTION = "The groff (GNU troff) software is a typesetting package which reads plain text mixed with \ -formatting commands and produces formatted output." -SECTION = "console/utils" -HOMEPAGE = "http://www.gnu.org/software/groff/" -LICENSE = "GPLv2" -PR = "r1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=e43fc16fccd8519fba405f0a0ff6e8a3" - -SRC_URI = "${GNU_MIRROR}/${BPN}/old/${BP}.tar.gz \ - file://groff-1.18.1.4-remove-mom.patch;striplevel=1 \ - file://man-local.patch \ - file://mdoc-local.patch \ - file://groff-1.18.1.4-fix-bindir.patch \ - file://fix-narrowing-conversion-error.patch \ -" - -inherit autotools texinfo - -EXTRA_OECONF="--without-x --prefix=${D} --exec-prefix=${D} --bindir=${D}${bindir} --datadir=${D}${datadir} --mandir=${D}${datadir}/man --infodir=${D}${datadir}info --with-appresdir=${D}${datadir}" - -SRC_URI[md5sum] = "ceecb81533936d251ed015f40e5f7287" -SRC_URI[sha256sum] = "ff3c7c3b6cae5e8cc5062a144de5eff0022e8e970e1774529cc2d5dde46ce50d" -PARALLEL_MAKE = "" - -do_configure (){ - oe_runconf -} - -do_install_append() { - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. - for i in afmtodit mmroff; do - if [ -f ${D}${bindir}/$i ]; then - sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i - fi - done - - mkdir -p ${D}${sysconfdir}/groff - cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${sysconfdir}/groff/ - cp -rf ${D}${datadir}/groff/site-tmac/* ${D}${datadir}/groff/${PV}/tmac/ -} - -pkg_postinst_${PN}() { - ln -s tbl $D${bindir}/gtbl - echo "export GROFF_FONT_PATH=/usr/share/groff/${PV}/font" >> $D${sysconfdir}/profile - echo "export GROFF_TMAC_PATH=/usr/share/groff/${PV}/tmac" >> $D${sysconfdir}/profile -} - diff --git a/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb b/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb index dd241f3f8..7472f5982 100644 --- a/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb +++ b/import-layers/yocto-poky/meta/recipes-extended/groff/groff_1.22.3.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-1.22.2-correct-man.local-install-path.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ + file://0001-replace-perl-w-with-use-warnings.patch \ " SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5" @@ -24,6 +25,8 @@ inherit autotools texinfo EXTRA_OECONF = "--without-x" PARALLEL_MAKE = "" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" + do_configure_prepend() { if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then sed -i \ |