separate out creation of ABAT scripts

cope with using old version of some trees
clean the logs while importing them

diff --git a/make_tree_file b/make_tree_file
index d3da8a67e8cf95a78b6cfa534ae0822405d93735..030a26a9b3b34f8c37476aa0e9c8d946692e681c 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -7,6 +7,9 @@ h=$(date '+%H')
        exit 1
 }
 
+# This means I get the right tag if I finish after midnight
+d=$(date --date "5 hours ago" '+%Y%m%d')
+
 mkdir Next
 
 echo 'Trees included into this release:
@@ -26,13 +29,12 @@ while read email type name url ref build; do
        printf "%s$tab%s\t%s\n" $name $type $url
        href="$name/$ref"
        [ "$type" = "quilt" ] && href="quilt/$name"
-       printf "%s$tab%s\n" $name $(git rev-parse --verify $href) >> Next/SHA1s
+       printf "%s$tab%s\n" $name $(git rev-parse --verify "next-$d/$name") >> Next/SHA1s
 done <../real_control >>Next/Trees
 
-cp ../quilt-import.log ../merge.log Next/.
-
-# This means I get the right tag if I finish after midnight
-d=$(date --date "5 hours ago" '+%Y%m%d')
+for i in quilt-import.log merge.log; do
+       grep -v '^Checking out files:' ../$i >Next/$i
+done
 
 printf -- "-next-%s\n" $d >localversion-next
 
@@ -45,14 +47,6 @@ git update-ref refs/heads/stable refs/remotes/origin/master
 new_ref=$(echo "next-$d" | git commit-tree 'HEAD^{tree}' -p history -p HEAD)
 git update-ref -m "next-$d" refs/heads/history $new_ref
 
-cat >../abat-script-$d <<EOF
-option title linux-next $d boot test
-class power5 type="IBM,9124-720 eServer OpenPower 720"
-class power5plus type="IBM,9110-51A System p5 510"
-+\$kernel "HEAD^"
-+\$config http://ozlabs.au.ibm.com/~tony/abat/configs/no_CONFIG_LOCALVERSION_AUTO.config
-build generic git  git://fs.ozlabs.ibm.com/home/kernel/linux-next.git \$kernel -c \$config -m -j\$num_cpus
-boot initcall_debug
-EOF
+../tools/make_abat_scripts "$d"
 
 exit 0