Make the git snapshot generator work for -git1 patches

Before it would just error out because it was only looking at the patch-
listings in the sources file.  So now we let it do that, and if the VER
variable is null after we just assume it's the first git snapshot of the
merge window and figure out the version from the linux- tarball.

Why I didn't fix this sooner, I have no idea.  Probably because it only
happens 4 times a year and laziness wins the day.
This commit is contained in:
Josh Boyer 2015-09-01 10:14:49 -04:00
parent 0ee200eaae
commit 3c964af1eb

View File

@ -6,6 +6,11 @@
VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz//) VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz//)
if [ -z "$VER" ] ;
then
VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz//)
fi
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))