Update because I moved the next refs

[next-scripts] / make_tree_file

diff --git a/make_tree_file b/make_tree_file
index 48cb0f39bb745c61adb33bf5f9728c4dbc28695d..fed4fd8b1746f1351dd333a23c0e31dcd59025a6 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:
@@ -18,7 +21,7 @@ echo 'Name            SHA1
 ----           ----' > Next/SHA1s
 
 IFS='  '
-while read email type name url ref; do
+while read email type name url ref build; do
        [[ "$email" =~ '^#.*$' ]] && continue
        tab="\t"
        [ $(echo "$name" | wc -c) -le 8 ] && tab="\t\t"
@@ -26,15 +29,14 @@ while read email type name url ref; 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 show-ref --verify --hash "refs/next/$d/$name") >> Next/SHA1s
 done <../real_control >>Next/Trees
 
-cp ../quilt-import.log ../merge.log Next/.
+for i in quilt-import.log merge.log; do
+       grep -v '^Checking out files:' ../$i >Next/$i
+done
 
-# This means I get the right tag if I finish after midnight
-d=$(date --date "5 hours ago" '+%Y%m%d')
-
-printf "%s-next-%s\n" "" $d >localversion-next
+printf -- "-next-%s\n" $d >localversion-next
 
 git add Next localversion-next
 git commit -s -v -a -m "Add linux-next specific files for $d"
@@ -45,28 +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
 
-# Create a patch to remove the localversion-next file
-cat >../nolocalversion-$d.patch <<EOF
-diff --git a/localversion-next b/localversion-next
-deleted file mode 100644
-index d795256..0000000
---- a/localversion-next
-+++ /dev/null
-@@ -1 +0,0 @@
---next-$d
-EOF
-
-l=$(git describe --match "v*" --abbrev=0)
-l=${l#v}
-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 "$l"
-+\$patch1 "http://www.kernel.org/pub/linux/kernel/people/sfr/linux-next/patch-v$l-next-$d.bz2"
-+\$patch2 "http://fs.ozlabs.ibm.com/~sfr/nolocalversion-$d.patch"
-build generic stock  \$kernel -p \$patch1 -p \$patch2 -m -j\$num_cpus
-boot initcall_debug
-EOF
+../tools/make_abat_scripts "$d"
 
 exit 0