Import OL
This commit is contained in:
		
							parent
							
								
									603e16deb0
								
							
						
					
					
						commit
						f48b332f08
					
				
							
								
								
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -1,6 +1,6 @@ | |||||||
| SOURCES/kernel-abi-stablelists-5.14.0-503.33.1.el9_5.tar.bz2 | SOURCES/kernel-abi-stablelists-5.14.0-503.34.1.el9_5.tar.bz2 | ||||||
| SOURCES/kernel-kabi-dw-5.14.0-503.33.1.el9_5.tar.bz2 | SOURCES/kernel-kabi-dw-5.14.0-503.34.1.el9_5.tar.bz2 | ||||||
| SOURCES/linux-5.14.0-503.33.1.el9_5.tar.xz | SOURCES/linux-5.14.0-503.34.1.el9_5.tar.xz | ||||||
| SOURCES/nvidiagpuoot001.x509 | SOURCES/nvidiagpuoot001.x509 | ||||||
| SOURCES/olima1.x509 | SOURCES/olima1.x509 | ||||||
| SOURCES/olimaca1.x509 | SOURCES/olimaca1.x509 | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| 74ef2bfc9416a37cd87627462e02fd6151301209 SOURCES/kernel-abi-stablelists-5.14.0-503.33.1.el9_5.tar.bz2 | 2db3601b42f0d46a7fe648e5a6c062fe380e37e2 SOURCES/kernel-abi-stablelists-5.14.0-503.34.1.el9_5.tar.bz2 | ||||||
| b529f954bba06ca49a62e57c3db4f93bd2ee30c2 SOURCES/kernel-kabi-dw-5.14.0-503.33.1.el9_5.tar.bz2 | 0a98fb5b1c1d2c14cd9c7034569fe87d891843df SOURCES/kernel-kabi-dw-5.14.0-503.34.1.el9_5.tar.bz2 | ||||||
| bed437b4a5784c6136bd6658ea097b11f3106ffb SOURCES/linux-5.14.0-503.33.1.el9_5.tar.xz | 839b509b426c2c0a7246c107c15e1649bb5566f8 SOURCES/linux-5.14.0-503.34.1.el9_5.tar.xz | ||||||
| 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 | 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 | ||||||
| 706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509 | 706ae01dd14efa38f0f565a3706acac19c78df02 SOURCES/olima1.x509 | ||||||
| 6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509 | 6e3f0d61414c0b50f48dc2d4c3b3cd024e1c3a43 SOURCES/olimaca1.x509 | ||||||
|  | |||||||
							
								
								
									
										59
									
								
								SOURCES/1000-debrand-some-messages.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								SOURCES/1000-debrand-some-messages.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,59 @@ | |||||||
|  | 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 | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
| @ -12,7 +12,7 @@ RHEL_MINOR = 5 | |||||||
| #
 | #
 | ||||||
| # 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 = 503.33.1 | RHEL_RELEASE = 503.34.1 | ||||||
| 
 | 
 | ||||||
| #
 | #
 | ||||||
| # ZSTREAM
 | # ZSTREAM
 | ||||||
|  | |||||||
							
								
								
									
										19
									
								
								SOURCES/bug34729535-change-certified-hw-message.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								SOURCES/bug34729535-change-certified-hw-message.patch
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,19 @@ | |||||||
|  | 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(); | ||||||
| @ -1,3 +1,8 @@ | |||||||
|  | * Mon Mar 17 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-503.34.1.el9_5] | ||||||
|  | - arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array (CKI Backport Bot) [RHEL-82734] {CVE-2025-21785} | ||||||
|  | - crypto: rng - Fix extrng EFAULT handling (Herbert Xu) [RHEL-70643] | ||||||
|  | Resolves: RHEL-70643, RHEL-82734 | ||||||
|  | 
 | ||||||
| * Wed Mar 12 2025 Chao YE <cye@redhat.com> [5.14.0-503.33.1.el9_5] | * Wed Mar 12 2025 Chao YE <cye@redhat.com> [5.14.0-503.33.1.el9_5] | ||||||
| - scsi: st: New session only when Unit Attention for new tape (John Meneghini) [RHEL-62266] | - scsi: st: New session only when Unit Attention for new tape (John Meneghini) [RHEL-62266] | ||||||
| - scsi: st: Add MTIOCGET and MTLOAD to ioctls allowed after device reset (John Meneghini) [RHEL-62266] | - scsi: st: Add MTIOCGET and MTLOAD to ioctls allowed after device reset (John Meneghini) [RHEL-62266] | ||||||
|  | |||||||
							
								
								
									
										24
									
								
								SOURCES/olkmod_signing_key.pem
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								SOURCES/olkmod_signing_key.pem
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,24 @@ | |||||||
|  | -----BEGIN CERTIFICATE----- | ||||||
|  | MIIEETCCAvmgAwIBAgIJANw8y5k9b7SaMA0GCSqGSIb3DQEBCwUAMIGeMQswCQYD | ||||||
|  | VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEXMBUGA1UEBwwOUmVkd29vZCBT | ||||||
|  | aG9yZXMxGzAZBgNVBAoMEk9yYWNsZSBDb3Jwb3JhdGlvbjEVMBMGA1UECwwMT3Jh | ||||||
|  | Y2xlIExpbnV4MS0wKwYDVQQDDCRPcmFjbGUgTGludXggUkhDSyBNb2R1bGUgU2ln | ||||||
|  | bmluZyBLZXkwHhcNMTYwNTA5MjMzNjA4WhcNMjYwNTA3MjMzNjA4WjCBnjELMAkG | ||||||
|  | A1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFzAVBgNVBAcMDlJlZHdvb2Qg | ||||||
|  | U2hvcmVzMRswGQYDVQQKDBJPcmFjbGUgQ29ycG9yYXRpb24xFTATBgNVBAsMDE9y | ||||||
|  | YWNsZSBMaW51eDEtMCsGA1UEAwwkT3JhY2xlIExpbnV4IFJIQ0sgTW9kdWxlIFNp | ||||||
|  | Z25pbmcgS2V5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl6bUDNNZ | ||||||
|  | jIqgsqgspwBIQ18keDxQeGnWgubZZhHrQU3GpeSRPM4lNTHc+UjMjNXrv/CENZdv | ||||||
|  | 4cETRsxT1VFhGG3CvkbQdzc8v4JOQvWSSJqmViPa1eC+yGaMRnGcFXzKsHiTLA4y | ||||||
|  | WMjpJnVowFkwTzscRBlN0AysUg/hT/74DE0oqVnlCJNynqccNWpx8MtNRD55ay9A | ||||||
|  | 73yJinYES14rXcU3QbJoO0ZxtRz83ZACDUGX0GORT3+NbB0RK0sttogzA3eLvxKw | ||||||
|  | umWsWZAHmTuHdWgUjSqqZr34VNLPVcsTHAW8X4bq6rRVcB2lMJ3kJfDP8BJyTn99 | ||||||
|  | 37UmA+/ld47cnwIDAQABo1AwTjAdBgNVHQ4EFgQU3ZlbFVwZs6fD73cHuWniX5Y5 | ||||||
|  | Zm4wHwYDVR0jBBgwFoAU3ZlbFVwZs6fD73cHuWniX5Y5Zm4wDAYDVR0TBAUwAwEB | ||||||
|  | /zANBgkqhkiG9w0BAQsFAAOCAQEAF7nfhWfsk4uEDquLj7nJE0wPlVvllVDugzOk | ||||||
|  | R15pnQ7P+HTyz3sLaLJE4N5oWt6pFzDGDYEtPeoMCn1l447tX179Nf5SMZba9ut8 | ||||||
|  | 3Vxbe7jAn9sQO7ArQR1swf1r101Me4+1oHq7rxPRizOOXrKeEvf5NSAUbSzzXfz6 | ||||||
|  | TEp21KTIQO7MjqpsKshRQbpPeiReaYy3A6gJftun5xekP04QTLZVBR4dL7tvZf0S | ||||||
|  | y9SjVg158lONXHfjBekyYTzSFBn/7v+AS8S+cAGRfYteE0Syxl7zJt3GUoEWau/e | ||||||
|  | kXHT+hd/hkdSQKZZWZo1380M1pVZZAvntLRBU6IN9SswafhiVg== | ||||||
|  | -----END CERTIFICATE----- | ||||||
| @ -5,9 +5,9 @@ prompt = no | |||||||
| x509_extensions = myexts | x509_extensions = myexts | ||||||
| 
 | 
 | ||||||
| [ req_distinguished_name ] | [ req_distinguished_name ] | ||||||
| O = Red Hat | O = Oracle America, Inc.,c=US | ||||||
| CN = Red Hat Enterprise Linux kernel signing key | CN = Oracle CA Server | ||||||
| emailAddress = secalert@redhat.com | emailAddress = support@oracle.com | ||||||
| 
 | 
 | ||||||
| [ myexts ] | [ myexts ] | ||||||
| basicConstraints=critical,CA:FALSE | basicConstraints=critical,CA:FALSE | ||||||
|  | |||||||
							
								
								
									
										80
									
								
								SPECS/kernel.spec
									
									
									
									
									
										
										
										Normal file → Executable file
									
								
							
							
						
						
									
										80
									
								
								SPECS/kernel.spec
									
									
									
									
									
										
										
										Normal file → Executable 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 aarch64 s390x ppc64le | %define secure_boot_arch x86_64 s390x ppc64le | ||||||
| %endif | %endif | ||||||
| 
 | 
 | ||||||
| # Signing for secure boot authentication | # Signing for secure boot authentication | ||||||
| @ -165,15 +165,15 @@ Summary: The Linux kernel | |||||||
| # define buildid .local | # define buildid .local | ||||||
| %define specversion 5.14.0 | %define specversion 5.14.0 | ||||||
| %define patchversion 5.14 | %define patchversion 5.14 | ||||||
| %define pkgrelease 503.33.1 | %define pkgrelease 503.34.1 | ||||||
| %define kversion 5 | %define kversion 5 | ||||||
| %define tarfile_release 5.14.0-503.33.1.el9_5 | %define tarfile_release 5.14.0-503.34.1.el9_5 | ||||||
| # This is needed to do merge window version magic | # This is needed to do merge window version magic | ||||||
| %define patchlevel 14 | %define patchlevel 14 | ||||||
| # This allows pkg_release to have configurable %%{?dist} tag | # This allows pkg_release to have configurable %%{?dist} tag | ||||||
| %define specrelease 503.33.1%{?buildid}%{?dist} | %define specrelease 503.34.1%{?buildid}%{?dist} | ||||||
| # This defines the kabi tarball version | # This defines the kabi tarball version | ||||||
| %define kabiversion 5.14.0-503.33.1.el9_5 | %define kabiversion 5.14.0-503.34.1.el9_5 | ||||||
| 
 | 
 | ||||||
| # | # | ||||||
| # End of genspec.sh variables | # End of genspec.sh variables | ||||||
| @ -645,6 +645,9 @@ 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 | ||||||
| @ -793,8 +796,6 @@ BuildRequires: WALinuxAgent-cvm | |||||||
| # For UKI sb cert | # For UKI sb cert | ||||||
| %if 0%{?centos} | %if 0%{?centos} | ||||||
| BuildRequires: centos-sb-certs >= 9.0-23 | BuildRequires: centos-sb-certs >= 9.0-23 | ||||||
| %else |  | ||||||
| BuildRequires: redhat-sb-certs >= 9.4-0.1 |  | ||||||
| %endif | %endif | ||||||
| %endif | %endif | ||||||
| 
 | 
 | ||||||
| @ -811,30 +812,10 @@ Source2: kernel.changelog | |||||||
| 
 | 
 | ||||||
| %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 | ||||||
| 
 | 
 | ||||||
| %if 0%{?centos} | %define pesign_name_0 OracleSecureBootkernelsigningkey2 | ||||||
| %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 | ||||||
| @ -919,14 +900,20 @@ Source102: rhelimaca1.x509 | |||||||
| Source103: rhelima.x509 | Source103: rhelima.x509 | ||||||
| Source104: rhelima_centos.x509 | Source104: rhelima_centos.x509 | ||||||
| Source105: nvidiagpuoot001.x509 | Source105: nvidiagpuoot001.x509 | ||||||
|  | # Oracle Linux IMA CA certificate | ||||||
|  | Source106: olimaca1.x509 | ||||||
|  | # Oracle Linux IMA signing certificate | ||||||
|  | Source107: 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 %{SOURCE107} | ||||||
| %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 | ||||||
| 
 | 
 | ||||||
| @ -966,6 +953,9 @@ 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} | ||||||
| @ -973,8 +963,12 @@ Source4002: gating.yaml | |||||||
| 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 | ||||||
| 
 | 
 | ||||||
| @ -1713,6 +1707,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 | ||||||
| 
 | 
 | ||||||
| # END OF PATCH APPLICATIONS | # END OF PATCH APPLICATIONS | ||||||
| @ -1792,6 +1787,11 @@ 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 | ||||||
| openssl x509 -inform der -in %{SOURCE105} -out nvidiagpuoot001.pem | openssl x509 -inform der -in %{SOURCE105} -out nvidiagpuoot001.pem | ||||||
| cat rheldup3.pem rhelkpatch1.pem rhelimaca1.pem nvidiagpuoot001.pem > ../certs/rhel.pem | cat rheldup3.pem rhelkpatch1.pem rhelimaca1.pem nvidiagpuoot001.pem > ../certs/rhel.pem | ||||||
|  | # Add Oracle Linux IMA CA certificate to the kernel trusted certificates list | ||||||
|  | openssl x509 -inform der -in %{SOURCE106} -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 | ||||||
| @ -2459,8 +2459,11 @@ BuildKernel() { | |||||||
| %endif | %endif | ||||||
|         SBAT=$(cat <<- EOF |         SBAT=$(cat <<- EOF | ||||||
| 	linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com | 	linux,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com | ||||||
|  | 	linux,1,Oracle Linux,linux,$KernelVer,mailto:secalert_us@oracle.com | ||||||
| 	linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com | 	linux.$SBATsuffix,1,Red Hat,linux,$KernelVer,mailto:secalert@redhat.com | ||||||
|  | 	linux.ol,1,Oracle Linux,linux,$KernelVer,mailto:secalert_us@oracle.com | ||||||
| 	kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com | 	kernel-uki-virt.$SBATsuffix,1,Red Hat,kernel-uki-virt,$KernelVer,mailto:secalert@redhat.com | ||||||
|  | 	kernel-uki-virt.ol,1,Oracle Linux,kernel-uki-virt,$KernelVer,mailto:secalert_us@oracle.com | ||||||
| 	EOF | 	EOF | ||||||
| 	) | 	) | ||||||
| 
 | 
 | ||||||
| @ -2486,7 +2489,7 @@ BuildKernel() { | |||||||
|         python3 %{SOURCE151} %{SOURCE152} $KernelAddonsDirOut virt %{primary_target} %{_target_cpu} |         python3 %{SOURCE151} %{SOURCE152} $KernelAddonsDirOut virt %{primary_target} %{_target_cpu} | ||||||
| 
 | 
 | ||||||
| %if %{signkernel} | %if %{signkernel} | ||||||
| 
 | %if ! %{?oraclelinux} | ||||||
| %if 0%{?centos} | %if 0%{?centos} | ||||||
| 	UKI_secureboot_name=centossecureboot204 | 	UKI_secureboot_name=centossecureboot204 | ||||||
| %else | %else | ||||||
| @ -2508,6 +2511,7 @@ BuildKernel() { | |||||||
|       done |       done | ||||||
| 
 | 
 | ||||||
| # signkernel | # signkernel | ||||||
|  | %endif | ||||||
| %endif | %endif | ||||||
| 
 | 
 | ||||||
|         pushd $RPM_BUILD_ROOT |         pushd $RPM_BUILD_ROOT | ||||||
| @ -2585,7 +2589,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 | ||||||
| 
 | 
 | ||||||
|     # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel |     # 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 | ||||||
| @ -2599,6 +2603,8 @@ 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} | ||||||
| @ -3791,6 +3797,20 @@ fi | |||||||
| # | # | ||||||
| # | # | ||||||
| %changelog | %changelog | ||||||
|  | * Wed Mar 26 2025 Darren Archibald <darren.archibald@oracle.com> [5.14.0-503.34.1.el9_5.OL9] | ||||||
|  | - Disable UKI signing [Orabug: 36571828] | ||||||
|  | - 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 upstream reference during boot (Kevin Lyons) [Orabug: 34729535] | ||||||
|  | - Add Oracle Linux IMA certificates | ||||||
|  | 
 | ||||||
|  | * Mon Mar 17 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-503.34.1.el9_5] | ||||||
|  | - arm64: cacheinfo: Avoid out-of-bounds write to cacheinfo array (CKI Backport Bot) [RHEL-82734] {CVE-2025-21785} | ||||||
|  | - crypto: rng - Fix extrng EFAULT handling (Herbert Xu) [RHEL-70643] | ||||||
|  | 
 | ||||||
| * Wed Mar 12 2025 Chao YE <cye@redhat.com> [5.14.0-503.33.1.el9_5] | * Wed Mar 12 2025 Chao YE <cye@redhat.com> [5.14.0-503.33.1.el9_5] | ||||||
| - scsi: st: New session only when Unit Attention for new tape (John Meneghini) [RHEL-62266] | - scsi: st: New session only when Unit Attention for new tape (John Meneghini) [RHEL-62266] | ||||||
| - scsi: st: Add MTIOCGET and MTLOAD to ioctls allowed after device reset (John Meneghini) [RHEL-62266] | - scsi: st: Add MTIOCGET and MTLOAD to ioctls allowed after device reset (John Meneghini) [RHEL-62266] | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user