kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181

* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc5.20210331git2bb25b3a748a.181]
- configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini)
- Remove _legacy_common_support (Justin M. Forbes)
- redhat/mod-blacklist.sh: Fix floppy blacklisting (Hans de Goede)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

1 files changed, 12 insertions, 11 deletions

diff --git a/kernel.spec b/kernel.spec
index 3c1448be7..8c4201ac7 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -41,10 +41,6 @@
 # will not see them.
 %global __spec_install_pre %{___build_pre}
 
-# Short-term fix so the package builds with GCC 10.
-# This should go away soon.
-%define _legacy_common_support 1
-
 # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio
 # compression for rpms (xz, level 2).
 # Kernel has several large (hundreds of mbytes) rpms, they take ~5 mins
@@ -70,7 +66,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc5.180
+%global distro_build 0.rc5.20210331git2bb25b3a748a.181
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -111,13 +107,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.12.0
-%define pkgrelease 0.rc5.180
+%define pkgrelease 0.rc5.20210331git2bb25b3a748a.181
 
 # This is needed to do merge window version magic
 %define patchlevel 12
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.180%{?buildid}%{?dist}
+%define specrelease 0.rc5.20210331git2bb25b3a748a.181%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -207,7 +203,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
 # The kernel tarball/base version
 %define kversion 5.12
@@ -624,7 +620,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12-rc5.tar.xz
+Source0: linux-20210331git2bb25b3a748a.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1278,8 +1274,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.12-rc5 -c
-mv linux-5.12-rc5 linux-%{KVERREL}
+%setup -q -n kernel-20210331git2bb25b3a748a -c
+mv linux-20210331git2bb25b3a748a linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2793,6 +2789,11 @@ fi
 #
 #
 %changelog
+* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc5.20210331git2bb25b3a748a.181]
+- configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini)
+- Remove _legacy_common_support (Justin M. Forbes)
+- redhat/mod-blacklist.sh: Fix floppy blacklisting (Hans de Goede)
+
 * Fri Mar 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc4.20210326gitdb24726bfefa.178]
 - New configs in fs/pstore (CKI@GitLab)