X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fautoconf%2Flustre-build.m4;h=20e3d0d89f39a164d77052d64a360cd42e235b42;hb=c487014a39a6e37dc22a957aad9ad9b739e3c8cf;hp=e0ed33b340fb0e417514705d7715730156d677c2;hpb=2b21c5cc000b9099a5a38d6a896109a8e3155486;p=fs%2Flustre-release.git

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index e0ed33b..20e3d0d 100644
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -29,6 +29,89 @@ AC_SUBST(lb_target_os)
 ])
 
 #
+# LB_DOWNSTREAM_RELEASE
+#
+AC_DEFUN([LB_DOWNSTREAM_RELEASE],
+[AC_ARG_WITH([downstream-release],
+	AC_HELP_STRING([--with-downstream-release=string],
+		       [set a string in the BUILD_VERSION and RPM Release: (default is nothing)]),
+	[DOWNSTREAM_RELEASE=$with_downstream_release],
+	[
+	# if not specified, see if it's in the META file
+	if test -f META; then
+		DOWNSTREAM_RELEASE=$(sed -ne '/^LOCAL_VERSION =/s/.*= *//p' META)
+	fi
+	])
+AC_SUBST(DOWNSTREAM_RELEASE)
+])
+
+#
+# LB_BUILDID
+#
+# Check if the source is a GA release and if not, set a "BUILDID"
+#
+# Currently there are at least two ways/modes of/for doing this.  One
+# is if we are in a valid git repository, the other is if we are in a
+# non-git source tree of some form.  Building the latter from the former
+# will be handled here.
+AC_DEFUN([LB_BUILDID],
+[
+AC_MSG_CHECKING([for buildid])
+BUILDID=""
+if git branch >/dev/null 2>&1; then
+	ffw=0
+	hash=""
+	ver=$(git describe --match v[[0-9]]_*_[[0-9]] --tags)
+	if [[[ $ver = *-*-* ]]]; then
+		hash=${ver##*-}
+		ffw=${ver#*-}
+		ffw=${ffw%-*}
+		ver=${ver%%-*}
+	fi
+	# it's tempting to use [[ $ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$ ]]
+	# here but the portability of the regex on the right is dismal
+	# (thanx suse)
+	if echo "$ver" | egrep -q "^v([0-9]+_)+([0-9]+|RC[0-9]+)$"; then
+		ver=$(echo $ver | sed -e 's/^v\(.*\)/\1/' \
+				      -e 's/_RC[[0-9]].*$//' -e 's/_/./g')
+	fi
+
+	# a "lustre fix" value of .0 should be truncated
+	if [[[ $ver = *.*.*.0 ]]]; then
+		ver=${ver%.0}
+	fi
+	# ditto for a "lustre fix" value of _0
+	if [[[ $ver = v*_*_*_0 ]]]; then
+		ver=${ver%_0}
+	fi
+	if [[[ $ver = v*_*_* ]]]; then
+		ver=${ver#v}
+		ver=${ver//_/.}
+	fi
+
+	# only do this test for lustre (not ldiskfs)
+	if test "$PACKAGE" = "lustre" -a "$ver" != "$VERSION"; then
+		AC_MSG_WARN([most recent tag found: $ver does not match current version $VERSION.])
+	fi
+
+	if test "$ffw" != "0"; then
+		BUILDID="$hash"
+		msg="$BUILDID (ahead by $ffw commits)"
+		AC_MSG_RESULT([$msg])
+	else
+		AC_MSG_RESULT([none... congratulations, you must be on a tag])
+	fi
+elif test -f META; then
+	BUILDID=$(sed -ne '/^BUILDID =/s/.*= *//p' META)
+	msg="$BUILDID (from META file)"
+	AC_MSG_RESULT([$msg])
+else
+	AC_MSG_WARN([FIXME: I don't know how to deal with source trees outside of git that don't have a META file.  Not setting a buildid.])
+fi
+AC_SUBST(BUILDID)
+])
+
+#
 # LB_CHECK_FILE
 #
 # Check for file existance even when cross compiling
@@ -45,19 +128,6 @@ AS_IF([test AS_VAR_GET(lb_File) = yes], [$2], [$3])[]dnl
 AS_VAR_POPDEF([lb_File])dnl
 ])# LB_CHECK_FILE
 
-#
-# LB_CHECK_FILES
-#
-# LB_CHECK_FILE over multiple files
-#
-AC_DEFUN([LB_CHECK_FILES],
-[AC_FOREACH([AC_FILE_NAME], [$1],
-  [LB_CHECK_FILE(AC_FILE_NAME,
-                 [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_FILE_NAME), 1,
-                                    [Define to 1 if you have the
-                                     file `]AC_File['.])
-$2],
-                 [$3])])])
 
 #
 # LB_ARG_LIBS_INCLUDES
@@ -165,7 +235,7 @@ AC_CONFIG_SUBDIRS(libsysio)
 # Handle internal/external lustre-iokit
 #
 AC_DEFUN([LB_PATH_LUSTREIOKIT],
-[AC_ARG_WITH([],
+[AC_ARG_WITH([lustre-iokit],
 	AC_HELP_STRING([--with-lustre-iokit=path],
 			[set path to lustre-iokit source (default is included lustre-iokit)]),
 	[],[
@@ -191,7 +261,6 @@ case x$with_lustre_iokit in
 			AC_MSG_ERROR([A complete (built) external lustre-iokit was not found.])
 		])
 		LUSTREIOKIT="$with_lustre_iokit"
-		with_lustre_iokit="yes"
 		;;
 esac
 AC_SUBST(LUSTREIOKIT_SUBDIR)
@@ -215,6 +284,10 @@ AC_DEFUN([LB_PATH_LDISKFS],
 			with_ldiskfs=no
 		fi
 	])
+AC_ARG_WITH([ldiskfs-inkernel],
+	AC_HELP_STRING([--with-ldiskfs-inkernel],
+			[use ldiskfs built in to the kernel]),
+	[with_ldiskfs=inkernel], [])
 AC_MSG_CHECKING([location of ldiskfs])
 case x$with_ldiskfs in
 	xyes)
@@ -228,9 +301,15 @@ case x$with_ldiskfs in
 	xno)
 		AC_MSG_RESULT([disabled])
 		;;
+	xinkernel)
+		AC_MSG_RESULT([inkernel])
+		LB_CHECK_FILE([$LINUX/include/linux/ldiskfs_fs.h],[],[
+			AC_MSG_ERROR([ldiskfs was not found in $LINUX])
+		])
+		;;
 	*)
 		AC_MSG_RESULT([$with_ldiskfs])
-		LB_CHECK_FILE([$with_ldiskfs/ldiskfs/linux/ldiskfs_fs.h],[],[
+		LB_CHECK_FILE([$with_ldiskfs/ldiskfs/inode.c],[],[
 			AC_MSG_ERROR([A complete (built) external ldiskfs was not found.])
 		])
 		LDISKFS_DIR=$with_ldiskfs
@@ -239,11 +318,56 @@ esac
 AC_SUBST(LDISKFS_DIR)
 AC_SUBST(LDISKFS_SUBDIR)
 AM_CONDITIONAL(LDISKFS_ENABLED, test x$with_ldiskfs != xno)
+AM_CONDITIONAL(LDISKFS_IN_KERNEL, test x$with_ldiskfs = xinkernel)
+
+if test x$enable_ext4 = xyes ; then
+	AC_DEFINE(HAVE_EXT4_LDISKFS, 1, [build ext4 based ldiskfs])
+fi
 
 # We have to configure even if we don't build here for make dist to work
 AC_CONFIG_SUBDIRS(ldiskfs)
 ])
 
+AC_DEFUN([LC_KERNEL_WITH_EXT4],
+[if test -f $LINUX/fs/ext4/ext4.h ; then
+$1
+else
+$2
+fi
+])
+
+#
+# LB_HAVE_EXT4_ENABLED
+#
+AC_DEFUN([LB_HAVE_EXT4_ENABLED],
+[
+if test x$RHEL_KERNEL = xyes; then
+	AC_ARG_ENABLE([ext4],
+		 AC_HELP_STRING([--enable-ext4],
+				[enable building of ldiskfs based on ext4]),
+		[],
+		[
+			if test x$ldiskfs_is_ext4 = xyes; then
+				enable_ext4=yes
+			else
+				enable_ext4=no
+			fi
+		])
+else
+	case $LINUXRELEASE in
+	# ext4 was in 2.6.22-2.6.26 but not stable enough to use
+	2.6.2[[0-9]]*) enable_ext4='no' ;;
+	*)  LC_KERNEL_WITH_EXT4([enable_ext4='yes'],
+				[enable_ext4='no']) ;;
+	esac
+fi
+if test x$enable_ext4 = xyes; then
+	 ac_configure_args="$ac_configure_args --enable-ext4"
+fi
+AC_MSG_CHECKING([whether to build ldiskfs based on ext4])
+AC_MSG_RESULT([$enable_ext4])
+])
+
 # Define no libcfs by default.
 AC_DEFUN([LB_LIBCFS_DIR],
 [
@@ -273,6 +397,50 @@ AC_DEFUN([LB_DEFINE_LDISKFS_OPTIONS],
 	AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
 	AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
 	AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security for ldiskfs])
+	AC_DEFINE(CONFIG_LDISKFSDEV_FS_POSIX_ACL, 1, [enable posix acls for ldiskfs])
+	AC_DEFINE(CONFIG_LDISKFSDEV_FS_XATTR, 1, [enable extented attributes for ldiskfs])
+	AC_DEFINE(CONFIG_LDISKFSDEV_FS_SECURITY, 1, [enable fs security for ldiskfs])
+])
+
+#
+# LB_DEFINE_E2FSPROGS_NAMES
+#
+# Enable the use of alternate naming of ldiskfs-enabled e2fsprogs package.
+#
+AC_DEFUN([LB_DEFINE_E2FSPROGS_NAMES],
+[AC_ARG_WITH([ldiskfsprogs],
+        AC_HELP_STRING([--with-ldiskfsprogs],
+                       [use alternate names for ldiskfs-enabled e2fsprogs]),
+	[],[withval='no'])
+
+AC_MSG_CHECKING([whether to use alternate names for e2fsprogs])
+if test x$withval = xyes ; then
+	AC_DEFINE(HAVE_LDISKFSPROGS, 1, [enable use of ldiskfsprogs package])
+	E2FSPROGS="ldiskfsprogs"
+	MKE2FS="mkfs.ldiskfs"
+	DEBUGFS="debugfs.ldiskfs"
+	TUNE2FS="tunefs.ldiskfs"
+	E2LABEL="label.ldiskfs"
+	DUMPE2FS="dumpfs.ldiskfs"
+	E2FSCK="fsck.ldiskfs"
+	AC_MSG_RESULT([enabled])
+else
+	E2FSPROGS="e2fsprogs"
+	MKE2FS="mke2fs"
+	DEBUGFS="debugfs"
+	TUNE2FS="tune2fs"
+	E2LABEL="e2label"
+	DUMPE2FS="dumpe2fs"
+	E2FSCK="e2fsck"
+	AC_MSG_RESULT([disabled])
+fi
+	AC_DEFINE_UNQUOTED(E2FSPROGS, "$E2FSPROGS", [name of ldiskfs e2fsprogs package])
+	AC_DEFINE_UNQUOTED(MKE2FS, "$MKE2FS", [name of ldiskfs mkfs program])
+	AC_DEFINE_UNQUOTED(DEBUGFS, "$DEBUGFS", [name of ldiskfs debug program])
+	AC_DEFINE_UNQUOTED(TUNE2FS, "$TUNE2FS", [name of ldiskfs tune program])
+	AC_DEFINE_UNQUOTED(E2LABEL, "$E2LABEL", [name of ldiskfs label program])
+	AC_DEFINE_UNQUOTED(DUMPE2FS,"$DUMPE2FS", [name of ldiskfs dump program])
+	AC_DEFINE_UNQUOTED(E2FSCK, "$E2FSCK", [name of ldiskfs fsck program])
 ])
 
 #
@@ -359,21 +527,73 @@ AM_CONDITIONAL(POSIX_OSD_ENABLED, test x$posix_osd = xyes)
 # LB_PATH_DMU
 #
 AC_DEFUN([LB_PATH_DMU],
-[AC_MSG_CHECKING([whether to enable DMU])
-if test x$enable_uoss = xyes -a x$enable_posix_osd != xyes; then
-	DMU_SRC="$PWD/lustre/zfs-lustre"
+[AC_ARG_ENABLE([dmu],
+	AC_HELP_STRING([--enable-dmu],
+	               [enable the DMU backend]),
+	[],[with_dmu='default'])
+AC_MSG_CHECKING([whether to enable DMU])
+case x$with_dmu in
+	xyes)
+		dmu_osd='yes'
+		;;
+	xno)
+		dmu_osd='no'
+		;;
+	xdefault)
+		if test x$enable_uoss = xyes -a x$posix_osd != xyes; then
+			# Enable the DMU if we're configuring a userspace server
+			dmu_osd='yes'
+		else
+			# Enable the DMU by default on the b_hd_kdmu branch
+			if test -d $PWD/zfs -a x$linux25$enable_server = xyesyes; then
+				dmu_osd='yes'
+			else
+				dmu_osd='no'
+			fi
+		fi
+		;;
+	*)
+		dmu_osd='yes'
+		;;
+esac
+AC_MSG_RESULT([$dmu_osd])
+if test x$dmu_osd = xyes; then
 	AC_DEFINE(DMU_OSD, 1, Enable DMU OSD)
-	AC_MSG_RESULT([yes])
-	LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
-		AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
-	])
-	AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
-	dmu_osd='yes'
-else
-	AC_MSG_RESULT([no])
+	if test x$enable_uoss = xyes; then
+		# Userspace DMU
+		DMU_SRC="$PWD/lustre/zfs-lustre"
+		AC_SUBST(DMU_SRC)
+		LB_CHECK_FILE([$DMU_SRC/src/.patched],[],[
+			AC_MSG_ERROR([A complete (patched) DMU tree was not found.])
+		])
+		AC_CONFIG_SUBDIRS(lustre/zfs-lustre)
+	else
+		# Kernel DMU
+		SPL_SUBDIR="spl"
+		ZFS_SUBDIR="zfs"
+
+		SPL_DIR="$PWD/$SPL_SUBDIR"
+		ZFS_DIR="$PWD/$ZFS_SUBDIR"
+
+		LB_CHECK_FILE([$SPL_DIR/module/spl/spl-generic.c],[],[
+			AC_MSG_ERROR([A complete SPL tree was not found in $SPL_DIR.])
+		])
+
+		LB_CHECK_FILE([$ZFS_DIR/module/zfs/dmu.c],[],[
+			AC_MSG_ERROR([A complete kernel DMU tree was not found in $ZFS_DIR.])
+		])
+
+		AC_CONFIG_SUBDIRS(spl)
+		ac_configure_args="$ac_configure_args --with-spl=$SPL_DIR"
+		AC_CONFIG_SUBDIRS(zfs)
+	fi
 fi
-AC_SUBST(DMU_SRC)
+AC_SUBST(SPL_SUBDIR)
+AC_SUBST(ZFS_SUBDIR)
+AC_SUBST(SPL_DIR)
+AC_SUBST(ZFS_DIR)
 AM_CONDITIONAL(DMU_OSD_ENABLED, test x$dmu_osd = xyes)
+AM_CONDITIONAL(KDMU, test x$dmu_osd$enable_uoss = xyesno)
 ])
 
 #
@@ -461,6 +681,30 @@ AC_MSG_RESULT([$enable_tests])
 ])
 
 #
+# LB_CONFIG_DIST
+#
+# Just enough configure so that "make dist" is useful
+#
+# this simply re-adjusts some defaults, which of course can be overridden
+# on the configure line after the --for-dist option
+#
+AC_DEFUN([LB_CONFIG_DIST],
+[AC_MSG_CHECKING([whether to configure just enough for make dist])
+AC_ARG_ENABLE([dist],
+	AC_HELP_STRING([--enable-dist],
+			[only configure enough for make dist]),
+	[enable_dist='yes'],[enable_dist='no'])
+AC_MSG_RESULT([$enable_dist])
+if test x$enable_dist != xno; then
+	enable_modules='no'
+	enable_utils='no'
+        enable_liblustre='no'
+        enable_doc='no'
+        enable_tests='no'
+fi
+])
+
+#
 # LB_CONFIG_DOCS
 #
 # Build docs?
@@ -472,7 +716,7 @@ AC_ARG_ENABLE(doc,
 			[skip creation of pdf documentation]),
 	[
 		if test x$enable_doc = xyes ; then
-		    ENABLE_DOC=1	   
+		    ENABLE_DOC=1
 		else
 		    ENABLE_DOC=0
 		fi
@@ -511,7 +755,7 @@ AC_SUBST(ENABLE_INIT_SCRIPTS)
 #
 AC_DEFUN([LB_CONFIG_HEADERS],
 [AC_CONFIG_HEADERS([config.h])
-CPPFLAGS="-include \$(top_builddir)/config.h $CPPFLAGS"
+CPPFLAGS="-include $PWD/config.h $CPPFLAGS"
 EXTRA_KCFLAGS="-include $PWD/config.h $EXTRA_KCFLAGS"
 AC_SUBST(EXTRA_KCFLAGS)
 ])
@@ -599,7 +843,7 @@ if test $target_cpu == "powerpc64"; then
 	CC="$CC -m64"
 fi
 
-CPPFLAGS="-I\$(top_builddir)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
@@ -628,6 +872,7 @@ AM_CONDITIONAL(LINUX, test x$lb_target_os = "xlinux")
 AM_CONDITIONAL(DARWIN, test x$lb_target_os = "xdarwin")
 AM_CONDITIONAL(CRAY_XT3, test x$enable_cray_xt3 = "xyes")
 AM_CONDITIONAL(SUNOS, test x$lb_target_os = "xSunOS")
+AM_CONDITIONAL(USES_DPKG, test x$uses_dpkg = "xyes")
 
 # this lets lustre cancel libsysio, per-branch or if liblustre is
 # disabled
@@ -672,6 +917,12 @@ AC_PACKAGE_TARNAME[.spec]
 AC_DEFUN([LB_CONFIGURE],
 [LB_CANONICAL_SYSTEM
 
+LB_CONFIG_DIST
+
+LB_DOWNSTREAM_RELEASE
+LB_USES_DPKG
+LB_BUILDID
+
 LB_LIBCFS_DIR
 
 LB_INCLUDE_RULES
@@ -684,24 +935,29 @@ LB_PROG_CC
 
 LB_UOSS
 LB_POSIX_OSD
-LB_PATH_DMU
 
 LB_CONFIG_DOCS
 LB_CONFIG_UTILS
 LB_CONFIG_TESTS
 LC_CONFIG_CLIENT_SERVER
 
-# two macros for cmd3 
-LC_CONFIG_SPLIT
+# two macros for cmd3
+m4_ifdef([LC_CONFIG_SPLIT], [LC_CONFIG_SPLIT])
 LN_CONFIG_CDEBUG
+LC_QUOTA
 
 LB_CONFIG_MODULES
+LN_CONFIG_USERSPACE
+LB_HAVE_EXT4_ENABLED
 
+LB_PATH_DMU
 LB_PATH_LIBSYSIO
 LB_PATH_SNMP
 LB_PATH_LDISKFS
 LB_PATH_LUSTREIOKIT
 
+LB_DEFINE_E2FSPROGS_NAMES
+
 LC_CONFIG_LIBLUSTRE
 LIBCFS_CONFIGURE
 LN_CONFIGURE