kernel-rt-5.14.0-72.rt21.72.el9
* Thu Mar 17 2022 Juri Lelli <juri.lelli@redhat.com> [5.14.0-72.rt21.72.el9] - spec: Fix separate tools build (Jiri Olsa) [2054579] - redhat: use centos x509.genkey file if building under centos (Herton R. Krzesinski) [2029952] Resolves: rhbz#2029952, rhbz#2054579, rhbz#2061574 Signed-off-by: Juri Lelli <juri.lelli@redhat.com>
This commit is contained in:
Juri Lelli
parent
7049f4610d
commit
fa0e5d7b00
@ -12,7 +12,7 @@ RHEL_MINOR = 1
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 71
|
||||
RHEL_RELEASE = 72
|
||||
|
||||
#
|
||||
# Early y+1 numbering
|
||||
@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes")
|
||||
endif
|
||||
endif
|
||||
|
||||
RTBUILD:=.71
|
||||
RTBUILD:=.72
|
||||
|
||||
@ -2293,7 +2293,7 @@ CONFIG_INTEL_MEI_ME=m
|
||||
CONFIG_INTEL_MEI_WDT=m
|
||||
# CONFIG_INTEL_MENLOW is not set
|
||||
CONFIG_INTEL_OAKTRAIL=m
|
||||
# CONFIG_INTEL_PCH_THERMAL is not set
|
||||
CONFIG_INTEL_PCH_THERMAL=m
|
||||
CONFIG_INTEL_PMC_CORE=m
|
||||
CONFIG_INTEL_PMT_CLASS=m
|
||||
CONFIG_INTEL_PMT_CRASHLOG=m
|
||||
@ -5474,7 +5474,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
|
||||
# CONFIG_SURFACE3_WMI is not set
|
||||
# CONFIG_SURFACE_GPE is not set
|
||||
# CONFIG_SURFACE_HOTPLUG is not set
|
||||
CONFIG_SURFACE_PLATFORMS=y
|
||||
# CONFIG_SURFACE_PLATFORMS is not set
|
||||
# CONFIG_SURFACE_PRO3_BUTTON is not set
|
||||
# CONFIG_SUSPEND_SKIP_SYNC is not set
|
||||
CONFIG_SUSPEND=y
|
||||
|
||||
@ -2277,7 +2277,7 @@ CONFIG_INTEL_MEI_ME=m
|
||||
CONFIG_INTEL_MEI_WDT=m
|
||||
# CONFIG_INTEL_MENLOW is not set
|
||||
CONFIG_INTEL_OAKTRAIL=m
|
||||
# CONFIG_INTEL_PCH_THERMAL is not set
|
||||
CONFIG_INTEL_PCH_THERMAL=m
|
||||
CONFIG_INTEL_PMC_CORE=m
|
||||
CONFIG_INTEL_PMT_CLASS=m
|
||||
CONFIG_INTEL_PMT_CRASHLOG=m
|
||||
@ -5451,7 +5451,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
|
||||
# CONFIG_SURFACE3_WMI is not set
|
||||
# CONFIG_SURFACE_GPE is not set
|
||||
# CONFIG_SURFACE_HOTPLUG is not set
|
||||
CONFIG_SURFACE_PLATFORMS=y
|
||||
# CONFIG_SURFACE_PLATFORMS is not set
|
||||
# CONFIG_SURFACE_PRO3_BUTTON is not set
|
||||
# CONFIG_SUSPEND_SKIP_SYNC is not set
|
||||
CONFIG_SUSPEND=y
|
||||
|
||||
47
kernel.spec
47
kernel.spec
@ -79,7 +79,7 @@ Summary: The Linux kernel
|
||||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 1
|
||||
|
||||
%global distro_build 71
|
||||
%global distro_build 72
|
||||
|
||||
%if 0%{?fedora}
|
||||
%define secure_boot_arch x86_64
|
||||
@ -123,13 +123,13 @@ Summary: The Linux kernel
|
||||
%define kversion 5.14
|
||||
|
||||
%define rpmversion 5.14.0
|
||||
%define pkgrelease 71.rt21.71.el9
|
||||
%define pkgrelease 72.rt21.72.el9
|
||||
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 14
|
||||
|
||||
# allow pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 71.rt21.71%{?buildid}%{?dist}
|
||||
%define specrelease 72.rt21.72%{?buildid}%{?dist}
|
||||
|
||||
%define pkg_release %{specrelease}
|
||||
|
||||
@ -706,7 +706,7 @@ BuildRequires: lld
|
||||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.14.0-71.rt21.71.el9.tar.xz
|
||||
Source0: linux-5.14.0-72.rt21.72.el9.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
@ -770,6 +770,8 @@ Source37: filter-aarch64.sh.rhel
|
||||
Source38: filter-ppc64le.sh.rhel
|
||||
Source39: filter-s390x.sh.rhel
|
||||
Source40: filter-modules.sh.rhel
|
||||
|
||||
Source41: x509.genkey.centos
|
||||
%endif
|
||||
|
||||
%if 0%{?include_fedora}
|
||||
@ -878,7 +880,8 @@ Provides: kernel-drm-nouveau = 16\
|
||||
Provides: %{name}-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires(pre): %{kernel_prereq}\
|
||||
Requires(pre): %{initrd_prereq}\
|
||||
Requires(pre): linux-firmware >= 20150904-56.git6ebf5d57\
|
||||
Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
|
||||
Recommends: linux-firmware\
|
||||
Requires(preun): systemd >= 200\
|
||||
Conflicts: xfsprogs < 4.3.0-1\
|
||||
Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
|
||||
@ -1416,8 +1419,8 @@ ApplyOptionalPatch()
|
||||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.14.0-71.rt21.71.el9 -c
|
||||
mv linux-5.14.0-71.rt21.71.el9 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.14.0-72.rt21.72.el9 -c
|
||||
mv linux-5.14.0-72.rt21.72.el9 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
@ -1539,6 +1542,18 @@ done
|
||||
cp %{SOURCE82} .
|
||||
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
|
||||
|
||||
# We may want to override files from the primary target in case of building
|
||||
# against a flavour of it (eg. centos not rhel), thus override it here if
|
||||
# necessary
|
||||
if [ "%{primary_target}" == "rhel" ]; then
|
||||
%if 0%{?centos}
|
||||
echo "Updating scripts/sources to centos version"
|
||||
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh centos
|
||||
%else
|
||||
echo "Not updating scripts/sources to centos version"
|
||||
%endif
|
||||
fi
|
||||
|
||||
# end of kernel config
|
||||
%endif
|
||||
|
||||
@ -2313,6 +2328,14 @@ popd
|
||||
# in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr
|
||||
# but there's no way to tell the Makefile to take them from there.
|
||||
%{make} %{?_smp_mflags} headers_install
|
||||
|
||||
# If we re building only tools without kernel, we need to generate config
|
||||
# headers and prepare tree for modules building. The modules_prepare target
|
||||
# will cover both.
|
||||
if [ ! -f include/generated/autoconf.h ]; then
|
||||
%{make} %{?_smp_mflags} modules_prepare
|
||||
fi
|
||||
|
||||
%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/
|
||||
|
||||
# Prevent bpf selftests to build bpftool repeatedly:
|
||||
@ -3074,6 +3097,16 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Thu Mar 17 2022 Juri Lelli <juri.lelli@redhat.com> [5.14.0-72.rt21.72.el9]
|
||||
- Revert 8dffe2b6 "Merge: kabi: add lib ACKed symbols" (Čestmír Kalina) [2059972]
|
||||
- include/linux/kernel.h: fix function name for mark_hardware_unmaintained() if !CONFIG_RHEL_DIFFERENCES (Ewan D. Milne) [2059687]
|
||||
- scsi: sd: Mark ZBC host-managed SCSI disks as unmaintained (Ewan D. Milne) [2059687]
|
||||
- spec: make linux-firmware weak(er) dependency (Jan Stancek) [2031113]
|
||||
- redhat/configs: Enable CONFIG_INTEL_PCH_THERMAL for x86 (David Arcari) [2058186]
|
||||
- redhat/configs: Disable CONFIG_SURFACE_PLATFORMS (David Arcari) [2056609]
|
||||
- spec: Fix separate tools build (Jiri Olsa) [2054579]
|
||||
- redhat: use centos x509.genkey file if building under centos (Herton R. Krzesinski) [2029952]
|
||||
|
||||
* Wed Mar 09 2022 Juri Lelli <juri.lelli@redhat.com> [5.14.0-71.rt21.71.el9]
|
||||
- redhat: Update RTBZ for 9.1 cycle (Juri Lelli)
|
||||
- redhat: Add kernel-rt 9.1 changelog as a copy of 9.0 (Juri Lelli)
|
||||
|
||||
6
sources
6
sources
@ -1,4 +1,4 @@
|
||||
SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c
|
||||
SHA512 (linux-5.14.0-71.rt21.71.el9.tar.xz) = b0204f624ef2f047a8a07418eadc964e261c6f0970137b4037daef578852e23e759d4e1d26de49d93d74cc34ee3de3491dd32978ca23497007c96bc8c85645bb
|
||||
SHA512 (kernel-abi-stablelists-5.14.0-71.tar.bz2) = 36e9df09ca74edaaf7d5c81e8e3051748c33dc5ed8535078431b8e57b19bb9770b5a3f3a8036975568190330dc8094a45aa604fac57ed9210b454025ae3f4f6a
|
||||
SHA512 (kernel-kabi-dw-5.14.0-71.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914
|
||||
SHA512 (linux-5.14.0-72.rt21.72.el9.tar.xz) = 0e68898a04c542b06d7a55bccb0af6c514fda605bc0f7c7280ea50dead49c9505f423b510635f2bb33332158c9df35253ff6ff93078feffab9b0ac58880c42b7
|
||||
SHA512 (kernel-abi-stablelists-5.14.0-72.tar.bz2) = b364e28267f5efe364178f1a05c2665d438a993e0f142549b1242a1329d2220280e107ef89c4b21496df2b19adebcb3621a9ee2e3644d0b93a2054afd2bb096c
|
||||
SHA512 (kernel-kabi-dw-5.14.0-72.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914
|
||||
|
||||
16
x509.genkey.centos
Normal file
16
x509.genkey.centos
Normal file
@ -0,0 +1,16 @@
|
||||
[ req ]
|
||||
default_bits = 3072
|
||||
distinguished_name = req_distinguished_name
|
||||
prompt = no
|
||||
x509_extensions = myexts
|
||||
|
||||
[ req_distinguished_name ]
|
||||
O = The CentOS Project
|
||||
CN = CentOS Stream kernel signing key
|
||||
emailAddress = security@centos.org
|
||||
|
||||
[ myexts ]
|
||||
basicConstraints=critical,CA:FALSE
|
||||
keyUsage=digitalSignature
|
||||
subjectKeyIdentifier=hash
|
||||
authorityKeyIdentifier=keyid
|
||||
Loading…
Reference in New Issue
Block a user