diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-25 17:30:00 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-25 17:30:00 +0100 |
| commit | 045c0c37a7d203f2a0762022f831fb5db0b29446 (patch) | |
| tree | f617cf3ed8867e9e7e1abd47417f3ba02e7eee0a /kernel.spec | |
| parent | 499f5902cc575146075f76980dc37cfc19b83aa8 (diff) | |
| parent | dd1adb6d6398a25d83671a1f9235bd025bded8eb (diff) | |
| download | kernel-045c0c37a7d203f2a0762022f831fb5db0b29446.tar.gz kernel-045c0c37a7d203f2a0762022f831fb5db0b29446.tar.xz kernel-045c0c37a7d203f2a0762022f831fb5db0b29446.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc5.20201125git127c501a03d5.85.vanilla.1.fc34kernel-5.10.0-0.rc5.20201125git127c501a03d5.85.vanilla.1.fc33kernel-5.10.0-0.rc5.20201125git127c501a03d5.85.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 6dd17f8f8..2c41a5ff7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc5.20201124gitd5beb3140f91.84 +%global distro_build 0.rc5.20201125git127c501a03d5.85 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -99,13 +99,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc5.20201124gitd5beb3140f91.84 +%define pkgrelease 0.rc5.20201125git127c501a03d5.85 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20201124gitd5beb3140f91.84%{?buildid}%{?dist} +%define specrelease 0.rc5.20201125git127c501a03d5.85%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -505,9 +505,7 @@ BuildRequires: kmod, patch, bash, tar, git-core BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex BuildRequires: net-tools, hostname, bc, elfutils-devel -%if 0%{?fedora} BuildRequires: dwarves -%endif BuildRequires: python3-devel %if %{with_headers} BuildRequires: rsync @@ -596,7 +594,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201124gitd5beb3140f91.tar.xz +Source0: linux-20201125git127c501a03d5.tar.xz Source1: Makefile.rhelver @@ -1240,8 +1238,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201124gitd5beb3140f91 -c -mv linux-20201124gitd5beb3140f91 linux-%{KVERREL} +%setup -q -n kernel-20201125git127c501a03d5 -c +mv linux-20201125git127c501a03d5 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2683,7 +2681,7 @@ fi # # %changelog -* Tue Nov 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc5.20201124gitd5beb3140f91.84] +* Wed Nov 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc5.20201125git127c501a03d5.85] - Temporarily backout parallel xz script ("Justin M. Forbes") * Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81] |