PKGBUILD: V2: apply extra uarches patch even when defconfig is copied

Otherwise MK8 or MCORE2 is selected which results in a misoptimization.

Also ensure that Processor family choice menu is always brought up
by breaking the config a little bit.

Code formatting pass was applied, CRLF was replaced with LF
This commit is contained in:
Yaraslau Furman 2025-01-04 19:08:22 +02:00
parent 795a54ebd2
commit d0fecf90fe

View file

@ -201,6 +201,11 @@ apply_patches() {
patch -Np1 -i "${srcdir}/cl-linux/${i}" || true patch -Np1 -i "${srcdir}/cl-linux/${i}" || true
done 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 # Allows user to modify the kernel config
@ -319,10 +324,12 @@ update_defconfig() {
make ${BUILD_FLAGS[*]} olddefconfig make ${BUILD_FLAGS[*]} olddefconfig
diff -u $srcdir/cl-linux/config .config || : diff -u $srcdir/cl-linux/config .config || :
# Patch with kernel_compiler_patch patches # Here we slightly break the config by removing one of the
# This must be executed after olddefconfig # members of the 'Processor family' selection.
# to allow for the next section to run. # This causes oldconfig to invoke that selection always.
patch -Np1 -i "$srcdir/kernel_compiler_patch-$_kernelcompilerpatch/more-ISA-levels-and-uarches-for-kernel-6.1.79+.patch" sed -i '/CONFIG_GENERIC_CPU/d' .config || :
# For a slim chance that someone is building X86_32
sed -i '/CONFIG_M686/d' .config || :
# Set subarch automatically # Set subarch automatically
if [ -n "${_subarch}" ]; then if [ -n "${_subarch}" ]; then