kernel-rt-4.18.0-481.rt7.270.el8

* Wed Apr 05 2023 John B. Wyatt IV <jwyatt@redhat.com> [4.18.0-481.rt7.270.el8]
- [rt] build kernel-rt-4.18.0-481.rt7.270.el8 [2180997]
- redhat: include all certs (Red Hat and CentOS) in the srpm (Denys Vlasenko) [2179095]
- redhat: do not require grub2 on s390x (Denys Vlasenko) [2179095]
- thermal: int340x: Add Meteor Lake PCI device ID (Prarit Bhargava) [2156822]
- i2c: i801: Add support for Intel Meteor Lake-P (Prarit Bhargava) [2156841]
Resolves: rhbz#21809971

Signed-off-by: John B. Wyatt IV <jwyatt@redhat.com>
This commit is contained in:
John B. Wyatt IV 2023-04-05 19:32:16 -04:00
parent a70d3fc51f
commit d200723ca9
2 changed files with 21 additions and 14 deletions

View File

@ -12,7 +12,7 @@
# change below to w4T.xzdio): # change below to w4T.xzdio):
%define _binary_payload w3T.xzdio %define _binary_payload w3T.xzdio
%global distro_build 480 %global distro_build 481
# Sign the x86_64 kernel for secure boot authentication # Sign the x86_64 kernel for secure boot authentication
%ifarch x86_64 aarch64 s390x ppc64le %ifarch x86_64 aarch64 s390x ppc64le
@ -38,10 +38,10 @@
# define buildid .local # define buildid .local
%define rpmversion 4.18.0 %define rpmversion 4.18.0
%define pkgrelease 480.rt7.269.el8 %define pkgrelease 481.rt7.270.el8
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 480.rt7.269%{?dist} %define specrelease 481.rt7.270%{?dist}
%define pkg_release %{specrelease}%{?buildid} %define pkg_release %{specrelease}%{?buildid}
@ -147,7 +147,7 @@
# The preempt RT patch level # The preempt RT patch level
%global rttag .rt7 %global rttag .rt7
# realtimeN # realtimeN
%global rtbuild .269 %global rtbuild .270
%define with_doc 0 %define with_doc 0
%define with_headers 0 %define with_headers 0
%define with_cross_headers 0 %define with_cross_headers 0
@ -446,20 +446,18 @@ Source9: x509.genkey
%define signing_key_filename kernel-signing-s390.cer %define signing_key_filename kernel-signing-s390.cer
%endif %endif
%if 0%{?centos}
Source10: centossecurebootca2.cer
Source13: centossecureboot201.cer
%define secureboot_ca_0 %{SOURCE10}
%define secureboot_key_0 %{SOURCE13}
%define pesign_name_0 centossecureboot201
%else
Source10: redhatsecurebootca3.cer Source10: redhatsecurebootca3.cer
#UNUSED, delete file after confirming it works: Source11: centossecurebootca2.cer
#Source11: redhatsecurebootca5.cer Source12: centossecureboot201.cer
Source13: redhatsecureboot501.cer Source13: redhatsecureboot501.cer
Source14: redhatsecureboot302.cer Source14: redhatsecureboot302.cer
Source15: redhatsecureboot303.cer Source15: redhatsecureboot303.cer
Source16: redhatsecurebootca7.cer Source16: redhatsecurebootca7.cer
%if 0%{?centos}
%define secureboot_ca_0 %{SOURCE11}
%define secureboot_key_0 %{SOURCE12}
%define pesign_name_0 centossecureboot201
%else
%ifarch x86_64 aarch64 %ifarch x86_64 aarch64
%define secureboot_ca_0 %{SOURCE10} %define secureboot_ca_0 %{SOURCE10}
@ -578,7 +576,9 @@ Provides: %{name}-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\ Requires(pre): %{kernel_prereq}\
Requires(pre): %{initrd_prereq}\ Requires(pre): %{initrd_prereq}\
Requires(pre): linux-firmware >= 20200619-99.git3890db36\ Requires(pre): linux-firmware >= 20200619-99.git3890db36\
%ifnarch s390x\
Requires(pre): grub2 >= 2.02-99\ Requires(pre): grub2 >= 2.02-99\
%endif\
Requires(preun): systemd >= 200\ Requires(preun): systemd >= 200\
Conflicts: xfsprogs < 4.3.0-1\ Conflicts: xfsprogs < 4.3.0-1\
Conflicts: xorg-x11-drv-vmmouse < 13.0.99\ Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
@ -2697,6 +2697,13 @@ fi
# #
# #
%changelog %changelog
* Wed Apr 05 2023 John B. Wyatt IV <jwyatt@redhat.com> [4.18.0-481.rt7.270.el8]
- [rt] build kernel-rt-4.18.0-481.rt7.270.el8 [2180997]
- redhat: include all certs (Red Hat and CentOS) in the srpm (Denys Vlasenko) [2179095]
- redhat: do not require grub2 on s390x (Denys Vlasenko) [2179095]
- thermal: int340x: Add Meteor Lake PCI device ID (Prarit Bhargava) [2156822]
- i2c: i801: Add support for Intel Meteor Lake-P (Prarit Bhargava) [2156841]
* Wed Apr 05 2023 Luis Claudio R. Goncalves <lgoncalv@redhat.com> [4.18.0-480.rt7.269.el8] * Wed Apr 05 2023 Luis Claudio R. Goncalves <lgoncalv@redhat.com> [4.18.0-480.rt7.269.el8]
- [rt] build kernel-rt-4.18.0-480.rt7.269.el8 [2180997] - [rt] build kernel-rt-4.18.0-480.rt7.269.el8 [2180997]
- redhat: fix the signing failure on ppc64el on centos (Denys Vlasenko) [2179095] - redhat: fix the signing failure on ppc64el on centos (Denys Vlasenko) [2179095]

View File

@ -1 +1 @@
SHA512 (linux-4.18.0-480.rt7.269.el8.tar.xz) = e923c4494fdff0cc28111adfa1c5a8bb9efddacede5ae0df22a9f5de1cfcd764a8e7dd7f15683fe6b9f3a58b96859e7f15f893c5b37f67b2629457be046fa56d SHA512 (linux-4.18.0-481.rt7.270.el8.tar.xz) = e66631129247ef6df9cfe129c7b3e0ceadc7d255c4b3da75784e2ad0f6e16821434541bdd5c15c894f218b9449db188db656767d4688f0a40766f98c3da98a98