From 9b9e19ca50491f2b74a9bb99f63591147b91bdd5 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Wed, 9 Dec 2020 11:28:16 +1100 Subject: [PATCH] LU-14195 build: Adjust Makefile for Linux build changes. Since v5.10-rc1~51^2~19, "KBUILD_BUILTIN" has been unset for module builds. This means that "targets-for-builtin" isn't built, and that is how "extra-y" is built. So we need another way to force LUSTRE_KERNEL_TEST to be built. Since v5.6-rc1~1^2~5 any target listed in "always-y" will always get built. So we can assign LUSTRE_KERNEL_TEST to this macro. Assigning both macros is safe, even for those kernels which include both in the list of targets. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: I508b3710579c068dec93baf81ee383f3f03bd370 Reviewed-on: https://review.whamcloud.com/40907 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Aurelien Degremont Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- build/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/Makefile b/build/Makefile index d732afc..5304d7a 100644 --- a/build/Makefile +++ b/build/Makefile @@ -32,7 +32,10 @@ else # PATCHLEVEL # case #3 ifneq ($(LUSTRE_KERNEL_TEST),) +# extra-y works prior to 5.10 extra-y = $(LUSTRE_KERNEL_TEST) +# always-y works since 5.6 +always-y = $(LUSTRE_KERNEL_TEST) endif obj-m := conftest.o -- 1.8.3.1