File 0008-LU-13209-build-SUSE-15-SP2-fix-for-KBUILD_... of Package lustre_2_12

Overview Repositories Revisions Requests Users Attributes Meta

File 0008-LU-13209-build-SUSE-15-SP2-fix-for-KBUILD_SRC-remove.patch of Package lustre_2_12

From 5defedf192f72d75b4c7cb552f311f2efde4f3cf Mon Sep 17 00:00:00 2001
From: Shaun Tancheff <shaun.tancheff@hpe.com>
Date: Thu, 6 Feb 2020 16:41:28 -0600
Subject: [PATCH 08/35] LU-13209 build: SUSE 15 SP2 fix for KBUILD_SRC removed

Linux v5.2-rc4-45-g051f278e9d81 changed

KBUILD_SRC := $(abs_srctree)
  to
building_out_of_srctree := 1

So adjust the build to handler either case

Test-Parameters: trivial
Cray-bug-id: LUS-8472
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: I385d84cfe0b557f18d17d5732ab943b16b1e1d9c
Reviewed-on: https://review.whamcloud.com/37465
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Ben Evans <beevans@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 autoMakefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoMakefile.am b/autoMakefile.am
index 478c34113634..da6b7c682a0e 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -74,7 +74,7 @@ all-am: modules
 modules: undef.h ldiskfs-sources
 	$(MAKE) LDFLAGS= CC="$(CC)" -C $(LINUX_OBJ) \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
+	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC)$$(building_out_of_srctree),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
 	include/config/MARKER $@
 endif # LINUX
-- 
2.41.0

Places

File 0008-LU-13209-build-SUSE-15-SP2-fix-for-KBUILD_SRC-remove.patch of Package lustre_2_12

Places