From 3b9202a1d22ab26f0b70a72a5db81aec850b7aaf Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Mon, 13 Apr 2020 08:08:17 +0200 Subject: 5.7-rc1 --- kernel.spec | 4 ++-- scripts/stable-update.sh | 2 +- sources | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel.spec b/kernel.spec index ca8c54baa..1e9b16274 100644 --- a/kernel.spec +++ b/kernel.spec @@ -113,9 +113,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 0 +%global rcrev 1 # The git snapshot level -%define gitrev 8 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif diff --git a/scripts/stable-update.sh b/scripts/stable-update.sh index c919bf11d..6169d3e86 100755 --- a/scripts/stable-update.sh +++ b/scripts/stable-update.sh @@ -13,7 +13,7 @@ # Args: Stable version to update (e.g. 4.7.7, 4.8.1) # update orgin -~/usr/bin/vanilla-kernel-helper.sh masterupdate +vanilla-kernel-helper.sh masterupdate currentbranch=$(git symbolic-ref --short HEAD) git merge --no-edit origin/${currentbranch%-user-thl-vanilla-fedora} || exit 1 diff --git a/sources b/sources index 8bcf2f0e0..85946be07 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.6.tar.xz) = 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9 -SHA512 (patch-5.6-git8.xz) = 34de8c21461e975943893c0dc0a7c49c19fd70bed38d3449f8c65dd6b6cc19d342589ba028db8c7b12f45f882a2eaa703d1207c93190ce82194c25a03b19cb65 +SHA512 (patch-5.7-rc1.xz) = fa7e6f796ebcb275b2e7e42e62fdee9e20a1e3065c95850a2d5d46bf979f2d762997f8536d3ede4b6938ab7de96d20332bd02a62ecb87b6f36ad67a9ed866479 -- cgit