diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-07-27 16:04:33 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 12:44:34 +0100 |
commit | 96f011e628fe360644bfdd7650145b996d61740c (patch) | |
tree | 31a6ade591bab0b7a4798631d9bf8cf0e15d828e /meta | |
parent | 74cab3a9071e1cea0d34082a0f8cbf8362426252 (diff) | |
download | poky-96f011e628fe360644bfdd7650145b996d61740c.tar.gz |
coreutils: upgrade 8.29 -> 8.30
License-Update: Checksum for src/ls.c is changed but the license remains
the same. The change is only about year change.
Remove 0001-Unset-need_charset_alias-when-building-for-musl.patch as the
target this patches modifies no long exists.
(From OE-Core rev: c3f67a19f9393540443bf14b2dbde151d5d01b3d)
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')
-rw-r--r-- | meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch | 33 | ||||
-rw-r--r-- | meta/recipes-core/coreutils/coreutils_8.30.bb (renamed from meta/recipes-core/coreutils/coreutils_8.29.bb) | 7 |
2 files changed, 3 insertions, 37 deletions
diff --git a/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch deleted file mode 100644 index ba1a4bab4c..0000000000 --- a/meta/recipes-core/coreutils/coreutils/0001-Unset-need_charset_alias-when-building-for-musl.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
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.29.bb b/meta/recipes-core/coreutils/coreutils_8.30.bb index 4704f32196..053891f6ea 100644 --- a/meta/recipes-core/coreutils/coreutils_8.29.bb +++ b/meta/recipes-core/coreutils/coreutils_8.30.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/" | |||
6 | BUGTRACKER = "http://debbugs.gnu.org/coreutils" | 6 | BUGTRACKER = "http://debbugs.gnu.org/coreutils" |
7 | LICENSE = "GPLv3+" | 7 | LICENSE = "GPLv3+" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ |
9 | file://src/ls.c;beginline=1;endline=15;md5=1c3f9411e1842a062ce5ce9210beee0e" | 9 | file://src/ls.c;beginline=1;endline=15;md5=dbe356a88b09c29232b083d1ff8ac82a" |
10 | DEPENDS = "gmp libcap" | 10 | DEPENDS = "gmp libcap" |
11 | DEPENDS_class-native = "" | 11 | DEPENDS_class-native = "" |
12 | 12 | ||
@@ -15,14 +15,13 @@ inherit autotools gettext texinfo | |||
15 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ | 15 | SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ |
16 | file://remove-usr-local-lib-from-m4.patch \ | 16 | file://remove-usr-local-lib-from-m4.patch \ |
17 | file://fix-selinux-flask.patch \ | 17 | file://fix-selinux-flask.patch \ |
18 | file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ | ||
19 | file://0001-uname-report-processor-and-hardware-correctly.patch \ | 18 | file://0001-uname-report-processor-and-hardware-correctly.patch \ |
20 | file://disable-ls-output-quoting.patch \ | 19 | file://disable-ls-output-quoting.patch \ |
21 | file://0001-local.mk-fix-cross-compiling-problem.patch \ | 20 | file://0001-local.mk-fix-cross-compiling-problem.patch \ |
22 | " | 21 | " |
23 | 22 | ||
24 | SRC_URI[md5sum] = "960cfe75a42c9907c71439f8eb436303" | 23 | SRC_URI[md5sum] = "ab06d68949758971fe744db66b572816" |
25 | SRC_URI[sha256sum] = "92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e" | 24 | SRC_URI[sha256sum] = "e831b3a86091496cdba720411f9748de81507798f6130adeaef872d206e1b057" |
26 | 25 | ||
27 | EXTRA_OECONF_class-native = "--without-gmp" | 26 | EXTRA_OECONF_class-native = "--without-gmp" |
28 | EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" | 27 | EXTRA_OECONF_class-target = "--enable-install-program=arch,hostname --libexecdir=${libdir}" |