From: Minh Diep Date: Thu, 16 Mar 2017 20:26:17 +0000 (-0700) Subject: LU-9222 build: workaround for sles11sp4 MOFED X-Git-Tag: 2.9.55~1 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e2ce727e5197f4a8fbf5b8e3dc0c7e39dc818f6b LU-9222 build: workaround for sles11sp4 MOFED MOFED assume that kernel-source is in the standard place /usr/src but lbuild is using different directory Change-Id: I236659baf344cb3b3dcb62840c576c55febc1523 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/26045 Tested-by: Jenkins Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Dmitry Eremin Reviewed-by: Oleg Drokin --- diff --git a/contrib/lbuild/lbuild-sles b/contrib/lbuild/lbuild-sles index 3419fb6..9968ce1 100644 --- a/contrib/lbuild/lbuild-sles +++ b/contrib/lbuild/lbuild-sles @@ -2,7 +2,7 @@ # increment this if you have made a change that should force a new kernel # to build built -BUILD_GEN+=".1" #LU-3337 add missing build files for sles11sp2 server +BUILD_GEN+=".2" #LU-3337 add missing build files for sles11sp2 server DEVEL_KERNEL_TYPE="default-devel" RPM_HELPERS_DIR="/usr/lib/rpm" @@ -125,7 +125,11 @@ find_linux_devel_paths() { # symlink the linux-obj to linux-version-obj ln -s $linuxobjpath $LINUXOBJ - + # We need to copy the headers from the source to the object tree for + # MOFED to be able to compile (a bug in ofed?) + if [ -e ${LINUX}/include ] && [ -e ${LINUXOBJ}/include ]; then + cp -rf ${LINUX}/include ${LINUXOBJ} + fi # We modify %kernel_module_package macro to use the linux obj # that lbuild install, not the OS installed /usr/src sed -i -e "/^%kernel_module_package/,/^)}$/d" \