diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-26 16:49:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-26 16:49:57 +0200 |
| commit | 6df1357e8570ace5c08ba2611e5f991fcc762861 (patch) | |
| tree | 0580ef970c59301b3928f305c07e3f4809eca7c3 /kernel.spec | |
| parent | f8b41dfa36d429d7bc87436133882c83af37fbff (diff) | |
| parent | ad07f83694b013ca55842016af04b1fb22d34270 (diff) | |
| download | kernel-6df1357e8570ace5c08ba2611e5f991fcc762861.tar.gz kernel-6df1357e8570ace5c08ba2611e5f991fcc762861.tar.xz kernel-6df1357e8570ace5c08ba2611e5f991fcc762861.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc3.29.vanilla.1.fc35kernel-5.14.0-0.rc3.29.vanilla.1.fc34kernel-5.14.0-0.rc3.29.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index b5858c41f..241b06920 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc2.20210723git8baef6386baa.26 +%global distro_build 0.rc3.29 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -126,13 +126,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc2.20210723git8baef6386baa.26 +%define pkgrelease 0.rc3.29 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20210723git8baef6386baa.26%{?buildid}%{?dist} +%define specrelease 0.rc3.29%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -673,7 +673,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc2-169-g8baef6386baa.tar.xz +Source0: linux-5.14-rc3.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc2-169-g8baef6386baa -c -mv linux-5.14-rc2-169-g8baef6386baa linux-%{KVERREL} +%setup -q -n kernel-5.14-rc3 -c +mv linux-5.14-rc3 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2959,6 +2959,10 @@ fi # # %changelog +* Sat Jul 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210723git8baef6386baa.27] +- Build Fedora x86s kernels with bytcr-wm5102 (Marius Hoch) +- Deleted redhat/configs/fedora/generic/x86/CONFIG_FB_HYPERV (Patrick Lang) + * Fri Jul 23 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc2.20210723git8baef6386baa.26] - rpmspec: correct the ghost initramfs attributes (Herton R. Krzesinski) [1977056] - rpmspec: amend removal of depmod created files to include modules.builtin.alias.bin (Herton R. Krzesinski) [1977056] |