diff options
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch (renamed from meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch | 31 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch (renamed from meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.22.bb (renamed from meta/recipes-core/coreutils/coreutils_8.21.bb) | 6 |
5 files changed, 34 insertions, 31 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch b/meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch deleted file mode 100644 index 8273d78eb3..0000000000 --- a/meta/recipes-core/coreutils/coreutils-8.21/coreutils-build-with-acl.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Fix the following issue so that coreutils can build with ACL: - -configure: WARNING: libacl development library was not found or not usable. -configure: WARNING: GNU coreutils will be built without ACL support. - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - m4/acl.m4 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/m4/acl.m4 b/m4/acl.m4 -index d6a448a..a9d4836 100644 ---- a/m4/acl.m4 -+++ b/m4/acl.m4 -@@ -159,7 +159,7 @@ AC_DEFUN([gl_ACL_GET_FILE], - ]])], - [gl_cv_func_working_acl_get_file=yes], - [gl_cv_func_working_acl_get_file=no], -- [gl_cv_func_working_acl_get_file=cross-compiling])]) -+ [gl_cv_func_working_acl_get_file=yes])]) - - AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2]) - ]) --- -1.7.7 - diff --git a/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch index 4757f52aa0..4757f52aa0 100644 --- a/meta/recipes-core/coreutils/coreutils-8.21/dummy_help2man.patch +++ b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch 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 new file mode 100644 index 0000000000..b7e82609bd --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch @@ -0,0 +1,31 @@ +Upstream-Status: Pending + +coreutils: fix for dummy-man usage + +The options should be before the final argument, otherwise, the following error +would appear when compiling. + +"dummy-man: too many non-option arguments" + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + man/local.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/local.mk b/man/local.mk +index 7cef5e3..dc0865f 100644 +--- a/man/local.mk ++++ b/man/local.mk +@@ -189,8 +189,8 @@ man/yes.1: src/yes + && $(run_help2man) \ + --source='$(PACKAGE_STRING)' \ + --include=$(srcdir)/man/$$name.x \ +- --output=$$t/$$name.1 $$t/$$name \ + --info-page='coreutils \(aq'$$name' invocation\(aq' \ ++ --output=$$t/$$name.1 $$t/$$name \ + && sed \ + -e 's|$*\.td/||g' \ + -e '/For complete documentation/d' \ +-- +1.7.9.5 + diff --git a/meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch index 2ef8a548ac..2ef8a548ac 100644 --- a/meta/recipes-core/coreutils/coreutils-8.21/remove-usr-local-lib-from-m4.patch +++ b/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch diff --git a/meta/recipes-core/coreutils/coreutils_8.21.bb b/meta/recipes-core/coreutils/coreutils_8.22.bb index abeaf1a44b..6b222b5ae0 100644 --- a/meta/recipes-core/coreutils/coreutils_8.21.bb +++ b/meta/recipes-core/coreutils/coreutils_8.22.bb @@ -14,12 +14,12 @@ inherit autotools gettext SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ - file://coreutils-build-with-acl.patch \ file://dummy_help2man.patch \ + file://fix-for-dummy-man-usage.patch \ " -SRC_URI[md5sum] = "065ba41828644eca5dd8163446de5d64" -SRC_URI[sha256sum] = "adaa44bdab3fa5eb352e80d8a31fdbf957b78653d0c2cd30d63e161444288e18" +SRC_URI[md5sum] = "8fb0ae2267aa6e728958adc38f8163a2" +SRC_URI[sha256sum] = "5b3e94998152c017e6c75d56b9b994188eb71bf46d4038a642cb9141f6ff1212" EXTRA_OECONF_class-native = "--without-gmp" EXTRA_OECONF_class-target = "--enable-install-program=arch" |