bump kernel-stable to 6.6.6-018

fedora/log.savedefconfig

@@ -0,0 +1,13 @@
+  HOSTCC  scripts/basic/fixdep
+  HOSTCC  scripts/kconfig/conf.o
+  HOSTCC  scripts/kconfig/confdata.o
+  HOSTCC  scripts/kconfig/expr.o
+  LEX     scripts/kconfig/lexer.lex.c
+  YACC    scripts/kconfig/parser.tab.[ch]
+  HOSTCC  scripts/kconfig/lexer.lex.o
+  HOSTCC  scripts/kconfig/menu.o
+  HOSTCC  scripts/kconfig/parser.tab.o
+  HOSTCC  scripts/kconfig/preprocess.o
+  HOSTCC  scripts/kconfig/symbol.o
+  HOSTCC  scripts/kconfig/util.o
+  HOSTLD  scripts/kconfig/conf

kernel-common.inc

@@ -33,7 +33,7 @@
 %global pkg_version %{LKAver}
 
 # Set pkg_release.
-%global pkg_release %{?rc_ver:rc%{rc_ver}.}%{?next_snapshot_date:next%{next_snapshot_date}.}%{release_v}%{?buildid}%{?dist}
+%global pkg_release %{release_v}%{?rc_ver:.rc%{rc_ver}}%{?next_snapshot_date:.next%{next_snapshot_date}}%{?buildid}%{?dist}
 
 # Architectures upon which we can sign the kernel
 # for secure boot authentication.
@@ -141,7 +141,7 @@
 %define defconfig arch/%{asmarch}/configs/defconfig
 %endif
 
-%define srcconfig %{_sourcedir}/config-$(uname -m)
+%define elconfig arch/%{asmarch}/configs/el.config
 
 %if %{with_vdso_install}
 %define use_vdso 1
@@ -559,12 +559,13 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -n -p \
 
 mv COPYING COPYING-%{version}-%{release}
 
-cp %{srcconfig} .config
+cp %{_sourcedir}/config-$(uname -m) %{elconfig}
 
 # Set the EXTRAVERSION string in the top level Makefile.
 sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile
 
 %ifarch x86_64 || aarch64
+./scripts/kconfig/merge_config.sh %{defconfig} %{elconfig}
 %{__make} 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
@@ -578,17 +579,17 @@ rm -vf .config*
 openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
 openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
 cat rheldup3.pem rhelkpatch1.pem > certs/rhel.pem
-for i in %{srcconfig}; do
+for i in %{elconfig}; do
 	sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i
 done
 %else
-for i in %{srcconfig}; do
+for i in %{elconfig}; do
         sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS=""@' $i
 done
 %endif
 
 # Adjust the FIPS module name for RHEL9.
-for i in %{srcconfig}; do
+for i in %{elconfig}; do
 	sed -i 's@CONFIG_CRYPTO_FIPS_NAME=.*@CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux 9 - Kernel Cryptographic API"@' $i
 done
 
@@ -600,14 +601,14 @@ popd > /dev/null
 pushd linux-%{KVERREL} > /dev/null
 
 %ifarch x86_64 || aarch64
-cp %{srcconfig} .config
+./scripts/kconfig/merge_config.sh %{defconfig} %{elconfig}
 
 %if %{signkernel} || %{signmodules}
 cp %{SOURCE23} certs/
 %endif
 
 %if %{with_std}
-%{make} %{?_smp_mflags} ARCH=%{bldarch} olddefconfig %{make_target}
+%{make} %{?_smp_mflags} ARCH=%{bldarch} %{make_target}
 
 %{make} %{?_smp_mflags} ARCH=%{bldarch} modules || exit 1
 

kernel-stable.spec

@@ -1,7 +1,7 @@
 %global major_ver 6
 %global minor_ver 6
-%global patch_ver 8
-%global release_v 001
+%global patch_ver 6
+%global release_v 018
 
 Name: kernel-stable