remove the use of refs/next

[next-scripts] / make_tree_file

diff --git a/make_tree_file b/make_tree_file
index 1b99f205cb43474bbab1d5954dc2d08e0c9ea386..d1e7890c8b16dfb70b1d0af4483e85f98f4614e9 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -7,6 +7,14 @@ h=$(date '+%H')
        exit 1
 }
 
+eval $(ssh-agent -s)
+ssh-add ~/.ssh/ra.kernel.org
+
+# This means I get the right tag if I finish after midnight
+d=$(date --date "5 hours ago" '+%Y%m%d')
+l="$(git describe --match "v*" --abbrev=0)"
+n="next-$d"
+
 mkdir Next
 
 echo 'Trees included into this release:
@@ -15,53 +23,50 @@ Name                Type    URL
 ----           ----    ---' > Next/Trees
 
 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"
+       [ "${ref%:*}" = "${ref}" ] || ref=${ref##*:}
        [ "$type" = "git" ] && url="$url#$ref"
        printf "%s$tab%s\t%s\n" $name $type $url
 done <../real_control >>Next/Trees
 
-cp ../quilt-import.log ../merge.log Next/.
+mv ../SHA1s Next/SHA1s
 
-# 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 "%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"
-git tag "next-$d"
-git update-ref refs/heads/stable refs/remotes/origin/master
-
-# Stitch the new tree into the history branch
-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"
-class x8664 cpu_type="Intel(R) Xeon(TM) CPU 2.40GHz"
-+\$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
+git tag -u 41D5C07A -m "$n" "$n"
+
+git branch -f stable refs/remotes/origin/master
+
+p="patch-$l-$n"
+git diff-tree -p "$l.." >"../$p"
+gpg2 -u 41D5C07A -a -b "../$p"
+#echo "$l" > "../LATEST-IS-$n"
+
+$(dirname $0)/make_abat_scripts "$d" "$l"
+
+echo Pushing to korg ...
+git push korg
+
+echo Pushing to korg-history ...
+git push korg-history
+
+echo Pushing to history
+git push history
+
+echo Pushing patch to kernel.org ...
+cd ..
+xz -v -9 "$p"
+kup --host=geb.kernel.org put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
+
+ssh-agent -k
 
 exit 0