coreutils: upgrade from 9.6 to 9.7
PATCH 1/1 coreutils: upgrade from 9.6 to 9.7
From: Chen Qi <[email protected]>
The following patches are dropped as they are merged in new release:
- 0001-cksum-port-to-32-bit-uint_fast32_t.patch
- 0001-ls-fix-crash-with-context.patch
- intermittent-testfailure.patch
Signed-off-by Chen Qi <[email protected]>
---
...1-cksum-port-to-32-bit-uint_fast32_t.patch | 47 --------
.../0001-ls-fix-crash-with-context.patch | 101 ------------------
.../coreutils/intermittent-testfailure.patch | 30 ------
.../{coreutils_9.6.bb => coreutils_9.7.bb} | 5 +-
4 files changed, 1 insertion(+), 182 deletions(-)
delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch
delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch
delete mode 100644 meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch
rename meta/recipes-core/coreutils/{coreutils_9.6.bb => coreutils_9.7.bb} (97%)meta/recipes-core/coreutils/coreutils/0001-cksum-port-to-32-bit-uint_fast32_t.patch deleted +0 -47
@@ -1,47 +0,0 @@ -From 7eada35b4fbb48e7fe430d1b18dae7d191f84f8e Mon Sep 17 00:00:00 2001 -From: Paul Eggert <[email protected]> -Date: Mon, 17 Feb 2025 02:27:09 -0800 -Subject: [PATCH 2/2] cksum: port to 32-bit uint_fast32_t -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* src/cksum_vmull.c (cksum_vmull): Don’t assume -uint_fast32_t can hold 64 bits. -Problem reported by Alyssa Ross (Bug#76360). - -Upstream-Status: Backport [7eada35b4fbb48e7fe430d1b18dae7d191f84f8e] -Signed-off-by: Ross Burton <[email protected]> ---- - NEWS | 3 +++ - src/cksum_vmull.c | 7 +++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/cksum_vmull.c b/src/cksum_vmull.c -index 7611c4244..0ff81e225 100644 ---- a/src/cksum_vmull.c -+++ b/src/cksum_vmull.c -@@ -92,7 +92,9 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) - data = bswap_neon (data); - /* XOR in initial CRC value (for us 0 so no effect), or CRC value - calculated for previous BUFLEN buffer from fread */ -- xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); -+ -+ uint64_t wcrc = crc; -+ xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); - crc = 0; - data = veorq_u64 (data, xor_crc); - data3 = vld1q_u64 ((uint64_t *) (datap + 1)); -@@ -193,7 +195,8 @@ cksum_vmull (FILE *fp, uint_fast32_t *crc_out, uintmax_t *length_out) - { - data = vld1q_u64 ((uint64_t *) (datap)); - data = bswap_neon (data); -- xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (crc << 32)); -+ uint64_t wcrc = crc; -+ xor_crc = vcombine_u64 (vcreate_u64 (0), vcreate_u64 (wcrc << 32)); - crc = 0; - data = veorq_u64 (data, xor_crc); - while (bytes_read >= 32) --- -2.45.2 -
meta/recipes-core/coreutils/coreutils/0001-ls-fix-crash-with-context.patch deleted +0 -101
101 lines not on this page · raw message
meta/recipes-core/coreutils/coreutils/intermittent-testfailure.patch deleted +0 -30
@@ -1,30 +0,0 @@ -tests/df: Fix intermittent test failure - -The test writes to the disk and means the space used changes. If this -crosses a number boundary, the heading spacing can change: - --Filesystem 1024-blocks Used Available Capacity Mounted on -+Filesystem 1024-blocks Used Available Capacity Mounted on - -The test is to make sure the 1024 blocks element remains the same and -the spacing doesn't matter. Therefore strip any duplicate spaces using tr. - -Submitted: https://github.com/coreutils/coreutils/pull/88 -Upstream-Status: Backport [https://github.com/coreutils/coreutils/commit/c5725c8c4bb21903490a48035286d0f94463642e] -Signed-off-by: Richard Purdie <[email protected]> - -Index: coreutils-9.5/tests/df/df-P.sh -=================================================================== ---- coreutils-9.5.orig/tests/df/df-P.sh -+++ coreutils-9.5/tests/df/df-P.sh -@@ -20,8 +20,8 @@ - print_ver_ df - - -- df -P . > t1 || fail=1 --BLOCK_SIZE=1M df -P . > t2 || fail=1 -+ df -P . | tr -s ' ' > t1 || fail=1 -+BLOCK_SIZE=1M df -P . | tr -s ' ' > t2 || fail=1 - - # Since file system utilization may be changing, compare only df's header line. - # That records the block size. E.g., for "1M", it would be:
meta/recipes-core/coreutils/coreutils_9.7.bb renamed from meta/recipes-core/coreutils/coreutils_9.6.bb +1 -4
@@ -15,12 +15,9 @@ inherit autotools gettext texinfo SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ - file://intermittent-testfailure.patch \ - file://0001-ls-fix-crash-with-context.patch \ - file://0001-cksum-port-to-32-bit-uint_fast32_t.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283" +SRC_URI[sha256sum] = "e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf" # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 #
Signature · 1 line
2.34.1