diff options
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils-8.27')
7 files changed, 269 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.27/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-core/coreutils/coreutils-8.27/0001-Unset-need_charset_alias-when-building-for-musl.patch new file mode 100644 index 0000000000..ba1a4bab4c --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.27/0001-Unset-need_charset_alias-when-building-for-musl.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 13 Apr 2015 17:02:13 -0700 | ||
4 | Subject: [PATCH] Unset need_charset_alias when building for musl | ||
5 | |||
6 | localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4 | ||
7 | which actually shoudl be fixed in gnulib and then all downstream | ||
8 | projects will get it eventually. For now we apply the fix to | ||
9 | coreutils | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | lib/gnulib.mk | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/lib/gnulib.mk b/lib/gnulib.mk | ||
19 | index 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 | -- | ||
32 | 2.1.4 | ||
33 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.27/0001-local.mk-fix-cross-compiling-problem.patch b/meta/recipes-core/coreutils/coreutils-8.27/0001-local.mk-fix-cross-compiling-problem.patch new file mode 100644 index 0000000000..66f9a716c9 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.27/0001-local.mk-fix-cross-compiling-problem.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | Subject: local.mk: fix cross compiling problem | ||
2 | |||
3 | We meet the following error when cross compiling. | ||
4 | | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. | ||
5 | This patch fixes this problem. | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
10 | --- | ||
11 | src/local.mk | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/src/local.mk b/src/local.mk | ||
15 | index 36dfa4e..c5898cc 100644 | ||
16 | --- a/src/local.mk | ||
17 | +++ b/src/local.mk | ||
18 | @@ -649,4 +649,4 @@ cu_install_program = @INSTALL_PROGRAM@ | ||
19 | else | ||
20 | cu_install_program = src/ginstall | ||
21 | endif | ||
22 | -INSTALL = $(cu_install_program) -c | ||
23 | +INSTALL_PROGRAM = $(cu_install_program) | ||
24 | -- | ||
25 | 2.1.0 | ||
26 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.27/0001-uname-report-processor-and-hardware-correctly.patch b/meta/recipes-core/coreutils/coreutils-8.27/0001-uname-report-processor-and-hardware-correctly.patch new file mode 100644 index 0000000000..3c43e1d5da --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.27/0001-uname-report-processor-and-hardware-correctly.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | Upstream-Status: Denied | ||
2 | |||
3 | Subject: uname: report processor and hardware correctly | ||
4 | |||
5 | This patch is rejected by coreutils upstream, but distros like debian and fedora | ||
6 | uses this patch to make `uname -i' and `uname -p' to not report 'unknown'. | ||
7 | |||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | ||
10 | src/uname.c | 18 ++++++++++++++++-- | ||
11 | 1 file changed, 16 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/uname.c b/src/uname.c | ||
14 | index 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 | -- | ||
63 | 1.9.1 | ||
64 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.27/disable-ls-output-quoting.patch b/meta/recipes-core/coreutils/coreutils-8.27/disable-ls-output-quoting.patch new file mode 100644 index 0000000000..e68c213550 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.27/disable-ls-output-quoting.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | Subject: revert inconsistent ls quoting | ||
2 | |||
3 | This is a revert of upstream commit 109b9220cead6e979d22d16327c4d9f8350431cc. | ||
4 | |||
5 | Bug-Debian: https://bugs.debian.org/813164 | ||
6 | |||
7 | Upstream-Status: Submitted | ||
8 | |||
9 | Originally-by: Adam Borowski <kilobyte@angband.pl> | ||
10 | [PG: patch from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813164#78 ] | ||
11 | Signed-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.27/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.27/fix-selinux-flask.patch new file mode 100644 index 0000000000..9d1ae55d47 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.27/fix-selinux-flask.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 16 Sep 2014 01:59:08 -0700 | ||
4 | Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to | ||
5 | with_selinux | ||
6 | |||
7 | Fixed when build with meta-selinux even when --without-selinux: | ||
8 | runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory | ||
9 | # include <selinux/flask.h> | ||
10 | ^ | ||
11 | compilation terminated. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
16 | --- | ||
17 | m4/gnulib-comp.m4 | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 | ||
21 | index 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 | -- | ||
38 | 1.7.9.5 | ||
39 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.27/man-decouple-manpages-from-build.patch b/meta/recipes-core/coreutils/coreutils-8.27/man-decouple-manpages-from-build.patch new file mode 100644 index 0000000000..3c896a11bf --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.27/man-decouple-manpages-from-build.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From b4d258629f090066783c3b4c91b40f63b9d0a296 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
3 | Date: Sun, 8 Feb 2015 16:51:57 -0500 | ||
4 | Subject: [PATCH] man: decouple manpages from build | ||
5 | |||
6 | The use of "help2man" doesn't work at all for cross compile, in | ||
7 | addition to the extra requirement of perl it adds. | ||
8 | |||
9 | Just decouple the manpages from the build in order to pave the way for | ||
10 | importing prebuilt manpages that can be used in a cross build situation. | ||
11 | |||
12 | Upstream-Status: Inappropriate [upstream doesn't care about x-compile case.] | ||
13 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
14 | |||
15 | diff --git a/Makefile.am b/Makefile.am | ||
16 | index 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 | -- | ||
26 | 2.2.2 | ||
27 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.27/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.27/remove-usr-local-lib-from-m4.patch new file mode 100644 index 0000000000..2ef8a548ac --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.27/remove-usr-local-lib-from-m4.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | We have problem using hardcoded directories like /usr/local here | ||
2 | which will be checked for cross builds. This is a special case which | ||
3 | is valid for AIX only. We do not have AIX as one of our supported | ||
4 | build host or target. Therefore we get rid of the hardcoded paths | ||
5 | and make life easier for cross compilation process. | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] | ||
10 | |||
11 | Index: 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 | ||