diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec index 0535623..3502e93 100644 --- a/SPECS/kernel-6.1.spec +++ b/SPECS/kernel-6.1.spec @@ -49,7 +49,7 @@ %endif # Set pkg_release. -%global pkg_release 10%{?buildid}.%{?lvc}%{?dist}.inferit.fuzzing +%global pkg_release 11%{?buildid}.%{?lvc}%{?dist}.inferit.fuzzing # Architectures upon which we can sign the kernel # for secure boot authentication. @@ -620,7 +620,29 @@ cd .. # Set the EXTRAVERSION string in the top level Makefile. sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile -cp configs/config-%{version}-%{_target_cpu}.config .config +%ifarch x86_64 +declare -a config_files=( + "configs/config-%{version}-x86_64.config" + "configs/config-%{version}-x86_64-kasan.config" + "configs/config-%{version}-x86_64-kmsan.config" + "configs/config-%{version}-x86_64-kmemleak.config" +) +%endif + +%ifarch aarch64 +declare -a config_files=( + "configs/config-%{version}-aarch64.config" +) +%endif + +for config_file in "${config_files[@]}"; do + +config_name=$(basename "$config_file") + +echo "Checking configuration: $config_name" + +cp "$config_file" .config + %{__make} -s ARCH=%{bldarch} listnewconfig | grep -E '^CONFIG_' > newoptions-el9-%{_target_cpu}.txt || true if [ -s newoptions-el9-%{_target_cpu}.txt ]; then cat newoptions-el9-%{_target_cpu}.txt @@ -628,6 +650,9 @@ if [ -s newoptions-el9-%{_target_cpu}.txt ]; then fi rm -f newoptions-el9-%{_target_cpu}.txt +%{__make} -s distclean +done + # Add DUP and kpatch certificates to system trusted keys for RHEL. %if %{signkernel} || %{signmodules} openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem @@ -655,8 +680,6 @@ done cd .. -%{__make} -s distclean - %endif popd > /dev/null @@ -1721,6 +1744,9 @@ fi %endif %changelog +* Tue Jan 28 2025 Eduard Basov - 6.1.111-11.lvc4.inferit.fuzzing +- Added verification of ALL configs + * Fri Jan 24 2025 Eduard Basov - 6.1.111-10.lvc4.inferit.fuzzing - Added new options for KASAN, KMSAN, KMEMLEAK