rpms/kernel-xen-2.6/devel/scripts get-snapshot.sh, NONE, 1.1 rebase.sh, 1.4, 1.5

Fri Jul 18 14:58:42 UTC 2008

Author: markmc

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

Modified Files:
	rebase.sh 
Added Files:
	get-snapshot.sh 
Log Message:
* Fri Jun 18 2008 Mark McLoughlin <markmc at redhat.com>
- Rebase to kernel-2_6_27-0_159_rc0_git6_fc10
- Drop Eduardo's 64bit tree and switch to Jeremy's x86.git tree
- Re-enable SMP etc.

--- NEW FILE get-snapshot.sh ---
#!/bin/bash

VER=$(tail -n1 upstream | sed s/bz2/id/)
rm -f $VER
wget -c http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/$VER
SHA1=$(cat $VER)
rm -f patch-2.6.*-git*.id

cd ~/src/git-trees/kernel/linux-2.6
git pull

DIF=$(git diff $SHA1.. | wc -l)
if [ "$DIF" = "0" ]; then
  echo Nothing changed.
  exit
fi

git diff $SHA1.. > ~/src/fedora/kernel/devel/git-linus-new.diff
cd ~/src/fedora/kernel/devel/
DIF=$(cmp git-linus.diff git-linus-new.diff)
if [ "$?" = "0" ]; then
  echo Nothing new in git
  rm -f git-linus-new.diff
  exit
fi
mv git-linus-new.diff git-linus.diff

perl -e 's|^#ApplyPatch\ git-linus.diff|ApplyPatch\ git-linus.diff|' kernel.spec

echo "- Merge Linux-2.6 up to" $(git log | head -n1) > ~/src/fedora/kernel/devel/clog.tmp
cd ~/src/fedora/kernel/devel/
bumpspecfile.py kernel.spec "$(cat clog.tmp)"
rm -f clog.tmp
make clog


Index: rebase.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/scripts/rebase.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rebase.sh	16 Jun 2008 10:19:46 -0000	1.4
+++ rebase.sh	18 Jul 2008 14:57:59 -0000	1.5
@@ -126,6 +126,7 @@
   perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .cvsignore
   perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' upstream
   grep -v patch-2.6.$OLDBASE-rc$OLDRC.bz2 sources > .sources.tmp; mv .sources.tmp sources
+  grep -v patch-2.6.$OLDBASE-rc$OLDRC-git$OLDGIT.bz2 .cvsignore >.cvsignore.tmp ; mv .cvsignore.tmp .cvsignore
   if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 upstream` -eq 0 ]; then
     echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .cvsignore
     echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> upstream


