X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=config%2Flustre-build-linux.m4;h=1224fdba230bcca422c34a8a9d7d9223fad43cd6;hp=9494017be197ee99558187dabca5977e34ee9733;hb=a70b020e5b2f1bbe3b759232852beaac4f0852b5;hpb=8fd6a0829e326935f2b20b150844d8ab07d20e05 diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 9494017..1224fdb 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -75,30 +75,19 @@ AC_SUBST(LINUXRELEASE) AC_DEFUN([LB_LINUX_RELEASE], [ LB_LINUX_UTSRELEASE -# ------------ RELEASE -------------------------------- -AC_MSG_CHECKING([for Lustre release]) -AC_ARG_WITH([release], - AC_HELP_STRING([--with-release=string], - [set the release string (default=$kvers_YYYYMMDDhhmm)]), - [RELEASE=$withval], [ - RELEASE="" - AS_IF([test "$DOWNSTREAM_RELEASE"], [RELEASE="${DOWNSTREAM_RELEASE}_"]) - RELEASE="$RELEASE$(echo $LINUXRELEASE | tr '-' '_')_$BUILDID"]) -AC_MSG_RESULT($RELEASE) -AC_SUBST(RELEASE) - # check if the kernel is one from RHEL or SUSE -AC_CACHE_CHECK([for RedHat kernel version], lb_cv_rhel_kernel_version, [ +AC_CACHE_CHECK([for RedHat kernel release number], lb_cv_rhel_kernel_version, [ lb_cv_rhel_kernel_version="" -AS_IF([fgrep -q RHEL_RELEASE $LINUX_OBJ/include/$VERSION_HDIR/version.h], - [RHEL_RELEASE=$(expr 0$(awk -F \" '/ RHEL_RELEASE / { print [$]2 }' \ - $LINUX_OBJ/include/$VERSION_HDIR/version.h) + 1) - KERNEL_VERSION=$(sed -e 's/\(@<:@23@:>@\.@<:@0-9@:>@*\.@<:@0-9@:>@*\).*/\1/' <<< $LINUXRELEASE) - lb_cv_rhel_kernel_version=${KERNEL_VERSION}-${RHEL_RELEASE}]) +AS_IF([fgrep -q RHEL_RELEASE $LINUX_OBJ/include/$VERSION_HDIR/version.h], [ + lb_cv_rhel_kernel_version=$(awk '/ RHEL_MAJOR / { print [$]3 }' \ + $LINUX_OBJ/include/$VERSION_HDIR/version.h)$(awk \ + '/ RHEL_MINOR / { print [$]3 }' \ + $LINUX_OBJ/include/$VERSION_HDIR/version.h) +]) ]) AS_IF([test -n "$lb_cv_rhel_kernel_version"], [ RHEL_KERNEL="yes" - RHEL_KERNEL_VERSION=$lb_cv_rhel_kernel_version + RHEL_RELEASE_NO=$lb_cv_rhel_kernel_version ], [ RHEL_KERNEL="no" LB_CHECK_CONFIG([SUSE_KERNEL], [SUSE_KERNEL="yes"], [SUSE_KERNEL="no"]) @@ -108,20 +97,22 @@ AC_MSG_CHECKING([for Linux kernel module package directory]) AC_ARG_WITH([kmp-moddir], AC_HELP_STRING([--with-kmp-moddir=string], [set the kmod updates or extra directory]), - [KMP_MODDIR=$withval],[ - AS_IF([test x$RHEL_KERNEL = xyes], [KMP_MODDIR="extra"], - [test x$SUSE_KERNEL = xyes], [KMP_MODDIR="updates"])]) + [KMP_MODDIR=$withval + IN_KERNEL=''],[ + AS_IF([test x$RHEL_KERNEL = xyes], [KMP_MODDIR="extra/kernel"], + [test x$SUSE_KERNEL = xyes], [KMP_MODDIR="updates/kernel"]) + IN_KERNEL="${PACKAGE}"]) AC_MSG_RESULT($KMP_MODDIR) -AC_SUBST(KMP_MODDIR) -moduledir='$(CROSS_PATH)/lib/modules/$(LINUXRELEASE)/$(KMP_MODDIR)/kernel' -AC_SUBST(moduledir) +moduledir="/lib/modules/${LINUXRELEASE}/${KMP_MODDIR}" -modulefsdir='$(moduledir)/fs/$(PACKAGE)' +modulefsdir="${moduledir}/fs/${IN_KERNEL}" AC_SUBST(modulefsdir) -modulenetdir='$(moduledir)/net/$(PACKAGE)' +modulenetdir="${moduledir}/net/${IN_KERNEL}" AC_SUBST(modulenetdir) + +AC_SUBST(KMP_MODDIR) ]) # @@ -140,45 +131,6 @@ AC_SUBST(SYMVERFILE) ]) # -# LB_LINUX_CROSS -# -# check for cross compilation -# -AC_DEFUN([LB_LINUX_CROSS], [ -AC_CACHE_CHECK([for cross compilation], lb_cv_cross, [ -lb_cv_cross="no" -AS_IF([test "x$cross_compiling" = xyes], - [AS_CASE([$host_vendor], - [k1om | mpss], [ - # The K1OM architecture is an extension of the x86 architecture - # and in MPSS 2.1 it's defined in $host_vendor. But in MPSS 3.x - # it's defined in $host_arch. So, try to support both case. - lb_cv_cross=$($CC -v 2>&1 | grep Target: | sed -e 's/Target: //') - AS_IF([test "$lb_cv_cross" != x86_64-k1om-linux -a \ - "$lb_cv_cross" != k1om-mpss-linux], [ - AC_MSG_ERROR([Cross compiler not found in PATH.]) - ]) - ]) - ]) -]) -AS_IF([test "$lb_cv_cross" = x86_64-k1om-linux -o \ - "$lb_cv_cross" = k1om-mpss-linux], [ - CROSS_VARS="ARCH=k1om CROSS_COMPILE=${lb_cv_cross}-" - CROSS_PATH="${CROSS_PATH:=/opt/lustre/$VERSION/$lb_cv_cross}" - CCAS=$CC - # need to produce special section for debuginfo extraction - LDFLAGS="$LDFLAGS -Wl,--build-id" - EXTRA_KLDFLAGS="$EXTRA_KLDFLAGS -Wl,--build-id" - AS_IF([test "x$enable_server" != xno], [ - AC_MSG_WARN([Disabling server (not supported for $lb_cv_cross).]) - enable_server="no" - ]) -]) -AC_SUBST(CROSS_VARS) -AC_SUBST(CROSS_PATH) -]) - -# # LB_ARG_REPLACE_PATH(PACKAGE, PATH) # AC_DEFUN([LB_ARG_REPLACE_PATH], [ @@ -344,7 +296,6 @@ Consult build/README.kernel-source for details. ]) # this is needed before we can build modules -LB_LINUX_CROSS LB_LINUX_VERSION # --- check that we can build modules at all @@ -540,8 +491,8 @@ $2 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/powerpc64/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/' -e 's/k1om/x86/') -AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_OFED_INCLUDE -I$LINUX/arch/$SUBARCH/include -I$LINUX/arch/$SUBARCH/include/generated -Iinclude -I$LINUX/include -Iinclude2 -I$LINUX/include/uapi -I$LINUX/include/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 -I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include} -include $CONFIG_INCLUDE" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $CROSS_VARS $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], +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/') +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 -I$SPL/include } ${ZFS:+-I$ZFS -I$ZFS/include} -include $CONFIG_INCLUDE" -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 m4_ifvaln([$5],[$5])dnl])