rpms/kernel/devel/scripts get-snapshot.sh, 1.7, 1.8 rebase.sh, 1.21, 1.22

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	get-snapshot.sh rebase.sh 
Log Message:
2.6.27-rc1


Index: get-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/get-snapshot.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- get-snapshot.sh	22 Jul 2008 00:29:35 -0000	1.7
+++ get-snapshot.sh	29 Jul 2008 04:16:47 -0000	1.8
@@ -26,7 +26,7 @@
 fi
 mv git-linus-new.diff git-linus.diff
 
-perl -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec
+perl -p -i -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec
 
 echo "- Merge Linux-2.6 up to" $TOT > ~/src/fedora/kernel/devel/clog.tmp
 cd ~/src/fedora/kernel/devel/


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/scripts/rebase.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rebase.sh	21 Jun 2008 02:06:46 -0000	1.21
+++ rebase.sh	29 Jul 2008 04:16:47 -0000	1.22
@@ -2,7 +2,7 @@
 
 if [ ! -f /usr/bin/lynx ]; then
   echo yum install lynx
-  exit 1
+  exit 0
 fi
 
 # Current kernel bits
@@ -177,6 +177,8 @@
 fi
 
 if [ "$OLDRC" != "$NEWRC" -o "$OLDGIT" != "$NEWGIT" ]; then
+  perl -p -i -e 's|^ApplyPatch\ git-linus.diff|#ApplyPatch\ git-linus.diff|' kernel.spec
+  > git-linus.diff
   bumpspecfile.py kernel.spec "- $NEW"
   make clog
   exit 1