diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-19 11:44:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-19 11:44:57 +0200 |
commit | 1f8ecab8aa5d6120fd96aa4317e7771c467e08d0 (patch) | |
tree | cc401934122dead54a9930b45e8572e6b3e1edf4 | |
parent | 3bde486fc3174c8368d9c04ae4d54b0800abf8c7 (diff) | |
download | kernel-1f8ecab8aa5d6120fd96aa4317e7771c467e08d0.tar.gz kernel-1f8ecab8aa5d6120fd96aa4317e7771c467e08d0.tar.xz kernel-1f8ecab8aa5d6120fd96aa4317e7771c467e08d0.zip |
adjust scripts/stable-update.sh
-rwxr-xr-x | scripts/stable-update.sh | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index 259a338c1..201b6aadb 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -13,6 +13,11 @@ # # Args: Stable version to update (e.g. 4.7.7, 4.8.1) +# update orgin +vanilla-kernel-helper.sh masterupdate +currentbranch=$(git symbolic-ref --short HEAD) +git merge --no-edit origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1 + if [ $# -lt 1 ]; then echo "Need a version" exit 1 @@ -77,8 +82,13 @@ awk -v STABLE=$SUBLEVEL '/%define stable_update/ \ mv kernel.spec.tmp kernel.spec # Reset the base release for use with rpmdev-bumpspec -BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3 | head -c 1`00 -BASERELEASE=$(($BASERELEASE-1)) +BASERELEASE=`cat kernel.spec | grep "%global baserelease" | cut -d ' ' -f 3 | head -c 1`50 +#BASERELEASE=$(($BASERELEASE-1)) BASERELEASE=$BASERELEASE perl -p -i -e 's|%global baserelease.*|%global baserelease $ENV{'BASERELEASE'}|' kernel.spec -rpmdev-bumpspec -c "Linux v$1" kernel.spec +# do not generate changelog: avoids merge conflicts that are not worth the trouble +# rpmdev-bumpspec -c "Linux v$1" kernel.spec + +git diff kernel.spec sources +sleep 1 || exit 1 +git commit -m "Linux v$1" kernel.spec sources |