Skip to content

Set kpatch/driver certs for all builds #1501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmastbergen merged 1 commit into from
Aug 4, 2026
+1 −25
Merged

Set kpatch/driver certs for all builds #1501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions ciq/SPECS/kernel-clk6.18.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,9 +1002,6 @@ Source8010: x509.genkey.rocky
%endif
%endif

# CIQ Kernel
%if 0%{?pe_signing_certkeyslot:1}

# CIQ Kernel will override above with CIQ certs
%define secureboot_ca_0 %{SOURCE8001}
%ifarch x86_64
Expand All @@ -1024,9 +1021,6 @@ Source8010: x509.genkey.rocky
%define uki_secureboot_key_0 %{SOURCE8009}
%endif

# 0%%{?pe_signing_certkeyslot:1}
%endif

# rhel && !eln
%endif

Expand Down Expand Up @@ -2182,32 +2176,18 @@ done
%if %{signkernel}%{signmodules}

%ifnarch noarch
# Add DUP and kpatch certificates to system trusted keys for RHEL
# Add DUP and kpatch certificates to system trusted keys
truncate -s0 ../certs/rhel.pem
%if 0%{?rhel}

%if 0%{?pe_signing_certkeyslot:1}

# Add DUP and kpatch certificates to system trusted keys for Rocky Linux from CIQ
%{log_msg "Add DUP and kpatch certificates to system trusted keys for Rocky Linux from CIQ"}
openssl x509 -inform der -in %{driver_cert} -out ciqkerneldup1.pem
openssl x509 -inform der -in %{kpatch_cert} -out ciqkernelkpatch1.pem
openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem
cat ciqkerneldup1.pem ciqkernelkpatch1.pem nvidiagpuoot001.pem > ../certs/ciqkernel.pem

%else

%if %{rhelkeys}
%{log_msg "Add DUP and kpatch certificates to system trusted keys for RHEL"}
openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem
cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem >> ../certs/rhel.pem
# rhelkeys
%endif

# 0%{?pe_signing_certkeyslot:1}
%endif
%if %{signkernel}
%ifarch s390x ppc64le
openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem
Expand All @@ -2222,11 +2202,7 @@ openssl x509 -inform der -in %{ima_ca_cert} -out imaca.pem
cat imaca.pem >> ../certs/rhel.pem

for i in *.config; do
%if 0%{?pe_signing_certkeyslot:1}
sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS=""@CONFIG_SYSTEM_TRUSTED_KEYS="certs/ciqkernel.pem"@' $i
%else
sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS=""@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i
%endif
sed -i 's@CONFIG_EFI_SBAT_FILE=""@CONFIG_EFI_SBAT_FILE="kernel.sbat"@' $i
done
# ifnarch noarch
Expand Down
Loading