diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-04 21:13:34 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-04 21:13:34 +0200 |
| commit | fb8f64b7716fe6d20a7b0f0347f4706dd535146e (patch) | |
| tree | 3257ba109a43aaa3a8f65b75cf606dfcf30941ab /kernel.spec | |
| parent | d9a167afba12983d586637ae44f8ea2f5682a92c (diff) | |
| parent | 2d4e33084f15019a901be7f4665ba14fe1020159 (diff) | |
| download | kernel-fb8f64b7716fe6d20a7b0f0347f4706dd535146e.tar.gz kernel-fb8f64b7716fe6d20a7b0f0347f4706dd535146e.tar.xz kernel-fb8f64b7716fe6d20a7b0f0347f4706dd535146e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc4.1.vanilla.1.fc33kernel-5.7.0-0.rc4.1.vanilla.1.fc32kernel-5.7.0-0.rc4.1.vanilla.1.fc31kernel-5.7.0-0.rc4.1.vanilla.1.fc30
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index b9af7fd3b..795ce77ad 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.20200501gitc45e8bccecaf.1 +%global distro_build 0.rc4.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,10 +71,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.7.0 -%define pkgrelease 0.rc3.20200501gitc45e8bccecaf.1 +%define pkgrelease 0.rc4.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20200501gitc45e8bccecaf.1%{?buildid}%{?dist} +%define specrelease 0.rc4.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -570,7 +570,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200501gitc45e8bccecaf.tar.xz +Source0: linux-5.7-rc4.tar.xz Source1: Makefile.rhelver @@ -1278,8 +1278,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200501gitc45e8bccecaf -c -mv linux-20200501gitc45e8bccecaf linux-%{KVERREL} +%setup -q -n kernel-5.7-rc4 -c +mv linux-5.7-rc4 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2767,6 +2767,20 @@ fi # # %changelog +* Mon May 04 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.1] +- v5.7-rc4 rebase +- Updated changelog for the release based on f66ed1ebbfde ("CKI@GitLab") + +* Sun May 03 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200503gitf66ed1ebbfde.1] +- f66ed1ebbfde rebase +- Updated changelog for the release based on 690e2aba7beb ("CKI@GitLab") + +* Sat May 02 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200502git690e2aba7beb.1] +- 690e2aba7beb rebase +- Updated changelog for the release based on c45e8bccecaf ("CKI@GitLab") +- Drop the requirement to have a remote called linus (Jeremy Cline) +- Rename 'internal' branch to 'os-build' (Don Zickus) + * Fri May 01 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200501gitc45e8bccecaf.1] - c45e8bccecaf rebase - Updated changelog for the release based on 1d2cc5ac6f66 ("CKI@GitLab") |