summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-01-09 09:40:09 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-14 09:11:58 +0000
commit43a2a59702c5242a4816a547c6432441804f264c (patch)
tree17d4c7fca21e1a81ec6ef4142cb22216bf2b27f1
parent7984c1706702bb646dba60b229f1d78336896c34 (diff)
downloadpoky-43a2a59702c5242a4816a547c6432441804f264c.tar.gz
coreutils: upgrade to 8.29
* 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. (From OE-Core rev: 77c6b5eb7b4b4254a3fc90337e93691baed7cc7e) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch40
-rw-r--r--meta/recipes-core/coreutils/coreutils/man-decouple-manpages-from-build.patch27
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.29.bb (renamed from meta/recipes-core/coreutils/coreutils_8.28.bb)25
3 files changed, 6 insertions, 86 deletions
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 d763842966..0000000000
--- a/meta/recipes-core/coreutils/coreutils/0001-doc-fix-Up-field-of-realpath-usage-examples.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From e83f10c48309b722570dc53a22deb355433f8cbc Mon Sep 17 00:00:00 2001
2From: Bernhard Voelker <mail@bernhard-voelker.de>
3Date: Tue, 5 Sep 2017 00:20:01 +0200
4Subject: [PATCH] doc: fix "Up" field of realpath usage examples
5
6Older versions of 'makeinfo' choke on a missing reference:
7
8 ./doc/coreutils.texi:14177: `Realpath usage examples' has no Up field\
9 (perhaps incorrect sectioning?).
10 makeinfo: Removing output file `doc/coreutils.info' due to errors; \
11 use --force to preserve.
12
13* doc/coreutils.texi (realpath invocation): Add a menu referencing
14the usage examples - introduced in v8.27-91-g7449f0d.
15
16Upstream-Status: Backport
17
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
19---
20 doc/coreutils.texi | 4 ++++
21 1 file changed, 4 insertions(+)
22
23diff --git a/doc/coreutils.texi b/doc/coreutils.texi
24index 70e2b76..d374b4a 100644
25--- a/doc/coreutils.texi
26+++ b/doc/coreutils.texi
27@@ -14175,6 +14175,10 @@ Exit status:
28 1 otherwise.
29 @end display
30
31+@menu
32+* Realpath usage examples:: Realpath usage examples.
33+@end menu
34+
35
36 @node Realpath usage examples
37 @subsection Realpath usage examples
38--
392.1.0
40
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 3c896a11bf..0000000000
--- a/meta/recipes-core/coreutils/coreutils/man-decouple-manpages-from-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001
2From: Paul Gortmaker <paul.gortmaker@windriver.com>
3Date: Sun, 8 Feb 2015 16:51:57 -0500
4Subject: [PATCH] man: decouple manpages from build
5
6The use of "help2man" doesn't work at all for cross compile, in
7addition to the extra requirement of perl it adds.
8
9Just decouple the manpages from the build in order to pave the way for
10importing prebuilt manpages that can be used in a cross build situation.
11
12Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.]
13Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
14
15diff --git a/Makefile.am b/Makefile.am
16index fb4af27..7576b2c 100644
17--- a/Makefile.am
18+++ b/Makefile.am
19@@ -214,5 +214,4 @@ AM_CPPFLAGS = -Ilib -I$(top_srcdir)/lib -Isrc -I$(top_srcdir)/src
20 include $(top_srcdir)/lib/local.mk
21 include $(top_srcdir)/src/local.mk
22 include $(top_srcdir)/doc/local.mk
23-include $(top_srcdir)/man/local.mk
24 include $(top_srcdir)/tests/local.mk
25--
262.2.2
27
diff --git a/meta/recipes-core/coreutils/coreutils_8.28.bb b/meta/recipes-core/coreutils/coreutils_8.29.bb
index 8a9e80c49b..8df88020e3 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/"
6BUGTRACKER = "http://debbugs.gnu.org/coreutils" 6BUGTRACKER = "http://debbugs.gnu.org/coreutils"
7LICENSE = "GPLv3+" 7LICENSE = "GPLv3+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ 8LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
9 file://src/ls.c;beginline=5;endline=16;md5=38b79785ca88537b75871782a2a3c6b8" 9 file://src/ls.c;beginline=1;endline=15;md5=1c3f9411e1842a062ce5ce9210beee0e"
10DEPENDS = "gmp libcap" 10DEPENDS = "gmp libcap"
11DEPENDS_class-native = "" 11DEPENDS_class-native = ""
12 12
13inherit autotools gettext texinfo 13inherit autotools gettext texinfo
14 14
15SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz;name=tarball \ 15SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
16 http://distfiles.gentoo.org/distfiles/${BP}-man.tar.xz;name=manpages \
17 file://man-decouple-manpages-from-build.patch \
18 file://remove-usr-local-lib-from-m4.patch \ 16 file://remove-usr-local-lib-from-m4.patch \
19 file://fix-selinux-flask.patch \ 17 file://fix-selinux-flask.patch \
20 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 18 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
21 file://0001-uname-report-processor-and-hardware-correctly.patch \ 19 file://0001-uname-report-processor-and-hardware-correctly.patch \
22 file://disable-ls-output-quoting.patch \ 20 file://disable-ls-output-quoting.patch \
23 file://0001-local.mk-fix-cross-compiling-problem.patch \ 21 file://0001-local.mk-fix-cross-compiling-problem.patch \
24 file://0001-doc-fix-Up-field-of-realpath-usage-examples.patch \
25 " 22 "
26 23
27SRC_URI[tarball.md5sum] = "e7cb20d0572cc40d9f47ede6454406d1" 24SRC_URI[md5sum] = "960cfe75a42c9907c71439f8eb436303"
28SRC_URI[tarball.sha256sum] = "1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65" 25SRC_URI[sha256sum] = "92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e"
29SRC_URI[manpages.md5sum] = "3a7c626aad1c9077f254e5c2553a2f60"
30SRC_URI[manpages.sha256sum] = "d72c3fa79ae328a4fd1107102e8946755aa2e908044e1efcf1e71ef206dca042"
31 26
32EXTRA_OECONF_class-native = "--without-gmp" 27EXTRA_OECONF_class-native = "--without-gmp"
33EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir}" 28EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}"
34EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch" 29EXTRA_OECONF_class-nativesdk = "--enable-install-program=arch"
35 30
36# acl and xattr are not default features 31# acl and xattr are not default features
@@ -95,20 +90,13 @@ do_install_append() {
95 # in update-alternatives to fail, therefore use lbracket - the name used 90 # in update-alternatives to fail, therefore use lbracket - the name used
96 # for the actual source file. 91 # for the actual source file.
97 mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} 92 mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN}
98
99 # prebuilt man pages
100 install -d ${D}/${mandir}/man1
101 install -t ${D}/${mandir}/man1 ${S}/man/*.1
102 # prebuilt man pages don't do a separate man page for [ vs test.
103 # see comment above r.e. sed and update-alternatives
104 cp -R --no-dereference --preserve=mode,links -v ${D}${mandir}/man1/test.1 ${D}${mandir}/man1/lbracket.1.${BPN}
105} 93}
106 94
107inherit update-alternatives 95inherit update-alternatives
108 96
109ALTERNATIVE_PRIORITY = "100" 97ALTERNATIVE_PRIORITY = "100"
110ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df" 98ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 mktemp df"
111ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 lbracket.1 groups.1 kill.1 uptime.1 stat.1 hostname.1" 99ALTERNATIVE_${PN}-doc = "base64.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1"
112 100
113ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1" 101ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"
114 102
@@ -126,7 +114,6 @@ ALTERNATIVE_LINK_NAME[df.1] = "${mandir}/man1/df.1"
126 114
127ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/[" 115ALTERNATIVE_LINK_NAME[lbracket] = "${bindir}/["
128ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}" 116ALTERNATIVE_TARGET[lbracket] = "${bindir}/lbracket.${BPN}"
129ALTERNATIVE_LINK_NAME[lbracket.1] = "${mandir}/man1/lbracket.1"
130 117
131ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" 118ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1"
132ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1" 119ALTERNATIVE_LINK_NAME[uptime.1] = "${mandir}/man1/uptime.1"