jonathan/kernel
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

Revert OL changes

Browse Source
This commit is contained in:
Eduard Abdullin 2024-03-20 11:13:42 +03:00
parent f2ae0ff58e
commit f231af178e
4 changed files with 37 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
SOURCES/1000-debrand-some-messages.patch
View File

@ -1,58 +0,0 @@
From 6ca79c451f7508fc1916113fd0cdba2140c14818 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Wed, 20 Sep 2023 14:16:05 -0700
Subject: [PATCH] debrand some messages
Modified-by: Alex Burmashev <alexander.burmashev@oracle.com>
---
kernel/rh_shadowman.c | 55 ++++++++++++++++++++++---------------------
4 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/kernel/rh_shadowman.c b/kernel/rh_shadowman.c
index 018d5c633..d05ea0790 100644
--- a/kernel/rh_shadowman.c
+++ b/kernel/rh_shadowman.c
@@ -1,39 +1 @@
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/printk.h>
-
-/* Display a shadowman logo on the console screen */
-static int __init rh_shadowman(char *str)
-{
- pr_info("RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRRRRRRRrrrrrrrrrrrrrrrORHRrrHRRRRRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRRRRRHrr8rrrrrrrrrrrrrrrrrrrrhRRRRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRHRRRRRRRRRRRrrHRHRRRHHHrrrrrrrrrrrrrHRRRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRRRRHrrrrrHrrrrrrrrrrrrrrrrrrrrRRRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRHh88hhRHrrrrrrrrrrrrrrrrrrrrrrrrrrHRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRRrrrrrrrrrRHRH8rrrrrrrrrrrrrrrrrrrrrrr8RRRRRRRRRRRRRRRR\n");
- pr_info("RRRRH8rrrrrrrrrrRHRRRRRRRRRHrrrrrrrrrrrrrrrrRrhHRHRRRRRRRRRR\n");
- pr_info("RRRRRROrrrrrrrrrrrORRRRRRRRRRRrrrrrrrrrrrrrHrrrrrrhRRRRRRRRR\n");
- pr_info("RRRRRRRROrrrrrrrrrrrrrrr8RRRRHRrrrrrrrrrrrrrrrrrrrrrHRRRRRRR\n");
- pr_info("RRRRRRRRRRRRRHhrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRH. .HHHrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRR. .RRhRRHH8rrrrrrrrrrrrrrrrrrrrr8RRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRR~ .RRRRRRRRRHHh8OOOOO8HRRHRRRRRRRRRRRRRRR\n");
- pr_info("R,```` RRR8 .hHRRRh\\hHH:=HRh.RRRRRRRRRRRRRRRRRRR\n");
- pr_info("RR ORRRRRRRRRRRRRRRRRR\n");
- pr_info("RRR ,HHtaa HRRRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRO. .RRRRO. . .RRRRRRR\n");
- pr_info("RRRRRR ,RRHh, :RRRRRRRR\n");
- pr_info("RRRRRRRR HRR :RRRRRRRRRR\n");
- pr_info("RRRRRRRRRRr .. ,RRRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRRt . .HRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRRRRRRr. =RRRRRRRRRRRRRRRRRRRR\n");
- pr_info("RRRRRRRRRRRRRRRRRRRRRRRRHHr: .:tRhRRRRRRRRRRRRRRRRRRRRRRRRRR\n");
- pr_info(" ");
- pr_info(" Long Live Shadowman!");
- pr_info("576527726520686972696e6721a68747470733a2f2f7777772e7265646861742e636f6d2f6a6f6273");
- pr_info(" ");
- return 1;
-}
-
-__setup("shadowman", rh_shadowman);
+// This file has been intentionally left blank
--
2.41.0

19
SOURCES/bug34729535-change-certified-hw-message.patch
View File

@ -1,19 +0,0 @@
Update message about certified hardware list.
Orabug: 34729535
Signed-off-by: Kevin Lyons <kevin.x.lyons@oracle.com>
Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
---
diff -ruN linux-5.14.0-160.el8.x86_64.orig/init/main.c linux-5.14.0-160.el8.x86_64/init/main.c
--- linux-5.14.0-160.el8.x86_64.orig/init/main.c 2022-08-25 13:57:06.000000000 -0700
+++ linux-5.14.0-160.el8.x86_64/init/main.c 2022-10-26 13:15:39.700724777 -0700
@@ -936,7 +936,7 @@
boot_cpu_init();
page_address_init();
pr_notice("%s", linux_banner);
- pr_notice("The list of certified hardware and cloud instances for Red Hat Enterprise Linux 9 can be viewed at the Red Hat Ecosystem Catalog, https://catalog.redhat.com.\n");
+ pr_notice("The list of certified hardware for Oracle Linux 9 can be viewed at the Oracle Linux Certification List https://linux.oracle.com/hardware-certifications\n");
early_security_init();
setup_arch(&command_line);
setup_boot_config();

6
SOURCES/x509.genkey.rhel
View File

@ -5,9 +5,9 @@ prompt = no
x509_extensions = myexts x509_extensions = myexts
[ req_distinguished_name ] [ req_distinguished_name ]
O = Oracle America, Inc.,c=US O = Red Hat
CN = Oracle CA Server CN = Red Hat Enterprise Linux kernel signing key
emailAddress = support@oracle.com emailAddress = secalert@redhat.com
[ myexts ] [ myexts ]
basicConstraints=critical,CA:FALSE basicConstraints=critical,CA:FALSE

77
SPECS/kernel.spec
View File

@ -104,7 +104,7 @@ Summary: The Linux kernel
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
%else %else
%define secure_boot_arch x86_64 s390x ppc64le %define secure_boot_arch x86_64 aarch64 s390x ppc64le
%endif %endif
# Signing for secure boot authentication # Signing for secure boot authentication
@ -124,11 +124,11 @@ Summary: The Linux kernel
%global zipmodules 1 %global zipmodules 1
%endif %endif
#%ifarch x86_64 %ifarch x86_64
#%global efiuki 1 %global efiuki 1
#%else %else
%global efiuki 0 %global efiuki 0
#%endif %endif
%if %{zipmodules} %if %{zipmodules}
%global zipsed -e 's/\.ko$/\.ko.xz/' %global zipsed -e 's/\.ko$/\.ko.xz/'
@ -643,9 +643,6 @@ Requires: kernel-modules-core-uname-r = %{KVERREL}
Provides: installonlypkg(kernel) Provides: installonlypkg(kernel)
%endif %endif
Provides: oracle(kernel-sig-key) == 202204
Conflicts: shim-ia32 <= 15.3-1.0.5.el9
Conflicts: shim-x64 <= 15.3-1.0.5.el9
# #
# List the packages used during the kernel build # List the packages used during the kernel build
@ -802,10 +799,30 @@ Source1: Makefile.rhelver
%if %{signkernel} %if %{signkernel}
# Name of the packaged file containing signing key
%ifarch ppc64le
%define signing_key_filename kernel-signing-ppc.cer
%endif
%ifarch s390x
%define signing_key_filename kernel-signing-s390.cer
%endif
%define secureboot_ca_0 %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer %define secureboot_ca_0 %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer
%define secureboot_key_0 %{_datadir}/pki/sb-certs/secureboot-kernel-%{_arch}.cer %define secureboot_key_0 %{_datadir}/pki/sb-certs/secureboot-kernel-%{_arch}.cer
%define pesign_name_0 OracleSecureBootkernelsigningkey2 %if 0%{?centos}
%define pesign_name_0 centossecureboot201
%else
%ifarch x86_64 aarch64
%define pesign_name_0 redhatsecureboot501
%endif
%ifarch s390x
%define pesign_name_0 redhatsecureboot302
%endif
%ifarch ppc64le
%define pesign_name_0 redhatsecureboot701
%endif
%endif
# signkernel # signkernel
%endif %endif
@ -889,26 +906,19 @@ Source101: rhelkpatch1.x509
Source102: rhelimaca1.x509 Source102: rhelimaca1.x509
Source103: rhelima.x509 Source103: rhelima.x509
Source104: rhelima_centos.x509 Source104: rhelima_centos.x509
# Oracle Linux IMA CA certificate
Source105: olimaca1.x509
# Oracle Linux IMA signing certificate
Source106: olima1.x509
%if 0%{?centos} %if 0%{?centos}
%define ima_signing_cert %{SOURCE104} %define ima_signing_cert %{SOURCE104}
%else %else
%define ima_signing_cert %{SOURCE103} %define ima_signing_cert %{SOURCE103}
%define ima_signing_cert_ol %{SOURCE106}
%endif %endif
%define ima_cert_name ima.cer %define ima_cert_name ima.cer
%define ima_cert_name_ol ima_ol.cer
Source150: dracut-virt.conf Source150: dracut-virt.conf
# Remove this when https://bugzilla.redhat.com/show_bug.cgi?id=2225009 gets resolved # Remove this when https://bugzilla.redhat.com/show_bug.cgi?id=2225009 gets resolved
#Source151: uki-sb-cert-x86_64-centos.crt Source151: uki-sb-cert-x86_64-centos.crt
#Source152: uki-sb-cert-x86_64-rhel.crt Source152: uki-sb-cert-x86_64-rhel.crt
Source200: check-kabi Source200: check-kabi
@ -943,9 +953,6 @@ Source4000: README.rst
Source4001: rpminspect.yaml Source4001: rpminspect.yaml
Source4002: gating.yaml Source4002: gating.yaml
# Oracle Linux RHCK Module Signing Key
Source5001: olkmod_signing_key.pem
## Patches needed for building this package ## Patches needed for building this package
%if !%{nopatches} %if !%{nopatches}
@ -953,12 +960,8 @@ Source5001: olkmod_signing_key.pem
Patch1: patch-%{patchversion}-redhat.patch Patch1: patch-%{patchversion}-redhat.patch
%endif %endif
# Oracle patches
Patch1000: bug34729535-change-certified-hw-message.patch
# empty final patch to facilitate testing of kernel patches # empty final patch to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch Patch999999: linux-kernel-test.patch
Patch1000000: 1000-debrand-some-messages.patch
# END OF PATCH DEFINITIONS # END OF PATCH DEFINITIONS
@ -1219,7 +1222,7 @@ This package provides debug information for the bpftool package.
%package selftests-internal %package selftests-internal
Summary: Kernel samples and selftests Summary: Kernel samples and selftests
License: GPLv2 License: GPLv2
Requires: binutils, bpftool, iproute-tc, python3, fuse-libs, keyutils Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3, fuse-libs, keyutils
%description selftests-internal %description selftests-internal
Kernel sample programs and selftests. Kernel sample programs and selftests.
@ -1694,9 +1697,7 @@ cp -a %{SOURCE1} .
ApplyOptionalPatch patch-%{patchversion}-redhat.patch ApplyOptionalPatch patch-%{patchversion}-redhat.patch
%endif %endif
ApplyPatch bug34729535-change-certified-hw-message.patch
ApplyOptionalPatch linux-kernel-test.patch ApplyOptionalPatch linux-kernel-test.patch
ApplyOptionalPatch 1000-debrand-some-messages.patch
# END OF PATCH APPLICATIONS # END OF PATCH APPLICATIONS
@ -1774,11 +1775,6 @@ openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
openssl x509 -inform der -in %{SOURCE102} -out rhelimaca1.pem openssl x509 -inform der -in %{SOURCE102} -out rhelimaca1.pem
cat rheldup3.pem rhelkpatch1.pem rhelimaca1.pem > ../certs/rhel.pem cat rheldup3.pem rhelkpatch1.pem rhelimaca1.pem > ../certs/rhel.pem
# Add Oracle Linux IMA CA certificate to the kernel trusted certificates list
openssl x509 -inform der -in %{SOURCE105} -out olimaca1.pem
cat olimaca1.pem >> ../certs/rhel.pem
# Add olkmod_signing_key.pem to the kernel trusted certificates list
cat %{SOURCE5001} >> ../certs/rhel.pem
%if %{signkernel} %if %{signkernel}
%ifarch s390x ppc64le %ifarch s390x ppc64le
openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem
@ -2579,7 +2575,7 @@ BuildKernel() {
# prune junk from kernel-devel # prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete
# UEFI Secure Boot CA cert, which can be used to authenticate the kernel # 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 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer
%if %{signkernel} %if %{signkernel}
install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer
@ -2593,8 +2589,6 @@ BuildKernel() {
%if 0%{?rhel} %if 0%{?rhel}
# Red Hat IMA code-signing cert, which is used to authenticate package files # Red Hat IMA code-signing cert, which is used to authenticate package files
install -m 0644 %{ima_signing_cert} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/%{ima_cert_name} install -m 0644 %{ima_signing_cert} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/%{ima_cert_name}
# Oracle Linux IMA signing cert
install -m 0644 %{ima_signing_cert_ol} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/%{ima_cert_name_ol}
%endif %endif
%if %{signmodules} %if %{signmodules}
@ -3760,17 +3754,6 @@ fi
# #
# #
%changelog %changelog
* Fri Mar 15 2024 Craig Guiller <craig.guiller@oracle.com> - [5.14.0-362.24.1.el9_3.OL9]
- Update Oracle Linux certificates (Kevin Lyons)
- Disable signing for aarch64 (Ilya Okomin)
- Oracle Linux RHCK Module Signing Key was added to the kernel trusted keys list (olkmod_signing_key.pem) [Orabug: 29539237]
- Update x509.genkey [Orabug: 24817676]
- Conflict with shim-ia32 and shim-x64 <= 15.3-1.0.5.el9
- Remove nmap references from kernel (Mridula Shastry) [Orabug: 34313944]
- Remove upstream reference during boot (Kevin Lyons) [Orabug: 34729535]
- Disable unified kernel image package build
- Add Oracle Linux IMA certificates
* Thu Feb 15 2024 Jan Stancek <jstancek@redhat.com> [5.14.0-362.24.1.el9_3] * Thu Feb 15 2024 Jan Stancek <jstancek@redhat.com> [5.14.0-362.24.1.el9_3]
- RDMA/mlx5: Fix assigning access flags to cache mkeys (Mohammad Kabat) [RHEL-25242 RHEL-882] - RDMA/mlx5: Fix assigning access flags to cache mkeys (Mohammad Kabat) [RHEL-25242 RHEL-882]
- drm/amdgpu: Fix potential fence use-after-free v2 (Jan Stancek) [RHEL-24501 RHEL-24504 RHEL-22506 RHEL-22507] {CVE-2023-51042} - drm/amdgpu: Fix potential fence use-after-free v2 (Jan Stancek) [RHEL-24501 RHEL-24504 RHEL-22506 RHEL-22507] {CVE-2023-51042}