LU-17832 gni: build should not collapse extra symbols

cray-obs spec files (ari,gem,dmp) define:
   KBUILD_EXTRA_SYMBOLS and GNICPPFLAGS

When building kgnilnd the environment variable needs to be passed
through to make.

HPE-bug-id: LUS-12269
Test-Parameters: trivial
Fixes: 8b1d2a72f1 ("LU-16967 build: Add in-kernel-ko2iblnd driver")
Signed-off-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Change-Id: Icc7ac33138300bf3836082a014daf580a1632436
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/55052
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Patrick Farrell <patrick.farrell@oracle.com>
Reviewed-by: Petros Koutoupis <petros.koutoupis@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/autoMakefile.am b/autoMakefile.am
index 7b204fe..5965eb2 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -141,7 +141,7 @@ all-am: modules
 
 modules: undef.h ldiskfs-sources
        $(MAKE) DEQUOTE_CC_VERSION_TEXT=$(DEQUOTE) \
-       KBUILD_EXTRA_SYMBOLS="@INT_O2IB_SYMBOLS@ @EXTRA_SYMBOLS@" \
+       KBUILD_EXTRA_SYMBOLS="@INT_O2IB_SYMBOLS@ @EXTRA_SYMBOLS@ $(KBUILD_EXTRA_SYMBOLS)" \
        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)$$(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)' \

diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4
index d722d2f..180f175 100644 (file)
--- a/lnet/autoconf/lustre-lnet.m4
+++ b/lnet/autoconf/lustre-lnet.m4
@@ -911,7 +911,8 @@ AC_ARG_ENABLE([gni],
 AC_MSG_RESULT([$enable_gni])
 
 AS_IF([test "x$enable_gni" = xyes], [
-       # GNICPPFLAGS was set in spec file
+       # GNICPPFLAGS and KBUILD_EXTRA_SYMBOLS were set in spec file
+       # to include the additional module dependancies of gni kernel driver
        EXTRA_KCFLAGS_save="$EXTRA_KCFLAGS"
        EXTRA_KCFLAGS="$EXTRA_KCFLAGS $GNICPPFLAGS"
        LB_CHECK_COMPILE([if GNI kernel headers are present],