diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-01 14:37:13 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-01 14:40:26 +0200 |
commit | f662de34ff0c7072424aaf34d57735b13d8dc373 (patch) | |
tree | d96da20f5be2c8e4fe7078b94d9454fc63c6a0b9 /scripts/stable-update.sh | |
parent | 73fe8f35076d6b7cd09442b8a212687de73692b0 (diff) | |
download | kernel-f662de34ff0c7072424aaf34d57735b13d8dc373.tar.gz kernel-f662de34ff0c7072424aaf34d57735b13d8dc373.tar.xz kernel-f662de34ff0c7072424aaf34d57735b13d8dc373.zip |
vanillafy
Diffstat (limited to 'scripts/stable-update.sh')
-rwxr-xr-x | scripts/stable-update.sh | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index 259a338c1..c919bf11d 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -1,5 +1,4 @@ #!/bin/sh -# # Author: Laura Abbott <labbott@fedoraproject.org> # # Apply a stable patch update to the Fedora tree. This takes care of @@ -13,6 +12,11 @@ # # Args: Stable version to update (e.g. 4.7.7, 4.8.1) +# update orgin +~/usr/bin/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 @@ -61,12 +65,15 @@ fi grep $1 sources &> /dev/null if [ ! $? -eq 0 ]; then - fedpkg upload patch-$1.xz + # thl is not an allowed uploader, skip this + # fedpkg upload patch-$1.xz + checksum=$(sha512sum patch-$1.xz) + echo "SHA512 (patch-$1.xz) = ${checksum:0:128}" >> sources # Cryptic awk: search for the previous patch level (if one exists) and # remove it from the source file awk -v VER=$VERSION.$PATCHLEVEL.$((SUBLEVEL-1)) '$0 !~ VER { print $0; }' < sources > sources.tmp - mv sources.tmp sources + mv sources.tmp sources fi # Update the stable level @@ -77,8 +84,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 |