From 8a7aa8d5902fcffe6c8b56d0c92ee36380a26e88 Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Mon, 1 Aug 2022 20:58:46 +0700 Subject: [PATCH] LU-16058 build: proc_ops check fails with SUBARCH undefined During configure with config.cache enabled SUBARCH may not be defined. Move the definition to a location that must be traversed. Test-Parameters: trivial Fixes: a5084c2f2e ("LU-14937 build: re-use config cache in 'make rpms/debs'") Signed-off-by: Shaun Tancheff Change-Id: I0a7b4de3ecccd41b1c55e8b2df29039517e0c416 Reviewed-on: https://review.whamcloud.com/48101 Reviewed-by: James Simmons Reviewed-by: Petros Koutoupis Reviewed-by: Jian Yu Tested-by: jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- config/lustre-build-linux.m4 | 1 - config/lustre-build.m4 | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 7a4c98d..6c6c76a 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -572,7 +572,6 @@ MODULE_LICENSE("GPL");]) AC_DEFUN([LB_LINUX_COMPILE_IFELSE], [m4_ifvaln([$1], [AC_LANG_CONFTEST([AC_LANG_SOURCE([$1])])])dnl rm -f build/conftest.o build/conftest.mod.c build/conftest.ko -SUBARCH=$(echo $target_cpu | sed -e 's/powerpc.*/powerpc/' -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/' -e 's/aarch64.*/arm64/' -e 's/armv7.*/arm/') AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] LDFLAGS= ${LD:+LD="$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_CHECK_INCLUDE -I$LINUX/arch/$SUBARCH/include -Iinclude -Iarch/$SUBARCH/include/generated -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -Iinclude/generated -I$LINUX/arch/$SUBARCH/include/uapi -Iarch/$SUBARCH/include/generated/uapi -I$LINUX/include/uapi -Iinclude/generated/uapi ${SPL_OBJ:+-include $SPL_OBJ/spl_config.h} ${ZFS_OBJ:+-include $ZFS_OBJ/zfs_config.h} ${SPL:+-I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include -I$ZFS/include/os/linux/kernel -I$ZFS/include/os/linux/spl -I$ZFS/include/os/linux/zfs -I${SPL:-$ZFS/include/spl}} -include $CONFIG_INCLUDE" KBUILD_EXTRA_SYMBOLS="${ZFS_OBJ:+$ZFS_OBJ/Module.symvers} $KBUILD_EXTRA_SYMBOLS" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], [$4], [_AC_MSG_LOG_CONFTEST diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index 992b031..c6ac857 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -159,6 +159,9 @@ AS_IF([test "x$enable_modules" = xyes], [ AS_IF([test "x$BISON" = "x"], [AC_MSG_ERROR([bison package is required to build kernel modules])]) AS_CASE([$target_os], [linux*], [ + # Ensure SUBARCH is defined + SUBARCH=$(echo $target_cpu | sed -e 's/powerpc.*/powerpc/' -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/' -e 's/aarch64.*/arm64/' -e 's/armv7.*/arm/') + # Run serial tests LB_PROG_LINUX LIBCFS_PROG_LINUX @@ -723,7 +726,7 @@ AC_SUBST(MOSTLYCLEANFILES) LB_CONFIG_RPMBUILD_OPTIONS LB_CONFIG_CACHE_OPTIONS -AS_IF([test -d $TEST_DIR], [ +AS_IF([test -d $TEST_DIR -a "x${PARALLEL_BUILD_OPT}" != "xdebug"], [ AC_MSG_NOTICE([remove temporary parallel configure dir $TEST_DIR]) rm -rf $TEST_DIR ]) -- 1.8.3.1