summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/coreutils/coreutils-8.22
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-01-04 13:40:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:08:20 +0000
commitce9cb7ae7a37d211fde7c41e42f36a649f9cd50a (patch)
tree2853b6eb96df9e0a702bb7548d948ee80650dfb2 /meta/recipes-core/coreutils/coreutils-8.22
parentce5cc411bb29f41e2f001118313d19b6c48d8436 (diff)
downloadpoky-ce9cb7ae7a37d211fde7c41e42f36a649f9cd50a.tar.gz
coreutils: upgrade to 8.23
fix-for-dummy-man-usage.patch is rebased. (From OE-Core rev: 4fb3752824ff20e5b5b322e6e12211c81795313c) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils-8.22')
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch22
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch31
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch39
-rw-r--r--meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch31
4 files changed, 0 insertions, 123 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
deleted file mode 100644
index 4757f52aa0..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk
5--- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200
6+++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200
7@@ -19,11 +19,11 @@
8 EXTRA_DIST += man/help2man man/dummy-man
9
10 ## Graceful degradation for systems lacking perl.
11-if HAVE_PERL
12-run_help2man = $(PERL) -- $(srcdir)/man/help2man
13-else
14+#if HAVE_PERL
15+#run_help2man = $(PERL) -- $(srcdir)/man/help2man
16+#else
17 run_help2man = $(SHELL) $(srcdir)/man/dummy-man
18-endif
19+#endif
20
21 man1_MANS = @man1_MANS@
22 EXTRA_DIST += $(man1_MANS:.1=.x)
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch
deleted file mode 100644
index b7e82609bd..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Pending
2
3coreutils: fix for dummy-man usage
4
5The options should be before the final argument, otherwise, the following error
6would appear when compiling.
7
8"dummy-man: too many non-option arguments"
9
10Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
11---
12 man/local.mk | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/man/local.mk b/man/local.mk
16index 7cef5e3..dc0865f 100644
17--- a/man/local.mk
18+++ b/man/local.mk
19@@ -189,8 +189,8 @@ man/yes.1: src/yes
20 && $(run_help2man) \
21 --source='$(PACKAGE_STRING)' \
22 --include=$(srcdir)/man/$$name.x \
23- --output=$$t/$$name.1 $$t/$$name \
24 --info-page='coreutils \(aq'$$name' invocation\(aq' \
25+ --output=$$t/$$name.1 $$t/$$name \
26 && sed \
27 -e 's|$*\.td/||g' \
28 -e '/For complete documentation/d' \
29--
301.7.9.5
31
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch
deleted file mode 100644
index 9d1ae55d47..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.22/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.22/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch
deleted file mode 100644
index 2ef8a548ac..0000000000
--- a/meta/recipes-core/coreutils/coreutils-8.22/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