From 31c748bfc3b1764a26eabbbe99193f42d5f9fac8 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Aug 2024 18:07:19 +1000
Subject: [PATCH] track when I have to use an old version of a tree

and force it to be rebuilt until it works again

Idea from Mark Brown
---
 do_merge          | 6 +++++-
 from_build_host   | 1 +
 merge_old_version | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/do_merge b/do_merge
index 4592d2f..3a2e45d 100755
--- a/do_merge
+++ b/do_merge
@@ -177,7 +177,9 @@ for h in $heads; do
 	fi
 
 	if [ "$(get_build_flag "$tree")" != "yes" ]; then
-		continue
+		if ! [ -f "$top_dir/old-versions/$tree" ]; then
+			continue
+		fi
 	fi
 
 	repo="${build_host:+$build_host:}${build_dir}"
@@ -194,6 +196,8 @@ for h in $heads; do
 		exit 1
 	fi
 
+	rm -f "$top_dir/old-versions/$tree"
+
 	need_build=false
 done
 
diff --git a/from_build_host b/from_build_host
index 42b94c8..d9b8072 100755
--- a/from_build_host
+++ b/from_build_host
@@ -8,6 +8,7 @@ rsync -avHPSUXx --open-noatime --delete \
 	--include '/duplicates/***' \
 	--include '/fs-common/***' \
 	--include '/fs-next/***' \
+	--include '/old-versions/***' \
 	--include '/patches/***' \
 	--include '/next/***' \
 	--include /SHA1s \
diff --git a/merge_old_version b/merge_old_version
index d944904..d0d8403 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -108,4 +108,6 @@ if ! "$bin_dir/do_build" "$tree"; then
 	bash -i || exit
 fi
 
+printf '%s\n' "$ver" >"$top_dir/old-versions/$tree"
+
 exit 0
-- 
2.39.5