From 445f85de2baddbaa8a84a709b98a9d0b8ed4231a Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Thu, 10 Nov 2022 00:53:47 -0600 Subject: [PATCH] LU-16117 build: Avoid excessive modpost warnings To avoid modpost warnings about duplicate symbols do not add the LINUX_OBJ kernel symbols to the KBUILD_EXTRA_SYMBOLS list Test-Parameters: trivial HPE-bug-id: LUS-11192 Signed-off-by: Shaun Tancheff Change-Id: I85fc90661efcb66e4aa39c9bd3393dbe4f7ba5eb Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/48362 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin Reviewed-by: Petros Koutoupis --- lnet/autoconf/lustre-lnet.m4 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index 7e89069..6aff70a 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -245,9 +245,11 @@ AS_IF([test $ENABLEO2IB = "no"], [ O2IB_SYMVER=$LINUX_OBJ/Module.symvers fi if test -n "$O2IB_SYMVER"; then - AC_MSG_NOTICE([adding $O2IB_SYMVER to Symbol Path]) - EXTRA_SYMBOLS="$EXTRA_SYMBOLS $O2IB_SYMVER" - AC_SUBST(EXTRA_SYMBOLS) + if test "$O2IB_SYMVER" != "$LINUX_OBJ/Module.symvers"; then + AC_MSG_NOTICE([adding $O2IB_SYMVER to Symbol Path O2IB]) + EXTRA_SYMBOLS="$EXTRA_SYMBOLS $O2IB_SYMVER" + AC_SUBST(EXTRA_SYMBOLS) + fi else AC_MSG_ERROR([an external source tree was, either specified or detected, for o2iblnd however I could not find a $O2IBPATH/Module.symvers there]) fi @@ -284,7 +286,9 @@ AC_SUBST(ENABLEO2IB) AS_IF([test $ENABLEO2IB != "no"], [ EXTRA_CHECK_INCLUDE="$EXTRA_OFED_CONFIG $EXTRA_OFED_INCLUDE" - KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS $O2IBPATH/Module.symvers" + if test $O2IBPATH != $LINUX_OBJ; then + KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS $O2IBPATH/Module.symvers" + fi # In RHEL 6.2, rdma_create_id() takes the queue-pair type as a fourth argument LB_CHECK_COMPILE([if 'rdma_create_id' wants four args], -- 1.8.3.1