@@ -1,4 +1,4 @@
-From 7cb2d20cfa2a27191255031d231cd41917dcffe8 Mon Sep 17 00:00:00 2001
+From e052faf6c64a5a90a69924d8db677b4fc84c6561 Mon Sep 17 00:00:00 2001
From: Chen Qi <Qi.Chen@windriver.com>
Date: Mon, 26 Dec 2016 16:10:35 +0800
Subject: [PATCH] local.mk: fix cross compiling problem
@@ -15,10 +15,10 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/local.mk b/src/local.mk
-index 96ee941..cdd47d6 100644
+index fd9dc81..ef6e968 100644
--- a/src/local.mk
+++ b/src/local.mk
-@@ -704,4 +704,4 @@ cu_install_program = @INSTALL@
+@@ -731,4 +731,4 @@ cu_install_program = @INSTALL@
else
cu_install_program = src/ginstall
endif
@@ -1,4 +1,7 @@
-tests/df: Fix intermittent test failure
+From 7231a399f770f514ca2756f67af145650502d454 Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard.purdie@linuxfoundation.org>
+Date: Thu, 8 Aug 2024 10:37:58 +0100
+Subject: [PATCH] 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:
@@ -12,11 +15,14 @@ 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 <richard.purdie@linuxfoundation.org>
+---
+ tests/df/df-P.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
-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
+diff --git a/tests/df/df-P.sh b/tests/df/df-P.sh
+index d35597f..30b3ef1 100755
+--- a/tests/df/df-P.sh
++++ b/tests/df/df-P.sh
@@ -20,8 +20,8 @@
print_ver_ df
@@ -1,4 +1,4 @@
-From f53ffb5b27ab7d4a4c62df00ebd6a1a6936d1709 Mon Sep 17 00:00:00 2001
+From 6c3c3e198861b3bcb3b54c98183c57b467a80b0c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 3 Aug 2011 14:12:30 -0700
Subject: [PATCH] coreutils: Fix build on uclibc
@@ -17,7 +17,7 @@ Upstream-Status: Inappropriate [Upstream does care for AIX while we may not]
1 file changed, 12 deletions(-)
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
-index 9d0236f..68f7c52 100644
+index 8ab613d..5af7571 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -46,18 +46,6 @@ if test $ac_cv_func_getloadavg != yes; then
similarity index 91%
rename from meta/recipes-core/coreutils/coreutils_9.5.bb
rename to meta/recipes-core/coreutils/coreutils_9.6.bb
@@ -1,3 +1,23 @@
+# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'.
+# The following is the difference between the old and the new license text.
+# Please update the LICENSE value if needed, and summarize the changes in
+# the commit message via 'License-Update:' tag.
+# (example: 'License-Update: copyright years updated.')
+#
+# The changes:
+#
+# --- src/ls.c
+# +++ src/ls.c
+# @@ -1,5 +1,5 @@
+# /* 'dir', 'vdir' and 'ls' directory listing programs for GNU.
+# - Copyright (C) 1985-2024 Free Software Foundation, Inc.
+# + Copyright (C) 1985-2025 Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+#
+#
+
SUMMARY = "The basic file, shell and text manipulation utilities"
DESCRIPTION = "The GNU Core Utilities provide the basic file, shell and text \
manipulation utilities. These are the core utilities which are expected to exist on \
@@ -6,7 +26,7 @@ HOMEPAGE = "http://www.gnu.org/software/coreutils/"
BUGTRACKER = "http://debbugs.gnu.org/coreutils"
LICENSE = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 \
- file://src/ls.c;beginline=1;endline=15;md5=9ac94aaed7fd46fd8df7147a9e3410cb \
+ file://src/ls.c;beginline=1;endline=15;md5=824c1997414aea9f344747bd81cf5a31 \
"
DEPENDS = "gmp libcap"
DEPENDS:class-native = ""
@@ -19,7 +39,7 @@ SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
file://intermittent-testfailure.patch \
file://run-ptest \
"
-SRC_URI[sha256sum] = "cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a"
+SRC_URI[sha256sum] = "7a0124327b398fd9eb1a6abde583389821422c744ffa10734b24f557610d3283"
# http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842
#
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *coreutils* to *9.6* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-coreutils-upgrade-9.5-9.6.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 553a18e358744c4bcbc36e0dea039a36c7ee6afe Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Sat, 1 Feb 2025 06:57:55 +0000 Subject: [PATCH] coreutils: upgrade 9.5 -> 9.6 --- ...local.mk-fix-cross-compiling-problem.patch | 6 ++--- .../coreutils/intermittent-testfailure.patch | 16 +++++++++---- .../remove-usr-local-lib-from-m4.patch | 4 ++-- .../{coreutils_9.5.bb => coreutils_9.6.bb} | 24 +++++++++++++++++-- 4 files changed, 38 insertions(+), 12 deletions(-) rename meta/recipes-core/coreutils/{coreutils_9.5.bb => coreutils_9.6.bb} (91%)