rpms/kernel/devel/scripts rebase.sh,1.8,1.9

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel/scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5687/scripts

Modified Files:
	rebase.sh 
Log Message:
Fix up rebasing from 2.6.n-rc-git to the next stable release.




Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rebase.sh	28 Aug 2007 19:13:51 -0000	1.8
+++ rebase.sh	9 Oct 2007 23:25:07 -0000	1.9
@@ -28,11 +28,22 @@
 if [ -z "$NEW" ] ; then
   NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "prepatch for the stable"`
   if [ -z "$NEW" ] ; then
-    echo "No new rc or git snapshot of stable branch".
-    exit
+    if [ "$OLDRC" -ne 0 ] ; then
+      NEW=`lynx -dump http://www.kernel.org/kdist/finger_banner | grep "stable version of the Linux kernel is"`
+    else
+      echo "No new rc or git snapshot of stable branch".
+      exit
+    fi
   fi
 fi
-export NEW=`echo $NEW | awk '{ print $11 }'`
+export N=`echo $NEW | awk '{ print $11 }'`
+if [ -z "$N" ]; then
+  # "Stable version"
+  export NEW=`echo $NEW | awk '{ print $10 }'`
+else
+  $NEW=$N
+fi
+
 export NEWBASE=`echo $NEW | sed s/-/\ /g | sed s/2\.6\.// | awk '{ print $1 }'`
 if [ `echo $NEW | grep -c rc` -ge 1 ]; then
   export NEWRC=`echo $NEW | sed s/-/\ /g | sed s/rc// | awk '{ print $2 }'`
@@ -61,6 +72,49 @@
   perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
 fi
 
+if [ "$NEWRC" -eq 0 ]; then
+  echo "Rebasing from -rc to final release."
+  perl -p -i -e 's/^%define\ released_kernel\ 0/\%define\ released_kernel\ 1/' kernel.spec
+  export TARBALL_BASE=$(($OLDBASE-1))
+  perl -p -i -e 's/^%define\ base_sublevel\ $ENV{TARBALL_BASE}/%define\ base_sublevel\ $ENV{NEWBASE}/' kernel.spec
+  perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ 0/' kernel.spec
+  perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ 0/' kernel.spec
+
+  grep -v kernel-2.6.$TARBALL_BASE .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
+  echo kernel-2.6.$NEWBASE >> .cvsignore
+
+  for i in upstream sources .cvsignore
+  do
+   echo linux-2.6.$TARBALL_BASE.tar.bz2 >> $i
+
+   grep -v linux-2.6.$(($OLDBASE-1)).tar.bz2 $i > .$i.tmp; mv .$i.tmp $i
+   grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 $i > .$i.tmp; mv .$i.tmp $i
+   grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 $i > .$i.tmp; mv .$i.tmp $i
+  done
+
+  rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2
+  rm -f linux-2.6.$(($OLDBASE-1)).tar.bz2.sign
+  rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2
+  rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
+  rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2
+  rm -f patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign
+
+  cvs remove linux-2.6.$(($OLDBASE-1)).tar.bz2.sign
+  cvs remove patch-2.6.$OLDBASE-rc$OLDRC.bz2.sign
+  cvs remove patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2.sign
+
+  make download
+  make upload FILES=linux-$NEW.tar.bz2
+
+  cvs add linux-$NEW.tar.bz2.sign
+
+  bumpspecfile.py kernel.spec "- $NEW"
+  make clog
+  echo FIXME! Fix up fedora_cvs_origin
+  make verrel
+  exit
+fi
+
 if [ "$OLDRC" != "$NEWRC" ]; then
   echo "Different rc. Rebasing from $OLDRC to $NEWRC"
   perl -p -i -e 's/^%define\ rcrev.*/\%define\ rcrev\ $ENV{"NEWRC"}/' kernel.spec