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.
This commit is contained in:
parent
629ee7b235
commit
79b876cd70
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Set LINUX_GIT to point to an upstream Linux git tree in your .bashrc or wherever.
|
# 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\ //)
|
OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //)
|
||||||
export NEWGIT=$(($OLDGIT+1))
|
export NEWGIT=$(($OLDGIT+1))
|
||||||
|
Loading…
Reference in New Issue
Block a user