From: Shaun Tancheff Date: Thu, 6 Feb 2020 22:41:28 +0000 (-0600) Subject: LU-13209 build: SUSE 15 SP2 fix for KBUILD_SRC removed X-Git-Tag: 2.13.53~102 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=5d92f0ff942ff93b2f294bda1688e18622fc88c0;ds=sidebyside 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 Change-Id: I385d84cfe0b557f18d17d5732ab943b16b1e1d9c Reviewed-on: https://review.whamcloud.com/37465 Reviewed-by: Petros Koutoupis Tested-by: Maloo Tested-by: jenkins Reviewed-by: Ben Evans Reviewed-by: Oleg Drokin --- diff --git a/autoMakefile.am b/autoMakefile.am index 064c317..a1644c7 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