Use AlmaLinux name in module signature and CONFIG_CRYPTO_FIPS_NAME
This commit is contained in:
parent
8f909af43c
commit
cb8342a91e
@ -5,9 +5,9 @@ prompt = no
|
||||
x509_extensions = myexts
|
||||
|
||||
[ req_distinguished_name ]
|
||||
O = The CentOS Project
|
||||
CN = CentOS Stream kernel signing key
|
||||
emailAddress = security@centos.org
|
||||
O = AlmaLinux
|
||||
CN = AlmaLinux kernel signing key
|
||||
emailAddress = security@almalinux.org
|
||||
|
||||
[ myexts ]
|
||||
basicConstraints=critical,CA:FALSE
|
||||
|
@ -1520,7 +1520,7 @@ done
|
||||
# Adjust FIPS module name for RHEL
|
||||
%if 0%{?rhel}
|
||||
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
|
||||
%endif
|
||||
|
||||
@ -1539,18 +1539,6 @@ done
|
||||
cp %{SOURCE82} .
|
||||
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
|
||||
%endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user