From 60d33946761a9867dd10d39a666461722f32bf72 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 24 Jan 2025 09:56:52 +0100 Subject: [PATCH 1/3] build-gnu.sh: improve the support if the stack has been already applied --- util/build-gnu.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index fda57ec78..5cd12fa2d 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -97,7 +97,14 @@ fi # Set up quilt for patch management export QUILT_PATCHES="${ME_dir}/gnu-patches/" cd "$path_GNU" -quilt push -a + +# Check if all patches are already applied +if [ "$(quilt applied | wc -l)" -eq "$(quilt series | wc -l)" ]; then + echo "All patches are already applied" +else + # Push all patches + quilt push -a || { echo "Failed to apply patches"; exit 1; } +fi cd - "${MAKE}" PROFILE="${UU_MAKE_PROFILE}" From 1f3abd523379627136fd3dba855c49740a7f57ce Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 24 Jan 2025 09:59:40 +0100 Subject: [PATCH 2/3] build-gnu.sh: also ignore t37 from factor Closes: #7179 --- util/build-gnu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index 5cd12fa2d..e2089e560 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -150,7 +150,7 @@ else # Handle generated factor tests t_first=00 - t_max=36 + t_max=37 # t_max_release=20 # if test "${UU_MAKE_PROFILE}" != "debug"; then # # Generate the factor tests, so they can be fixed From 79a94d93098f47927e99c71678d4d7c910164974 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 24 Jan 2025 09:59:53 +0100 Subject: [PATCH 3/3] build-gnu.sh: remove old comments --- util/build-gnu.sh | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/util/build-gnu.sh b/util/build-gnu.sh index e2089e560..2f904427a 100755 --- a/util/build-gnu.sh +++ b/util/build-gnu.sh @@ -151,26 +151,6 @@ else # Handle generated factor tests t_first=00 t_max=37 - # t_max_release=20 - # if test "${UU_MAKE_PROFILE}" != "debug"; then - # # Generate the factor tests, so they can be fixed - # # * reduced to 20 to decrease log size (down from 36 expected by GNU) - # # * only for 'release', skipped for 'debug' as redundant and too time consuming (causing timeout errors) - # seq=$( - # i=${t_first} - # while test "${i}" -le "${t_max_release}"; do - # printf '%02d ' $i - # i=$((i + 1)) - # done - # ) - # for i in ${seq}; do - # "${MAKE}" "tests/factor/t${i}.sh" - # done - # cat - # sed -i -e 's|^seq |/usr/bin/seq |' -e 's|sha1sum |/usr/bin/sha1sum |' tests/factor/t*.sh - # t_first=$((t_max_release + 1)) - # fi - # strip all (debug) or just the longer (release) factor tests from Makefile seq=$( i=${t_first} while test "${i}" -le "${t_max}"; do