#
# 1. As a subdirectory from the toplevel, for automake
#
-# 2. A wrapper around the kernel's makefile when building modules, to
-# possibly override the .config file
+# 2. A wrapper around the kernel's makefile when building modules, to
+# possibly override the .config file
#
# 3. At configure time, as the toplevel module dir for building
# kernel tests
else
# case #2
+# Note that this comes from make -C $LINUX -f $LUSTRE/build/Makefile
+# So the include Makefile includes $LINUX/Makefile, not this file
include $(LUSTRE_LINUX_CONFIG)
include Makefile
#
# LB_LINUX_FUNC_ZAP_PAGE_RANGE
#
-# if zap_page_range() taks a vma arg
+# if zap_page_range() takes a vma arg
#
AC_DEFUN([LB_LINUX_FUNC_ZAP_PAGE_RANGE],
[AC_MSG_CHECKING([if zap_pag_range with vma parameter])
AC_HELP_STRING([--disable-modules],
[disable building of Lustre kernel modules]),
[],[
- case $target_os in
- linux* | darwin*)
- enable_modules='yes'
- ;;
- *)
- enable_modules='no'
- ;;
- esac
+ LC_TARGET_SUPPORTED([
+ enable_modules='yes'
+ ],[
+ enable_modules='no'
+ ])
])
AC_MSG_RESULT([$enable_modules ($target_os)])
if test x$enable_modules = xyes ; then
case $target_os in
linux*)
- LC_LINUX_SUPPORTED([LB_PROG_LINUX],
- [AC_MSG_ERROR([Modules are not supported on $target_os])])
+ LB_PROG_LINUX
;;
darwin*)
- LC_DARWIN_SUPPORTED([LB_PROG_DARWIN],
- [AC_MSG_ERROR([Modules are not supported on $target_os])])
+ LB_PROG_DARWIN
;;
*)
+ # This is strange - Lustre supports a target we don't
AC_MSG_ERROR([Modules are not supported on $target_os])
;;
esac
local dir="$1"
local module="$2"
local tag="$3"
- local cvstag=""
+ local cotag=""
+ local update=""
- if [ "$tag" != "HEAD" ] ; then
- cvstag="-r $tag"
+ if [ "$tag" = "HEAD" ] ; then
+ cotag=""
+ uptag="-A"
+ else
+ cotag="-r $tag"
+ uptag="-r $tag"
fi
if [ -d "$dir" ] ; then
echo "$progname: Updating $dir to $tag"
- ( cd "$dir" && cvs up $cvstag )
+ ( cd "$dir" && cvs up $uptag )
else
echo "$progname: Checking out $dir from $tag"
- cvs co $cvstag -d "$dir" "$module"
+ cvs co $cotag -d "$dir" "$module"
fi
}