From 4594f2534fa269a516151f1a79953d27ac2ee8f6 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 27 Aug 2021 09:04:41 -0500 Subject: kernel-5.14.0-0.rc7.20210827git77dd11439b86.57 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fri Aug 27 2021 Fedora Kernel Team [5.14.0-0.rc7.20210827git77dd11439b86.57] - rpmspec: drop traceevent files instead of just excluding them from files list (Herton R. Krzesinski) [1967640] - Revert "redhat/configs: Enable genet and brcmfmac wlan" (Íñigo Huguet) - redhat/config: Enablement of CONFIG_PAPR_SCM for PowerPC (Gustavo Walbon) [1962936] Resolves: rhbz#1962936, rhbz#1967640 Signed-off-by: Justin M. Forbes --- kernel.spec | 98 +++++++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 72 insertions(+), 26 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index 6e81ce8ab..acbc1090c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -78,9 +78,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc7.54 +%global distro_build 0.rc7.20210827git77dd11439b86.57 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -124,13 +124,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc7.54 +%define pkgrelease 0.rc7.20210827git77dd11439b86.57 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.54%{?buildid}%{?dist} +%define specrelease 0.rc7.20210827git77dd11439b86.57%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -671,7 +671,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc7.tar.xz +Source0: linux-5.14-rc7-89-g77dd11439b86.tar.xz Source1: Makefile.rhelver @@ -690,21 +690,26 @@ Source9: x509.genkey.fedora %if %{?released_kernel} Source10: redhatsecurebootca5.cer -Source11: redhatsecureboot501.cer -Source12: secureboot_s390.cer -Source13: secureboot_ppc.cer - -%define secureboot_ca_0 %{SOURCE10} +Source11: redhatsecurebootca1.cer +Source12: redhatsecureboot501.cer +Source13: redhatsecureboot301.cer +Source14: secureboot_s390.cer +Source15: secureboot_ppc.cer + +%define secureboot_ca_1 %{SOURCE10} +%define secureboot_ca_0 %{SOURCE11} %ifarch x86_64 aarch64 -%define secureboot_key_0 %{SOURCE11} -%define pesign_name_0 redhatsecureboot501 +%define secureboot_key_1 %{SOURCE12} +%define pesign_name_1 redhatsecureboot501 +%define secureboot_key_0 %{SOURCE13} +%define pesign_name_0 redhatsecureboot301 %endif %ifarch s390x -%define secureboot_key_0 %{SOURCE12} +%define secureboot_key_0 %{SOURCE14} %define pesign_name_0 redhatsecureboot302 %endif %ifarch ppc64le -%define secureboot_key_0 %{SOURCE13} +%define secureboot_key_0 %{SOURCE15} %define pesign_name_0 redhatsecureboot303 %endif @@ -712,11 +717,16 @@ Source13: secureboot_ppc.cer %else Source10: redhatsecurebootca4.cer -Source11: redhatsecureboot401.cer - -%define secureboot_ca_0 %{SOURCE10} -%define secureboot_key_0 %{SOURCE11} -%define pesign_name_0 redhatsecureboot401 +Source11: redhatsecurebootca2.cer +Source12: redhatsecureboot401.cer +Source13: redhatsecureboot003.cer + +%define secureboot_ca_1 %{SOURCE10} +%define secureboot_ca_0 %{SOURCE11} +%define secureboot_key_1 %{SOURCE12} +%define pesign_name_1 redhatsecureboot401 +%define secureboot_key_0 %{SOURCE13} +%define pesign_name_0 redhatsecureboot003 # released_kernel %endif @@ -1347,8 +1357,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc7 -c -mv linux-5.14-rc7 linux-%{KVERREL} +%setup -q -n kernel-5.14-rc7-89-g77dd11439b86 -c +mv linux-5.14-rc7-89-g77dd11439b86 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1620,7 +1630,9 @@ BuildKernel() { fi %ifarch x86_64 aarch64 - %pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} + %pesign -s -i $SignImage -o vmlinuz.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0} + %pesign -s -i vmlinuz.tmp -o vmlinuz.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1} + rm vmlinuz.tmp %endif %ifarch s390x ppc64le if [ -x /usr/bin/rpm-sign ]; then @@ -2085,7 +2097,13 @@ BuildKernel() { # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer - install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer + %ifarch x86_64 aarch64 + install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca-20200609.cer + install -m 0644 %{secureboot_ca_1} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca-20140212.cer + ln -s kernel-signing-ca-20200609.cer $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer + %else + install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer + %endif %ifarch s390x ppc64le if [ $DoModules -eq 1 ]; then if [ -x /usr/bin/rpm-sign ]; then @@ -2412,6 +2430,12 @@ rm -rf %{buildroot}/usr/lib/perf/include # perf man pages (note: implicit rpm magic compresses them later) mkdir -p %{buildroot}/%{_mandir}/man1 %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-man + +# remove any tracevent files, eg. its plugins still gets built and installed, +# even if we build against system's libtracevent during perf build (by setting +# LIBTRACEEVENT_DYNAMIC=1 above in perf_make macro). Those files should already +# ship with libtraceevent package. +rm -rf %{buildroot}%{_libdir}/traceevent %endif %if %{with_tools} @@ -2727,7 +2751,6 @@ fi %files -n perf %{_bindir}/perf %{_libdir}/libperf-jvmti.so -%exclude %{_libdir}/traceevent %dir %{_libexecdir}/perf-core %{_libexecdir}/perf-core/* %{_datadir}/perf-core/* @@ -2934,8 +2957,31 @@ fi # # %changelog -* Mon Aug 23 2021 Fedora Kernel Team [5.14.0-0.rc7.54] -- redhat: drop certificates that were deprecated after GRUB's BootHole flaw (Herton R. Krzesinski) [1994849] +* Fri Aug 27 2021 Fedora Kernel Team [5.14.0-0.rc7.20210827git77dd11439b86.57] +- rpmspec: drop traceevent files instead of just excluding them from files list (Herton R. Krzesinski) [1967640] +- Revert "redhat/configs: Enable genet and brcmfmac wlan" (Íñigo Huguet) +- redhat/config: Enablement of CONFIG_PAPR_SCM for PowerPC (Gustavo Walbon) [1962936] + +* Thu Aug 26 2021 Fedora Kernel Team [5.14.0-0.rc7.20210826git73f3af7b4611.56] +- Attempt to fix Intel PMT code (David Arcari) + +* Wed Aug 25 2021 Fedora Kernel Team [5.14.0-0.rc7.20210825git6e764bcd1cf7.55] +- CI: Enable realtime branch testing (Veronika Kabatova) +- CI: Enable realtime checks for c9s and RHEL9 (Veronika Kabatova) +- [fs] dax: mark tech preview (Bill O'Donnell) +- ark: wireless: enable all rtw88 pcie wirless variants (Peter Robinson) +- wireless: rtw88: move debug options to common/debug (Peter Robinson) +- fedora: minor PTP clock driver cleanups (Peter Robinson) +- common: x86: enable VMware PTP support on ark (Peter Robinson) + +* Tue Aug 24 2021 Fedora Kernel Team [5.14.0-0.rc7.20210824gitd5ae8d7f85b7.54] +- arm64: dts: rockchip: Disable CDN DP on Pinebook Pro (Matthias Brugger) +- arm64: dts: rockchip: Setup USB typec port as datarole on (Dan Johansen) +- Revert "IB/rxe: Mark Soft-RoCE Transport driver as tech-preview" (Herton R. Krzesinski) +- redhat/configs: Enable genet and brcmfmac wlan (Jeremy Linton) [1992902] +- [scsi] megaraid_sas: re-add certain pci-ids (Tomas Henzl) +- xfs: drop experimental warnings for bigtime and inobtcount (Bill O'Donnell) [1995321] +- Disable liquidio driver on ark/rhel (Herton R. Krzesinski) [1993393] * Sat Aug 21 2021 Fedora Kernel Team [5.14.0-0.rc6.20210821gitfa54d366a6e4.51] - More Fedora config updates (Justin M. Forbes) -- cgit From 9e5bb46146bb87601ccec5eea950ffc57e5b7c05 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 30 Aug 2021 07:19:52 -0500 Subject: kernel-5.14-60 * Mon Aug 30 2021 Fedora Kernel Team [5.14-60] - arm64: use common CONFIG_MAX_ZONEORDER for arm kernel (Mark Salter) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel.spec | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'kernel.spec') diff --git a/kernel.spec b/kernel.spec index acbc1090c..4ff76dbed 100755 --- a/kernel.spec +++ b/kernel.spec @@ -78,9 +78,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 -%global distro_build 0.rc7.20210827git77dd11439b86.57 +%global distro_build 60 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -124,13 +124,14 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc7.20210827git77dd11439b86.57 +%define patchversion 5.14 +%define pkgrelease 60 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20210827git77dd11439b86.57%{?buildid}%{?dist} +%define specrelease 60%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -671,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc7-89-g77dd11439b86.tar.xz +Source0: linux-5.14.tar.xz Source1: Makefile.rhelver @@ -827,7 +828,7 @@ Source4002: gating.yaml %if !%{nopatches} -Patch1: patch-%{rpmversion}-redhat.patch +Patch1: patch-%{patchversion}-redhat.patch %endif # empty final patch to facilitate testing of kernel patches @@ -1357,15 +1358,15 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc7-89-g77dd11439b86 -c -mv linux-5.14-rc7-89-g77dd11439b86 linux-%{KVERREL} +%setup -q -n kernel-5.14 -c +mv linux-5.14 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . %if !%{nopatches} -ApplyOptionalPatch patch-%{rpmversion}-redhat.patch +ApplyOptionalPatch patch-%{patchversion}-redhat.patch %endif ApplyOptionalPatch linux-kernel-test.patch @@ -2957,6 +2958,12 @@ fi # # %changelog +* Mon Aug 30 2021 Fedora Kernel Team [5.14-60] +- arm64: use common CONFIG_MAX_ZONEORDER for arm kernel (Mark Salter) + +* Sat Aug 28 2021 Fedora Kernel Team [5.14-0.rc7.20210828git64b4fc45bea6.58] +- Create Makefile.variables for a single point of configuration change (Justin M. Forbes) + * Fri Aug 27 2021 Fedora Kernel Team [5.14.0-0.rc7.20210827git77dd11439b86.57] - rpmspec: drop traceevent files instead of just excluding them from files list (Herton R. Krzesinski) [1967640] - Revert "redhat/configs: Enable genet and brcmfmac wlan" (Íñigo Huguet) -- cgit