diff --git a/SOURCES/almalinuxdup1.x509 b/SOURCES/almalinuxdup1.x509 new file mode 100644 index 0000000..2972014 Binary files /dev/null and b/SOURCES/almalinuxdup1.x509 differ diff --git a/SOURCES/almalinuxkpatch1.x509 b/SOURCES/almalinuxkpatch1.x509 new file mode 100644 index 0000000..1292610 Binary files /dev/null and b/SOURCES/almalinuxkpatch1.x509 differ diff --git a/SOURCES/x509.genkey b/SOURCES/x509.genkey index b1bbe38..4c34491 100644 --- a/SOURCES/x509.genkey +++ b/SOURCES/x509.genkey @@ -5,9 +5,9 @@ prompt = no x509_extensions = myexts [ req_distinguished_name ] -O = Red Hat -CN = Red Hat Enterprise Linux kernel signing key -emailAddress = secalert@redhat.com +O = AlmaLinux +CN = AlmaLinux kernel signing key +emailAddress = security@almalinux.org [ myexts ] basicConstraints=critical,CA:FALSE diff --git a/SPECS/kernel-ml-6.8.spec b/SPECS/kernel-ml-6.8.spec index 9534153..c4e71b3 100644 --- a/SPECS/kernel-ml-6.8.spec +++ b/SPECS/kernel-ml-6.8.spec @@ -55,13 +55,6 @@ %global signmodules 0 %endif -### BCAT -# Further investigation is required before these features -# are enabled for the ELRepo Project kernels. -%global signkernel 0 -%global signmodules 0 -### BCAT - # Compress modules on all architectures that build modules. %ifarch x86_64 || aarch64 %global zipmodules 1 @@ -159,7 +152,7 @@ %define initrd_prereq dracut >= 027 Name: kernel-ml -Summary: The Linux kernel. (The core of any Linux kernel based operating system.) +Summary: Alternative AlmaLinux kernel based on the "mainline" branch. (The core of any Linux kernel based operating system.) License: GPLv2 and Redistributable, no modification permitted. URL: https://www.kernel.org/ Version: %{pkg_version} @@ -237,24 +230,18 @@ Source34: filter-x86_64.sh Source37: filter-aarch64.sh Source40: filter-modules.sh -Source100: rheldup3.x509 -Source101: rhelkpatch1.x509 +Source100: almalinuxdup1.x509 +Source101: almalinuxkpatch1.x509 Source2000: cpupower.service Source2001: cpupower.config Source2002: kvm_stat.logrotate -# Do not package the source tarball. -# To build .src.rpm, run with '--with src' -%if %{?_with_src:0}%{!?_with_src:1} -NoSource: 0 -%endif - %if %{signkernel} %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 pesign_name_0 redhatsecureboot501 +%define pesign_name_0 almalinuxsecurebootca0 %endif %description @@ -715,7 +702,9 @@ popd > /dev/null %define __modsign_install_post \ if [ "%{signmodules}" -eq "1" ]; then \ if [ "%{with_std}" -ne "0" ]; then \ + cd linux-%{KVERREL} \ %{SOURCE21} certs/signing_key.pem.sign certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \ + cd - \ fi \ fi \ if [ "%{zipmodules}" -eq "1" ]; then \