rpms/kernel-rt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

kernel-rt-5.14.0-6.rt21.6.el9

Browse Source 
* Mon Oct 11 2021 Juri Lelli <juri.lelli@redhat.com> [5.14.0-6.rt21.6.el9]
- pinctrl: Bulk conversion to generic_handle_domain_irq() (David Arcari) [2000232]
- pinctrl: amd: Handle wake-up interrupt (David Arcari) [2000232]
- pinctrl: amd: Add irq field data (David Arcari) [2000232]
- Revert "redhat: define _rhel variable because pesign macro now needs it" (Jan Stancek)
- redhat: switch secureboot kernel image signing to release keys (Jan Stancek)
- redhat/configs: Disable FIREWIRE (Prarit Bhargava) [1871862]
- Enable e1000 in rhel9 as unsupported (Ken Cox) [2002344]
Resolves: rhbz#2002474
This commit is contained in:
Juri Lelli 2021-10-11 07:18:00 -04:00
parent 33bdc66ad0
commit ab19814cf9
5 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 0
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 5 RHEL_RELEASE = 6
# #
# Early y+1 numbering # Early y+1 numbering
@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes")
endif endif
endif endif
RTBUILD:=.5 RTBUILD:=.6

20
kernel-rt-x86_64-debug-rhel.config
View File

@ -1548,7 +1548,7 @@ CONFIG_DYNAMIC_DEBUG=y
CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE=y
CONFIG_E1000E_HWTS=y CONFIG_E1000E_HWTS=y
CONFIG_E1000E=m CONFIG_E1000E=m
# CONFIG_E1000 is not set CONFIG_E1000=m
# CONFIG_E100 is not set # CONFIG_E100 is not set
CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_DBGP=y
CONFIG_EARLY_PRINTK_EFI=y CONFIG_EARLY_PRINTK_EFI=y
@ -1758,12 +1758,12 @@ CONFIG_FCOE_FNIC=m
CONFIG_FHANDLE=y CONFIG_FHANDLE=y
CONFIG_FILE_LOCKING=y CONFIG_FILE_LOCKING=y
# CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_FIND_BIT_BENCHMARK is not set
CONFIG_FIREWIRE=m # CONFIG_FIREWIRE is not set
CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NET is not set
# CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIREWIRE_NOSY is not set
CONFIG_FIREWIRE_OHCI=m # CONFIG_FIREWIRE_OHCI is not set
CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SBP2 is not set
CONFIG_FIREWIRE_SERIAL=m # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIRMWARE_MEMMAP=y CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
@ -5390,10 +5390,10 @@ CONFIG_SND_ES1968_INPUT=y
CONFIG_SND_ES1968=m CONFIG_SND_ES1968=m
CONFIG_SND_ES1968_RADIO=y CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FIREFACE=m CONFIG_SND_FIREFACE=m
CONFIG_SND_FIREWIRE_DIGI00X=m # CONFIG_SND_FIREWIRE_DIGI00X is not set
CONFIG_SND_FIREWIRE_MOTU=m # CONFIG_SND_FIREWIRE is not set
CONFIG_SND_FIREWIRE_TASCAM=m # CONFIG_SND_FIREWIRE_MOTU is not set
CONFIG_SND_FIREWIRE=y # CONFIG_SND_FIREWIRE_TASCAM is not set
CONFIG_SND_FIREWORKS=m CONFIG_SND_FIREWORKS=m
# CONFIG_SND_FM801 is not set # CONFIG_SND_FM801 is not set
# CONFIG_SND_FM801_TEA575X_BOOL is not set # CONFIG_SND_FM801_TEA575X_BOOL is not set

20
kernel-rt-x86_64-rhel.config
View File

@ -1540,7 +1540,7 @@ CONFIG_DYNAMIC_DEBUG=y
CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE=y
CONFIG_E1000E_HWTS=y CONFIG_E1000E_HWTS=y
CONFIG_E1000E=m CONFIG_E1000E=m
# CONFIG_E1000 is not set CONFIG_E1000=m
# CONFIG_E100 is not set # CONFIG_E100 is not set
CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EARLY_PRINTK_DBGP=y
CONFIG_EARLY_PRINTK_EFI=y CONFIG_EARLY_PRINTK_EFI=y
@ -1742,12 +1742,12 @@ CONFIG_FCOE_FNIC=m
CONFIG_FHANDLE=y CONFIG_FHANDLE=y
CONFIG_FILE_LOCKING=y CONFIG_FILE_LOCKING=y
# CONFIG_FIND_BIT_BENCHMARK is not set # CONFIG_FIND_BIT_BENCHMARK is not set
CONFIG_FIREWIRE=m # CONFIG_FIREWIRE is not set
CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NET is not set
# CONFIG_FIREWIRE_NOSY is not set # CONFIG_FIREWIRE_NOSY is not set
CONFIG_FIREWIRE_OHCI=m # CONFIG_FIREWIRE_OHCI is not set
CONFIG_FIREWIRE_SBP2=m # CONFIG_FIREWIRE_SBP2 is not set
CONFIG_FIREWIRE_SERIAL=m # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIRMWARE_MEMMAP=y CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
@ -5370,10 +5370,10 @@ CONFIG_SND_ES1968_INPUT=y
CONFIG_SND_ES1968=m CONFIG_SND_ES1968=m
CONFIG_SND_ES1968_RADIO=y CONFIG_SND_ES1968_RADIO=y
CONFIG_SND_FIREFACE=m CONFIG_SND_FIREFACE=m
CONFIG_SND_FIREWIRE_DIGI00X=m # CONFIG_SND_FIREWIRE_DIGI00X is not set
CONFIG_SND_FIREWIRE_MOTU=m # CONFIG_SND_FIREWIRE is not set
CONFIG_SND_FIREWIRE_TASCAM=m # CONFIG_SND_FIREWIRE_MOTU is not set
CONFIG_SND_FIREWIRE=y # CONFIG_SND_FIREWIRE_TASCAM is not set
CONFIG_SND_FIREWORKS=m CONFIG_SND_FIREWORKS=m
# CONFIG_SND_FM801 is not set # CONFIG_SND_FM801 is not set
# CONFIG_SND_FM801_TEA575X_BOOL is not set # CONFIG_SND_FM801_TEA575X_BOOL is not set

30
kernel.spec
View File

@ -80,7 +80,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 1 %define debugbuildsenabled 1
%global distro_build 5 %global distro_build 6
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -124,13 +124,13 @@ Summary: The Linux kernel
%define kversion 5.14 %define kversion 5.14
%define rpmversion 5.14.0 %define rpmversion 5.14.0
%define pkgrelease 5.rt21.5.el9 %define pkgrelease 6.rt21.6.el9
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 14 %define patchlevel 14
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 5.rt21.5%{?buildid}%{?dist} %define specrelease 6.rt21.6%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -699,7 +699,7 @@ BuildRequires: lld
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.14.0-5.rt21.5.el9.tar.xz Source0: linux-5.14.0-6.rt21.6.el9.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1421,8 +1421,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.14.0-5.rt21.5.el9 -c %setup -q -n kernel-5.14.0-6.rt21.6.el9 -c
mv linux-5.14.0-5.rt21.5.el9 linux-%{KVERREL} mv linux-5.14.0-6.rt21.6.el9 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -1702,15 +1702,8 @@ BuildKernel() {
fi fi
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
if [ -x /usr/bin/rpm-sign ]; then %pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
%define _rhel 9
%pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
%undefine _rhel
else
%pesign -s -i $SignImage -o vmlinuz.signed
fi
%endif %endif
%ifarch s390x ppc64le %ifarch s390x ppc64le
if [ -x /usr/bin/rpm-sign ]; then if [ -x /usr/bin/rpm-sign ]; then
rpm-sign --key "%{pesign_name_0}" --lkmsign $SignImage --output vmlinuz.signed rpm-sign --key "%{pesign_name_0}" --lkmsign $SignImage --output vmlinuz.signed
@ -3078,6 +3071,15 @@ fi
# #
# #
%changelog %changelog
* Mon Oct 11 2021 Juri Lelli <juri.lelli@redhat.com> [5.14.0-6.rt21.6.el9]
- pinctrl: Bulk conversion to generic_handle_domain_irq() (David Arcari) [2000232]
- pinctrl: amd: Handle wake-up interrupt (David Arcari) [2000232]
- pinctrl: amd: Add irq field data (David Arcari) [2000232]
- Revert "redhat: define _rhel variable because pesign macro now needs it" (Jan Stancek)
- redhat: switch secureboot kernel image signing to release keys (Jan Stancek)
- redhat/configs: Disable FIREWIRE (Prarit Bhargava) [1871862]
- Enable e1000 in rhel9 as unsupported (Ken Cox) [2002344]
* Fri Oct 01 2021 Juri Lelli <juri.lelli@redhat.com> [5.14.0-5.rt21.5.el9] * Fri Oct 01 2021 Juri Lelli <juri.lelli@redhat.com> [5.14.0-5.rt21.5.el9]
- redhat/configs: enable CONFIG_SQUASHFS_ZSTD which is already enabled in Fedora 34 (Tao Liu) [1998953] - redhat/configs: enable CONFIG_SQUASHFS_ZSTD which is already enabled in Fedora 34 (Tao Liu) [1998953]
- fs: dlm: fix return -EINTR on recovery stopped (Alexander Aring) [2004213] - fs: dlm: fix return -EINTR on recovery stopped (Alexander Aring) [2004213]

6
sources
View File

@ -1,4 +1,4 @@
SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c
SHA512 (linux-5.14.0-5.rt21.5.el9.tar.xz) = 516cae5d212bbba4765039c348624a9c96b8eeb6df19bdf8e731abb6d555fb00a2547826d86e6657a437f272ec7c33efeed2f6aac0a397ef999ed7ac7cf159af SHA512 (linux-5.14.0-6.rt21.6.el9.tar.xz) = bc6ff915415b2c57d2470ef5271909d03a9e9a3ed3a8895edce47c6df21d4e58e2f3bed8885fa7160216e449cb260ff80fe91f8d2550c8fa2b596a5cf60dfaa8
SHA512 (kernel-abi-stablelists-5.14.0-5.tar.bz2) = 46f7c6a027844f126f610a14b47a806ee7223a6a0a12b93fc16aeee95954cb3832cd9cf139aae6e107ab9fba41973fff5c204d9e728117dbca85081f14712813 SHA512 (kernel-abi-stablelists-5.14.0-6.tar.bz2) = f88c39eb0ac5d2a202046dba1e7037d51a363e12385a718476e66fd55cfc78f8e8525ee44b9fc793480b64b376f2a2283c12a6cf0ee1325038acb438fe433752
SHA512 (kernel-kabi-dw-5.14.0-5.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 SHA512 (kernel-kabi-dw-5.14.0-6.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914