diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-23 15:14:31 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-09-23 15:14:31 +0200 |
commit | 54102d4aaa7c0b293841d692e80c57e07c550fd2 (patch) | |
tree | 4fbca2f06a4139e5201d0269a63a9cd6a8215137 | |
parent | c56bdfe97cd445e0ae52db7d576cb72b36519c88 (diff) | |
parent | 0498fb5dc56cabea8f041a6d8d9562c7f6bdc1d1 (diff) | |
download | kernel-54102d4aaa7c0b293841d692e80c57e07c550fd2.tar.gz kernel-54102d4aaa7c0b293841d692e80c57e07c550fd2.tar.xz kernel-54102d4aaa7c0b293841d692e80c57e07c550fd2.zip |
merge origin/f31
-rw-r--r-- | kernel.spec | 4 | ||||
-rwxr-xr-x | scripts/stable-update.sh | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 7f7da8dfa..b53dcf453 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,6 +62,7 @@ Summary: The Linux kernel # Is it a -stable RC? %define stable_rc 0 + # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -1803,6 +1804,9 @@ fi # # %changelog +* Mon Sep 23 2019 Laura Abbott <labbott@redhat.com> - 5.3.1-100 +- Linux v5.3.1 + * Thu Sep 19 2019 Laura Abbott <labbott@redhat.com> - Fix for dwc3 (rhbz 1753099) diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index 5d9e49fa2..2e2d974b6 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -48,20 +48,21 @@ fi # This all needs to be updated for the new generation system # -#if [ ! -f "patch-$1.sign" ]; then -# wget "https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-$1.sign" +# if [ ! -f "patch-$1.sign" ]; then +# wget "https://cdn.kernel.org/pub/linux/kernel/v4.x/patch-$1.sign" # if [ ! $? -eq 0 ]; then # echo "Signature download failed" # exit 1 # fi -#fi -# -#xzcat "patch-$1.xz" | gpg2 --verify "patch-$1.sign" - -#if [ ! $? -eq 0 ]; then +# fi + +# 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 |