diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2012-07-31 12:16:26 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2012-07-31 16:18:04 -0400 |
| commit | 79b876cd70369849dfb59f1cb11dee32a3ea303a (patch) | |
| tree | 144b5e42f9b8d50e468a9ae2fc05c8797154cdab /scripts/generate-git-snapshot.sh | |
| parent | 629ee7b23505420ffa4d11abde7bb51e2536bb5e (diff) | |
| download | kernel-79b876cd70369849dfb59f1cb11dee32a3ea303a.tar.gz kernel-79b876cd70369849dfb59f1cb11dee32a3ea303a.tar.xz kernel-79b876cd70369849dfb59f1cb11dee32a3ea303a.zip | |
Make generate-git-snapshot.sh work for merge window trees
Use sed to drop anything ending in -git.*. That allows us to grab the version
information for the main tree while -rc* will still work later.
Diffstat (limited to 'scripts/generate-git-snapshot.sh')
| -rwxr-xr-x | scripts/generate-git-snapshot.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh index 618d80c08..239b846c9 100755 --- a/scripts/generate-git-snapshot.sh +++ b/scripts/generate-git-snapshot.sh @@ -2,7 +2,7 @@ # # Set LINUX_GIT to point to an upstream Linux git tree in your .bashrc or wherever. -VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/.xz//) +VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz//) OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //) export NEWGIT=$(($OLDGIT+1)) |