From 17fdeba9ae419078b0ea6cddd84e74c647317b33 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin Date: Thu, 10 Jul 2014 18:10:00 +0400 Subject: [PATCH] LU-5317 build: fix build of Xeon Phi client RPMs * disable DKMS build for Xeon Phi * resolve issue with undefined reference to `libcfs_log_return' Signed-off-by: Dmitry Eremin Change-Id: I383ca771fdd1d2cd22cc20a20d69b32af7e6e010 Reviewed-on: http://review.whamcloud.com/11044 Tested-by: Jenkins Reviewed-by: Bob Glossman Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 1 + lustre/utils/Makefile.am | 10 ++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 71e6d82..8c24402 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1038,6 +1038,7 @@ build_lustre() { } build_lustre_dkms() { + [ -n "$MPSS_VERSION" ] && return 0 local ver=$(eval echo $(awk '/LUSTRE_VERSION_STRING/ {print $3}' lustre/include/lustre_ver.h)) echo "Building Lustre DKMS RPMs for: $BUILD_ARCHS..." ./configure --enable-dist || return 255 diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am index dde2048..da0213f 100644 --- a/lustre/utils/Makefile.am +++ b/lustre/utils/Makefile.am @@ -11,11 +11,9 @@ AM_LDFLAGS := -L$(top_builddir)/lnet/utils MNTMODLDFLAGS := -rdynamic -ldl MNTMODCFLAGS := -DPLUGIN_DIR=\"${pkglibdir}\" -LIBCFSUTIL := $(top_builddir)/libcfs/libcfs/libcfsutil.a - LIBPTLCTL := $(top_builddir)/lnet/utils/libptlctl.a \ - $(top_builddir)/libcfs/libcfs/libcfs.a \ - $(LIBCFSUTIL) + $(top_builddir)/libcfs/libcfs/libcfsutil.a \ + $(top_builddir)/libcfs/libcfs/libcfs.a sbin_scripts = lrun bin_scripts = llstat llobdstat plot-llstat llbackup @@ -51,8 +49,8 @@ lctl_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE) lctl_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a lfs_SOURCES = lfs.c -lfs_LDADD := liblustreapi.a $(LIBCFSUTIL) $(LIBREADLINE) -lfs_DEPENDENCIES := liblustreapi.a +lfs_LDADD := liblustreapi.a $(LIBPTLCTL) $(LIBREADLINE) +lfs_DEPENDENCIES := $(LIBPTLCTL) liblustreapi.a loadgen_SOURCES = loadgen.c lustre_cfg.c obd.c loadgen_LDADD := liblustreapi.a $(LIBPTLCTL) $(PTHREAD_LIBS) $(LIBREADLINE) -- 1.8.3.1