diff options
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils')
6 files changed, 9 insertions, 258 deletions
diff --git a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch b/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch index 66f9a716c9..97a6357ab9 100644 --- a/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch +++ b/meta/recipes-core/coreutils/coreutils/0001-local.mk-fix-cross-compiling-problem.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Subject: local.mk: fix cross compiling problem | 1 | From 7cb2d20cfa2a27191255031d231cd41917dcffe8 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 26 Dec 2016 16:10:35 +0800 | ||
4 | Subject: [PATCH] local.mk: fix cross compiling problem | ||
2 | 5 | ||
3 | We meet the following error when cross compiling. | 6 | We meet the following error when cross compiling. |
4 | | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. | 7 | | Makefile:3418: *** Recursive variable 'INSTALL' references itself (eventually). Stop. |
@@ -12,15 +15,12 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
13 | 16 | ||
14 | diff --git a/src/local.mk b/src/local.mk | 17 | diff --git a/src/local.mk b/src/local.mk |
15 | index 36dfa4e..c5898cc 100644 | 18 | index 96ee941..cdd47d6 100644 |
16 | --- a/src/local.mk | 19 | --- a/src/local.mk |
17 | +++ b/src/local.mk | 20 | +++ b/src/local.mk |
18 | @@ -649,4 +649,4 @@ cu_install_program = @INSTALL_PROGRAM@ | 21 | @@ -704,4 +704,4 @@ cu_install_program = @INSTALL@ |
19 | else | 22 | else |
20 | cu_install_program = src/ginstall | 23 | cu_install_program = src/ginstall |
21 | endif | 24 | endif |
22 | -INSTALL = $(cu_install_program) -c | 25 | -INSTALL = $(cu_install_program) -c |
23 | +INSTALL_PROGRAM = $(cu_install_program) | 26 | +INSTALL_PROGRAM = $(cu_install_program) |
24 | -- | ||
25 | 2.1.0 | ||
26 | |||
diff --git a/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch deleted file mode 100644 index fa900e3a76..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-ls-restore-8.31-behavior-on-removed-directories.patch +++ /dev/null | |||
@@ -1,99 +0,0 @@ | |||
1 | From 7c273e5c6041f8c70f73f5b280fbb8f27d9b5a36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Eggert <eggert@cs.ucla.edu> | ||
3 | Date: Thu, 5 Mar 2020 17:25:29 -0800 | ||
4 | Subject: [PATCH] ls: restore 8.31 behavior on removed directories | ||
5 | |||
6 | * NEWS: Mention this. | ||
7 | * src/ls.c: Do not include <sys/sycall.h> | ||
8 | (print_dir): Don't worry about whether the directory is removed. | ||
9 | * tests/ls/removed-directory.sh: Adjust to match new (i.e., old) | ||
10 | behavior. | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/10fcb97bd728f09d4a027eddf8ad2900f0819b0a] | ||
13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
14 | --- | ||
15 | src/ls.c | 22 ---------------------- | ||
16 | tests/ls/removed-directory.sh | 10 ++-------- | ||
17 | 2 files changed, 2 insertions(+), 30 deletions(-) | ||
18 | |||
19 | diff --git a/src/ls.c b/src/ls.c | ||
20 | index 637fe7a..0111f49 100644 | ||
21 | --- a/src/ls.c | ||
22 | +++ b/src/ls.c | ||
23 | @@ -49,10 +49,6 @@ | ||
24 | # include <sys/ptem.h> | ||
25 | #endif | ||
26 | |||
27 | -#ifdef __linux__ | ||
28 | -# include <sys/syscall.h> | ||
29 | -#endif | ||
30 | - | ||
31 | #include <stdio.h> | ||
32 | #include <assert.h> | ||
33 | #include <setjmp.h> | ||
34 | @@ -2895,7 +2891,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) | ||
35 | struct dirent *next; | ||
36 | uintmax_t total_blocks = 0; | ||
37 | static bool first = true; | ||
38 | - bool found_any_entries = false; | ||
39 | |||
40 | errno = 0; | ||
41 | dirp = opendir (name); | ||
42 | @@ -2971,7 +2966,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) | ||
43 | next = readdir (dirp); | ||
44 | if (next) | ||
45 | { | ||
46 | - found_any_entries = true; | ||
47 | if (! file_ignored (next->d_name)) | ||
48 | { | ||
49 | enum filetype type = unknown; | ||
50 | @@ -3017,22 +3011,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) | ||
51 | if (errno != EOVERFLOW) | ||
52 | break; | ||
53 | } | ||
54 | -#ifdef __linux__ | ||
55 | - else if (! found_any_entries) | ||
56 | - { | ||
57 | - /* If readdir finds no directory entries at all, not even "." or | ||
58 | - "..", then double check that the directory exists. */ | ||
59 | - if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1 | ||
60 | - && errno != EINVAL) | ||
61 | - { | ||
62 | - /* We exclude EINVAL as that pertains to buffer handling, | ||
63 | - and we've passed NULL as the buffer for simplicity. | ||
64 | - ENOENT is returned if appropriate before buffer handling. */ | ||
65 | - file_failure (command_line_arg, _("reading directory %s"), name); | ||
66 | - } | ||
67 | - break; | ||
68 | - } | ||
69 | -#endif | ||
70 | else | ||
71 | break; | ||
72 | |||
73 | diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh | ||
74 | index e8c835d..fe8f929 100755 | ||
75 | --- a/tests/ls/removed-directory.sh | ||
76 | +++ b/tests/ls/removed-directory.sh | ||
77 | @@ -26,20 +26,14 @@ case $host_triplet in | ||
78 | *) skip_ 'non linux kernel' ;; | ||
79 | esac | ||
80 | |||
81 | -LS_FAILURE=2 | ||
82 | - | ||
83 | -cat <<\EOF >exp-err || framework_failure_ | ||
84 | -ls: reading directory '.': No such file or directory | ||
85 | -EOF | ||
86 | - | ||
87 | cwd=$(pwd) | ||
88 | mkdir d || framework_failure_ | ||
89 | cd d || framework_failure_ | ||
90 | rmdir ../d || framework_failure_ | ||
91 | |||
92 | -returns_ $LS_FAILURE ls >../out 2>../err || fail=1 | ||
93 | +ls >../out 2>../err || fail=1 | ||
94 | cd "$cwd" || framework_failure_ | ||
95 | compare /dev/null out || fail=1 | ||
96 | -compare exp-err err || fail=1 | ||
97 | +compare /dev/null err || fail=1 | ||
98 | |||
99 | Exit $fail | ||
diff --git a/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch b/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch deleted file mode 100644 index 3c43e1d5da..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-uname-report-processor-and-hardware-correctly.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
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/disable-ls-output-quoting.patch b/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch deleted file mode 100644 index e68c213550..0000000000 --- a/meta/recipes-core/coreutils/coreutils/disable-ls-output-quoting.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
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/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch deleted file mode 100644 index 173a57925b..0000000000 --- a/meta/recipes-core/coreutils/coreutils/fix-selinux-flask.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From 7e20a7242ba2657f73311bbf5278093da67f0721 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 | --- | ||
18 | m4/gnulib-comp.m4 | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 | ||
22 | index dead90e..0abf0bd 100644 | ||
23 | --- a/m4/gnulib-comp.m4 | ||
24 | +++ b/m4/gnulib-comp.m4 | ||
25 | @@ -1860,10 +1860,10 @@ AC_DEFUN([gl_INIT], | ||
26 | AC_LIBOBJ([select]) | ||
27 | fi | ||
28 | gl_SYS_SELECT_MODULE_INDICATOR([select]) | ||
29 | - AC_CHECK_HEADERS([selinux/flask.h]) | ||
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 | ||
diff --git a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch index 1a8a9b9983..718de0ab78 100644 --- a/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-core/coreutils/coreutils/remove-usr-local-lib-from-m4.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a26530083a29eeee910bfd606ecc621acecd547a Mon Sep 17 00:00:00 2001 | 1 | From f53ffb5b27ab7d4a4c62df00ebd6a1a6936d1709 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 3 Aug 2011 14:12:30 -0700 | 3 | Date: Wed, 3 Aug 2011 14:12:30 -0700 |
4 | Subject: [PATCH] coreutils: Fix build on uclibc | 4 | Subject: [PATCH] coreutils: Fix build on uclibc |
@@ -12,16 +12,15 @@ and make life easier for cross compilation process. | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | 13 | ||
14 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] | 14 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] |
15 | |||
16 | --- | 15 | --- |
17 | m4/getloadavg.m4 | 12 ------------ | 16 | m4/getloadavg.m4 | 12 ------------ |
18 | 1 file changed, 12 deletions(-) | 17 | 1 file changed, 12 deletions(-) |
19 | 18 | ||
20 | diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 | 19 | diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 |
21 | index 8e96965..63782a2 100644 | 20 | index 9d0236f..68f7c52 100644 |
22 | --- a/m4/getloadavg.m4 | 21 | --- a/m4/getloadavg.m4 |
23 | +++ b/m4/getloadavg.m4 | 22 | +++ b/m4/getloadavg.m4 |
24 | @@ -41,18 +41,6 @@ AC_CHECK_FUNC([getloadavg], [], | 23 | @@ -46,18 +46,6 @@ if test $ac_cv_func_getloadavg != yes; then |
25 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) | 24 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) |
26 | fi | 25 | fi |
27 | 26 | ||