here we go again
This commit is contained in:
parent
0097070fdf
commit
ccc9ed0e84
11102
config-aarch64
11102
config-aarch64
File diff suppressed because it is too large
Load Diff
@ -33,7 +33,7 @@
|
|||||||
%global pkg_version %{LKAver}
|
%global pkg_version %{LKAver}
|
||||||
|
|
||||||
# Set pkg_release.
|
# Set pkg_release.
|
||||||
%global pkg_release %{release_v}%{?rc_ver:.rc%{rc_ver}}%{?next_snapshot_date:.next%{next_snapshot_date}}%{?buildid}%{?dist}
|
%global pkg_release %{?rc_ver:rc%{rc_ver}.}%{?next_snapshot_date:next%{next_snapshot_date}.}%{release_v}%{?buildid}%{?dist}
|
||||||
|
|
||||||
# Architectures upon which we can sign the kernel
|
# Architectures upon which we can sign the kernel
|
||||||
# for secure boot authentication.
|
# for secure boot authentication.
|
||||||
@ -141,7 +141,7 @@
|
|||||||
%define defconfig arch/%{asmarch}/configs/defconfig
|
%define defconfig arch/%{asmarch}/configs/defconfig
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define elconfig arch/%{asmarch}/configs/el.config
|
%define srcconfig %{_sourcedir}/config-$(uname -m)
|
||||||
|
|
||||||
%if %{with_vdso_install}
|
%if %{with_vdso_install}
|
||||||
%define use_vdso 1
|
%define use_vdso 1
|
||||||
@ -559,13 +559,12 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -n -p \
|
|||||||
|
|
||||||
mv COPYING COPYING-%{version}-%{release}
|
mv COPYING COPYING-%{version}-%{release}
|
||||||
|
|
||||||
cp %{_sourcedir}/config-$(uname -m) %{elconfig}
|
cp %{srcconfig} .config
|
||||||
|
|
||||||
# Set the EXTRAVERSION string in the top level Makefile.
|
# Set the EXTRAVERSION string in the top level Makefile.
|
||||||
sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile
|
sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile
|
||||||
|
|
||||||
%ifarch x86_64 || aarch64
|
%ifarch x86_64 || aarch64
|
||||||
./scripts/kconfig/merge_config.sh %{defconfig} %{elconfig}
|
|
||||||
%{__make} ARCH=%{bldarch} listnewconfig | grep -E '^CONFIG_' > newoptions-el9-%{_target_cpu}.txt || true
|
%{__make} ARCH=%{bldarch} listnewconfig | grep -E '^CONFIG_' > newoptions-el9-%{_target_cpu}.txt || true
|
||||||
if [ -s newoptions-el9-%{_target_cpu}.txt ]; then
|
if [ -s newoptions-el9-%{_target_cpu}.txt ]; then
|
||||||
cat newoptions-el9-%{_target_cpu}.txt
|
cat newoptions-el9-%{_target_cpu}.txt
|
||||||
@ -579,17 +578,17 @@ rm -vf .config*
|
|||||||
openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
|
openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
|
||||||
openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
|
openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
|
||||||
cat rheldup3.pem rhelkpatch1.pem > certs/rhel.pem
|
cat rheldup3.pem rhelkpatch1.pem > certs/rhel.pem
|
||||||
for i in %{elconfig}; do
|
for i in %{srcconfig}; do
|
||||||
sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i
|
sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i
|
||||||
done
|
done
|
||||||
%else
|
%else
|
||||||
for i in %{elconfig}; do
|
for i in %{srcconfig}; do
|
||||||
sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS=""@' $i
|
sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS=""@' $i
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Adjust the FIPS module name for RHEL9.
|
# Adjust the FIPS module name for RHEL9.
|
||||||
for i in %{elconfig}; do
|
for i in %{srcconfig}; do
|
||||||
sed -i 's@CONFIG_CRYPTO_FIPS_NAME=.*@CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux 9 - Kernel Cryptographic API"@' $i
|
sed -i 's@CONFIG_CRYPTO_FIPS_NAME=.*@CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux 9 - Kernel Cryptographic API"@' $i
|
||||||
done
|
done
|
||||||
|
|
||||||
@ -601,14 +600,14 @@ popd > /dev/null
|
|||||||
pushd linux-%{KVERREL} > /dev/null
|
pushd linux-%{KVERREL} > /dev/null
|
||||||
|
|
||||||
%ifarch x86_64 || aarch64
|
%ifarch x86_64 || aarch64
|
||||||
./scripts/kconfig/merge_config.sh %{defconfig} %{elconfig}
|
cp %{srcconfig} .config
|
||||||
|
|
||||||
%if %{signkernel} || %{signmodules}
|
%if %{signkernel} || %{signmodules}
|
||||||
cp %{SOURCE23} certs/
|
cp %{SOURCE23} certs/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_std}
|
%if %{with_std}
|
||||||
%{make} %{?_smp_mflags} ARCH=%{bldarch} %{make_target}
|
%{make} %{?_smp_mflags} ARCH=%{bldarch} olddefconfig %{make_target}
|
||||||
|
|
||||||
%{make} %{?_smp_mflags} ARCH=%{bldarch} modules || exit 1
|
%{make} %{?_smp_mflags} ARCH=%{bldarch} modules || exit 1
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
%global major_ver 6
|
%global major_ver 6
|
||||||
%global minor_ver 6
|
%global minor_ver 6
|
||||||
%global patch_ver 1
|
%global patch_ver 8
|
||||||
%global release_v 003
|
%global release_v 000
|
||||||
|
|
||||||
Name: kernel-stable
|
Name: kernel-stable
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user