From 795a54ebd2ee20ed5f7a2b4c11a1ade947486de8 Mon Sep 17 00:00:00 2001 From: Yaraslau Furman Date: Sat, 4 Jan 2025 18:15:43 +0200 Subject: [PATCH] Revert "PKGBUILD: apply extra uarches patch even when defconfig is copied" This reverts commit 6da003f2206ad8849c19865df144777d52faa7ad. --- PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 7c46b93..744ae3e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -201,11 +201,6 @@ apply_patches() { patch -Np1 -i "${srcdir}/cl-linux/${i}" || true done - - # Patch with kernel_compiler_patch patches. - # Do this before any defconfig invocations so we - # have all of the extra selectable uarches ready and selectable - patch -Np1 -i "$srcdir/kernel_compiler_patch-$_kernelcompilerpatch/more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch" } # Allows user to modify the kernel config @@ -323,6 +318,11 @@ update_defconfig() { # Run olddefconfig make ${BUILD_FLAGS[*]} olddefconfig diff -u $srcdir/cl-linux/config .config || : + + # Patch with kernel_compiler_patch patches + # This must be executed after olddefconfig + # to allow for the next section to run. + patch -Np1 -i "$srcdir/kernel_compiler_patch-$_kernelcompilerpatch/more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch" # Set subarch automatically if [ -n "${_subarch}" ]; then