rpms/kernel-rt
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Use AlmaLinux name in module signature and CONFIG_CRYPTO_FIPS_NAME

Browse Source
This commit is contained in:
Andrew Lukoshko 2022-11-15 12:39:18 +00:00
parent 8f909af43c
commit cb8342a91e
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SOURCES/x509.genkey.centos
View File

@ -5,9 +5,9 @@ prompt = no
x509_extensions = myexts x509_extensions = myexts
[ req_distinguished_name ] [ req_distinguished_name ]
O = The CentOS Project O = AlmaLinux
CN = CentOS Stream kernel signing key CN = AlmaLinux kernel signing key
emailAddress = security@centos.org emailAddress = security@almalinux.org
[ myexts ] [ myexts ]
basicConstraints=critical,CA:FALSE basicConstraints=critical,CA:FALSE

14
SPECS/kernel.spec
View File

@ -1520,7 +1520,7 @@ done
# Adjust FIPS module name for RHEL # Adjust FIPS module name for RHEL
%if 0%{?rhel} %if 0%{?rhel}
for i in *.config; do for i in *.config; do
sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux %{rhel} - Kernel Cryptographic API"/' $i sed -i 's/CONFIG_CRYPTO_FIPS_NAME=.*/CONFIG_CRYPTO_FIPS_NAME="AlmaLinux %{rhel} - Kernel Cryptographic API"/' $i
done done
%endif %endif
@ -1539,18 +1539,6 @@ done
cp %{SOURCE82} . cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target} 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 # end of kernel config
%endif %endif