diff options
| -rw-r--r-- | kernel.spec | 7 | ||||
| -rwxr-xr-x | scripts/rebase.sh | 10 | ||||
| -rw-r--r-- | sources | 1 |
3 files changed, 7 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec index 15f177bd0..bf652b319 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1941,6 +1941,11 @@ fi # and build. %changelog +* Thu Apr 28 2011 Kyle McMartin <kmcmartin@redhat.com> 2.6.39-0.rc5.git1.0 +- Update to snapshot 2.6.39-rc5-git1 +- Edit scripts/rebase.sh to not keep appending to .gitignore when the new + .bz2 files are covered by wildcards. + * Wed Apr 27 2011 Kyle McMartin <kmcmartin@redhat.com> - Linux 2.6.39-rc5 diff --git a/scripts/rebase.sh b/scripts/rebase.sh index 6b09fe9e9..e9b50cf40 100755 --- a/scripts/rebase.sh +++ b/scripts/rebase.sh @@ -124,12 +124,7 @@ 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 - perl -p -i -e 's/$ENV{OLDBASE}-rc$ENV{OLDRC}.bz2/$ENV{NEWBASE}-rc$ENV{NEWRC}.bz2/' .gitignore 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 .gitignore >.gitignore.tmp ; mv .gitignore.tmp .gitignore - if [ `grep -c patch-2.6.$NEWBASE-rc$NEWRC.bz2 sources` -eq 0 ]; then - echo patch-2.6.$NEWBASE-rc$NEWRC.bz2 >> .gitignore - fi rm -f patch-2.6.$OLDBASE-rc$OLDRC.bz2 curl -O $KORG26TESTING/patch-2.6.$NEWBASE-rc$NEWRC.bz2 @@ -151,12 +146,7 @@ if [ "$OLDGIT" != "$NEWGIT" ]; then fi perl -p -i -e 's/^%define\ gitrev.*/\%define\ gitrev\ $ENV{"NEWGIT"}/' kernel.spec if [ "$OLDGIT" -ne 0 ]; then - if [ "$NEWGIT" -ne 0 ]; then - perl -p -i -e 's/$ENV{OLD}/$ENV{NEW}/' .gitignore - fi grep -v patch-$OLD.bz2 sources > .sources.tmp; mv .sources.tmp sources - else - echo patch-$NEW.bz2 >> .gitignore fi if [ "$NEWGIT" -ne 0 ]; then @@ -1,2 +1,3 @@ 7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2 e5782b89d4135200b2962b1422c0ee18 patch-2.6.39-rc5.bz2 +0b99dc3c317a3d7e803a279df6315015 patch-2.6.39-rc5-git1.bz2 |