summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/coreutils/coreutils-8.25
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2016-12-26 16:10:35 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-16 18:05:12 +0000
commit2f689ed92aeb4ba5c2c64f9af0f740aa49719b25 (patch)
tree825c894976039a7c983b52dbe563feb566770935 /meta/recipes-core/coreutils/coreutils-8.25
parent40cca1d0484e05ec20f638ff9160e4a84a76bf36 (diff)
downloadpoky-2f689ed92aeb4ba5c2c64f9af0f740aa49719b25.tar.gz
coreutils: upgrade to 8.26
Add 0001-local.mk-fix-cross-compiling-problem.patch to fix the following cross compiling problem. | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. (From OE-Core rev: 07fabf6aa622c4b9ed6f0dc97a6acf5df5a6f058) 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>
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils-8.25')
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.25/0001-Unset-need_charset_alias-when-building-for-musl.patch33
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch64
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch49
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.25/fix-selinux-flask.patch39
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.25/man-decouple-manpages-from-build.patch27
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.25/remove-usr-local-lib-from-m4.patch31
6 files changed, 0 insertions, 243 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.25/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-core/coreutils/coreutils-8.25/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index ba1a4bab4c..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.25/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Apr 2015 17:02:13 -0700
4Subject: [PATCH] Unset need_charset_alias when building for musl
5
6localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
7which actually shoudl be fixed in gnulib and then all downstream
8projects will get it eventually. For now we apply the fix to
9coreutils
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 lib/gnulib.mk | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/lib/gnulib.mk b/lib/gnulib.mk
19index e1d74db..c0e92dd 100644
20--- a/lib/gnulib.mk
21+++ b/lib/gnulib.mk
22@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
23 case '$(host_os)' in \
24 darwin[56]*) \
25 need_charset_alias=true ;; \
26- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
27+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
28 need_charset_alias=false ;; \
29 *) \
30 need_charset_alias=true ;; \
31--
322.1.4
33
diff --git a/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch b/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch
deleted file mode 100644
index 3c43e1d5da..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.25/0001-uname-report-processor-and-hardware-correctly.patch
+++ /dev/null
@@ -1,64 +0,0 @@
1Upstream-Status: Denied
2
3Subject: uname: report processor and hardware correctly
4
5This patch is rejected by coreutils upstream, but distros like debian and fedora
6uses this patch to make `uname -i' and `uname -p' to not report 'unknown'.
7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
10 src/uname.c | 18 ++++++++++++++++--
11 1 file changed, 16 insertions(+), 2 deletions(-)
12
13diff --git a/src/uname.c b/src/uname.c
14index 39bd28c..c84582d 100644
15--- a/src/uname.c
16+++ b/src/uname.c
17@@ -299,13 +299,19 @@ main (int argc, char **argv)
18
19 if (toprint & PRINT_PROCESSOR)
20 {
21- char const *element = unknown;
22+ char *element = unknown;
23 #if HAVE_SYSINFO && defined SI_ARCHITECTURE
24 {
25 static char processor[257];
26 if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
27 element = processor;
28 }
29+#else
30+ {
31+ static struct utsname u;
32+ uname(&u);
33+ element = u.machine;
34+ }
35 #endif
36 #ifdef UNAME_PROCESSOR
37 if (element == unknown)
38@@ -343,7 +349,7 @@ main (int argc, char **argv)
39
40 if (toprint & PRINT_HARDWARE_PLATFORM)
41 {
42- char const *element = unknown;
43+ char *element = unknown;
44 #if HAVE_SYSINFO && defined SI_PLATFORM
45 {
46 static char hardware_platform[257];
47@@ -361,6 +367,14 @@ main (int argc, char **argv)
48 if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
49 element = hardware_platform;
50 }
51+#else
52+ {
53+ static struct utsname u;
54+ uname(&u);
55+ element = u.machine;
56+ if(strlen(element)==4 && element[0]=='i' && element[2]=='8' && element[3]=='6')
57+ element[1]='3';
58+ }
59 #endif
60 if (! (toprint == UINT_MAX && element == unknown))
61 print_element (element);
62--
631.9.1
64
diff --git a/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch b/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch
deleted file mode 100644
index e68c213550..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.25/disable-ls-output-quoting.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Subject: revert inconsistent ls quoting
2
3This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc.
4
5Bug-Debian: https://bugs.debian.org/813164
6
7Upstream-Status: Submitted
8
9Originally-by: Adam Borowski <kilobyte@angband.pl>
10[PG: patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813164#78 ]
11Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
12
13---
14
15--- coreutils-8.25.orig/NEWS
16+++ coreutils-8.25/NEWS
17@@ -71,9 +71,6 @@ GNU coreutils NEWS
18 df now prefers sources towards the root of a device when
19 eliding duplicate bind mounted entries.
20
21- ls now quotes file names unambiguously and appropriate for use in a shell,
22- when outputting to a terminal.
23-
24 join, sort, uniq with --zero-terminated, now treat '\n' as a field delimiter.
25
26 ** Improvements
27--- coreutils-8.25.orig/doc/coreutils.texi
28+++ coreutils-8.25/doc/coreutils.texi
29@@ -7750,8 +7750,8 @@ this"} in the default C locale. This lo
30
31 You can specify the default value of the @option{--quoting-style} option
32 with the environment variable @env{QUOTING_STYLE}@. If that environment
33-variable is not set, the default value is @samp{shell-escape} when the
34-output is a terminal, and @samp{literal} otherwise.
35+variable is not set, the default value is @samp{literal}, but this
36+default may change to @samp{shell} in a future version of this package.
37
38 @item --show-control-chars
39 @opindex --show-control-chars
40--- coreutils-8.25.orig/src/ls.c
41+++ coreutils-8.25/src/ls.c
42@@ -1581,7 +1581,6 @@ decode_switches (int argc, char **argv)
43 if (isatty (STDOUT_FILENO))
44 {
45 format = many_per_line;
46- set_quoting_style (NULL, shell_escape_quoting_style);
47 /* See description of qmark_funny_chars, above. */
48 qmark_funny_chars = true;
49 }
diff --git a/meta/recipes-core/coreutils/coreutils-8.25/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.25/fix-selinux-flask.patch
deleted file mode 100644
index 9d1ae55d47..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.25/fix-selinux-flask.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 16 Sep 2014 01:59:08 -0700
4Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to
5 with_selinux
6
7Fixed when build with meta-selinux even when --without-selinux:
8runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory
9 # include <selinux/flask.h>
10 ^
11compilation terminated.
12
13Upstream-Status: Pending
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 m4/gnulib-comp.m4 | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
21index 472d3a0..5f09734 100644
22--- a/m4/gnulib-comp.m4
23+++ b/m4/gnulib-comp.m4
24@@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT],
25 AC_LIBOBJ([select])
26 fi
27 gl_SYS_SELECT_MODULE_INDICATOR([select])
28- AC_CHECK_HEADERS([selinux/flask.h])
29 AC_LIBOBJ([selinux-at])
30 gl_HEADERS_SELINUX_SELINUX_H
31 gl_HEADERS_SELINUX_CONTEXT_H
32 if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
33+ AC_CHECK_HEADERS([selinux/flask.h])
34 AC_LIBOBJ([getfilecon])
35 fi
36 gl_SERVENT
37--
381.7.9.5
39
diff --git a/meta/recipes-core/coreutils/coreutils-8.25/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils-8.25/man-decouple-manpages-from-build.patch
deleted file mode 100644
index 3c896a11bf..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.25/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.25/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.25/remove-usr-local-lib-from-m4.patch
deleted file mode 100644
index 2ef8a548ac..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.25/remove-usr-local-lib-from-m4.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1We have problem using hardcoded directories like /usr/local here
2which will be checked for cross builds. This is a special case which
3is valid for AIX only. We do not have AIX as one of our supported
4build host or target. Therefore we get rid of the hardcoded paths
5and make life easier for cross compilation process.
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
10
11Index: coreutils-8.14/m4/getloadavg.m4
12===================================================================
13--- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700
14+++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700
15@@ -41,16 +41,6 @@
16 [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes])
17 fi
18
19- if test $gl_func_getloadavg_done = no; then
20- # There is a commonly available library for RS/6000 AIX.
21- # Since it is not a standard part of AIX, it might be installed locally.
22- gl_getloadavg_LIBS=$LIBS
23- LIBS="-L/usr/local/lib $LIBS"
24- AC_CHECK_LIB([getloadavg], [getloadavg],
25- [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes],
26- [LIBS=$gl_getloadavg_LIBS])
27- fi
28-
29 # Set up the replacement function if necessary.
30 if test $gl_func_getloadavg_done = no; then
31 HAVE_GETLOADAVG=0