diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-23 07:44:14 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-23 07:45:38 +0200 |
| commit | 8a6160988475e0f2ef6d51c7ed33563abe63b143 (patch) | |
| tree | 8558eb2883688092ad7879e4000b2cd1f41a253e /scripts | |
| parent | 91eb2fb2d852aff9aec20cdcb4921aefbe9bc868 (diff) | |
| parent | 10868cd2f96f545744848175bad5bf88dda139a8 (diff) | |
| download | kernel-8a6160988475e0f2ef6d51c7ed33563abe63b143.tar.gz kernel-8a6160988475e0f2ef6d51c7ed33563abe63b143.tar.xz kernel-8a6160988475e0f2ef6d51c7ed33563abe63b143.zip | |
merge originkernel-5.1.4-351.vanilla.knurd.1.fc30
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rawhide-rc.sh | 12 | ||||
| -rwxr-xr-x | scripts/stable-update.sh | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/scripts/rawhide-rc.sh b/scripts/rawhide-rc.sh index 82e0e5224..de19956d0 100755 --- a/scripts/rawhide-rc.sh +++ b/scripts/rawhide-rc.sh @@ -30,20 +30,20 @@ BASE=`grep "%define base_sublevel" kernel.spec| cut -d ' ' -f 3` OLDBASE=$BASE # See comment in kernel.spec about the base numbering BASE=$(($BASE+1)) +MAJORVER=5 # Kill all patches awk '!/patch/ { print $0 }' < sources > sources.tmp mv sources.tmp sources # Grab the tarball -if [ ! -f patch-4.$BASE-rc$RC.xz ]; then - wget -O patch-4.$BASE-rc$RC https://git.kernel.org/torvalds/p/v4.$BASE-rc$RC/v4.$OLDBASE +if [ ! -f patch-$MAJORVER.$BASE-rc$RC.xz ]; then + wget -O patch-$MAJORVER.$BASE-rc$RC https://git.kernel.org/torvalds/p/v$MAJORVER.$BASE-rc$RC/v$MAJORVER.$OLDBASE if [ ! $? -eq 0 ]; then exit 1 fi - xz -9 patch-4.$BASE-rc$RC - - # fedpkg upload patch-4.$BASE-rc$RC.xz + xz -9 patch-$MAJORVER.$BASE-rc$RC +# fedpkg upload patch-$MAJORVER.$BASE-rc$RC.xz checksum=$(sha512sum patch-4.$BASE-rc$RC.xz) echo "SHA512 (patch-4.$BASE-rc$RC.xz) = ${checksum:0:128}" >> sources @@ -56,6 +56,6 @@ perl -p -i -e 's|%define gitrev.*|%define gitrev 0|' kernel.spec perl -p -i -e 's|%global baserelease.*|%global baserelease 0|' kernel.spec -# rpmdev-bumpspec -c "Linux v4.$BASE-rc$RC" kernel.spec +#rpmdev-bumpspec -c "Linux v$MAJORVER.$BASE-rc$RC" kernel.spec echo "Don't forget to bump kernel-tools" diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index edfe70713..8e337ad4a 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -56,12 +56,13 @@ fi # fi #fi # -#xzcat "patch-$1.xz" | gpg2 --verify "patch-$1.sign" - -#if [ ! $? -eq 0 ]; then + +# xzcat "patch-$1.xz" | gpg2 --verify "patch-$1.sign" - +# if [ ! $? -eq 0 ]; then # echo "Patch file has invalid or untrusted signature!" # echo "See https://www.kernel.org/category/signatures.html" # exit 1 -#fi +# fi grep $1 sources &> /dev/null if [ ! $? -eq 0 ]; then |