diff --git a/config-6.6.1-aarch64 b/config-aarch64 similarity index 100% rename from config-6.6.1-aarch64 rename to config-aarch64 diff --git a/config-6.6.1-x86_64 b/config-x86_64 similarity index 100% rename from config-6.6.1-x86_64 rename to config-x86_64 diff --git a/kernel-ml-6.6.spec b/kernel-ml.spec similarity index 99% rename from kernel-ml-6.6.spec rename to kernel-ml.spec index 32833c4..2971d1d 100644 --- a/kernel-ml-6.6.spec +++ b/kernel-ml.spec @@ -225,8 +225,8 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb ### Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{LKAver}.tar.xz -Source2: config-%{version}-x86_64 -Source4: config-%{version}-aarch64 +Source2: config-x86_64 +Source4: config-aarch64 Source20: mod-denylist.sh Source21: mod-sign.sh @@ -575,7 +575,7 @@ cp -a %{SOURCE4} . sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile %ifarch x86_64 || aarch64 -cp config-%{version}-%{_target_cpu} .config +cp config-%{_target_cpu} .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 @@ -589,17 +589,17 @@ rm -f newoptions-el9-%{_target_cpu}.txt 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 config-%{version}-*; do +for i in config-*; do sed -i 's@CONFIG_SYSTEM_TRUSTED_KEYS="*"@CONFIG_SYSTEM_TRUSTED_KEYS="certs/rhel.pem"@' $i done %else -for i in config-%{version}-*; do +for i in config-*; 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 config-%{version}-*; do +for i in config-*; do sed -i 's@CONFIG_CRYPTO_FIPS_NAME=.*@CONFIG_CRYPTO_FIPS_NAME="Red Hat Enterprise Linux 9 - Kernel Cryptographic API"@' $i done @@ -611,7 +611,7 @@ popd > /dev/null pushd linux-%{KVERREL} > /dev/null %ifarch x86_64 || aarch64 -cp config-%{version}-%{_target_cpu} .config +cp config-%{_target_cpu} .config %{__make} -s ARCH=%{bldarch} oldconfig