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

diff --git a/do_merge b/do_merge
index 4592d2f91f4155ec1282d5b8c8fbbe1ddfa0e56e..3a2e45d566933929b8546d052a9411e93a9a720b 100755 (executable)
--- 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 42b94c8422336cad80c6902f5678c619262d7e7f..d9b8072791a345eb440e0c3822592daf5429ca68 100755 (executable)
--- 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 d94490482be3313a0e6d39ff0d7e9b9e6fad6898..d0d8403933ff58f262201fef1b2ce2127af5ad7f 100755 (executable)
--- 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