Merge pull request #322 from arnaldo2792/drop-efa-patch-6.12

Test EFA configurations in parallel

Author: arnaldo2792

packages/kernel-6.12/1001-Makefile-add-prepare-target-for-external-modules.patch

@@ -1,4 +1,4 @@
-From e6e9b5adc830c0924d81c348c8d5b12e3dc4242e Mon Sep 17 00:00:00 2001
+From 9ff0a5db523ebab7f4892662ceec5fc217e92a72 Mon Sep 17 00:00:00 2001
 From: Ben Cressey <[email protected]>
 Date: Mon, 19 Apr 2021 18:46:04 +0000
 Subject: [PATCH] Makefile: add prepare target for external modules
@@ -27,19 +27,19 @@ Signed-off-by: Arnaldo Garcia Rincon <[email protected]>
  1 file changed, 13 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 23390805e..2f78ac123 100644
+index d4c679b2d..87548bfa2 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1874,6 +1874,19 @@ else # KBUILD_EXTMOD
+@@ -1802,6 +1802,19 @@ filechk_kernel.release = echo $(KERNELRELEASE)
  KBUILD_BUILTIN :=
  KBUILD_MODULES := 1
 
 +PHONY += modules_prepare
 +modules_prepare:
-+	$(Q)$(MAKE) $(build)=scripts/basic
-+	$(Q)$(MAKE) $(build)=scripts/dtc
-+	$(Q)$(MAKE) $(build)=scripts/mod
-+	$(Q)$(MAKE) $(build)=scripts
++	$(PREPARE) $(Q)$(MAKE) $(build)=scripts/basic
++	$(PREPARE) $(Q)$(MAKE) $(build)=scripts/dtc
++	$(PREPARE) $(Q)$(MAKE) $(build)=scripts/mod
++	$(PREPARE) $(Q)$(MAKE) $(build)=scripts
 +
 +ifdef CONFIG_OBJTOOL
 +prepare: tools/objtool
@@ -51,5 +51,5 @@ index 23390805e..2f78ac123 100644
 
  compile_commands.json: $(extmod_prefix)compile_commands.json
 -- 
-2.40.0
+2.50.1
 

packages/kernel-6.12/2000-config-efa.cmake-execute-config-tests-in-serial.patch

@@ -66,8 +66,6 @@ Patch1006: 1006-Select-prerequisites-for-gpu-drivers.patch
 Patch1007: 1007-strscpy-write-destination-buffer-only-once.patch
 # Disable incomplete measurement into PCR 9 on aarch64.
 Patch1008: 1008-efi-libstub-don-t-measure-kernel-command-line-into-P.patch
-# Execute EFA tests in serial; concurrency doesn't work with the `make prepare` patch.
-Patch2000: 2000-config-efa.cmake-execute-config-tests-in-serial.patch
 
 BuildRequires: bc
 BuildRequires: elfutils-devel
@@ -203,7 +201,7 @@ for patch in ${patches[@]}; do
     patch -p1 <../"$patch"
 done
 # Patches listed in this spec (Patch0001...)
-%autopatch -p1 -m 1000 -M 1999
+%autopatch -p1
 
 %if "%{_cross_arch}" == "x86_64"
 microcode="$(find %{_cross_libdir}/firmware -type f -path '*/*-ucode/*' -printf '%%P\n' | sort | tr '\n' ' ')"
@@ -269,10 +267,6 @@ sed \
   -e "s|__KERNEL_DIR__|%{builddir}/linux-%{version}|g" \
   -e "s|__KERNEL_MAKEFILE__|%{builddir}/linux-%{version}/Makefile|g" %{S:400} > efa_driver/CMakeLists.txt
 
-pushd efa_driver
-%patch -P 2000 -p1 -d .
-popd
-
 %global kmake %{shrink: \
 make -s \
   ARCH="%{_cross_karch}" \
@@ -295,7 +289,7 @@ make -s \
 
 # Build EFA driver
 pushd %{_builddir}/efa_driver/build
-sed -i -e 's,$(MAKE),%{kmake},g' ../config/Makefile
+sed -i -e 's,$(MAKE),PREPARE=true %{kmake},g' ../config/Makefile
 
 # Prevent polluting the parent environment by configuring CMAKE in a subshell
 (