Skip to content
Snippets Groups Projects
Commit 7b16772a authored by jacob's avatar jacob
Browse files

* fix cvs up for HEAD branches

 * get rid of LC_{DARWIN,LINUX}_SUPPORTED in favor of more general
   LC_TARGET_SUPPORTED
 * fix some typos and spacings
parent 8db6a142
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
# 1. As a subdirectory from the toplevel, for automake # 1. As a subdirectory from the toplevel, for automake
# #
# 2. A wrapper around the kernel's makefile when building modules, to # 2. A wrapper around the kernel's makefile when building modules, to
# possibly override the .config file # possibly override the .config file
# #
# 3. At configure time, as the toplevel module dir for building # 3. At configure time, as the toplevel module dir for building
# kernel tests # kernel tests
...@@ -21,6 +21,8 @@ include autoMakefile ...@@ -21,6 +21,8 @@ include autoMakefile
else else
# case #2 # 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 $(LUSTRE_LINUX_CONFIG)
include Makefile include Makefile
......
...@@ -496,7 +496,7 @@ LB_LINUX_TRY_COMPILE([ ...@@ -496,7 +496,7 @@ LB_LINUX_TRY_COMPILE([
# #
# LB_LINUX_FUNC_ZAP_PAGE_RANGE # 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_DEFUN([LB_LINUX_FUNC_ZAP_PAGE_RANGE],
[AC_MSG_CHECKING([if zap_pag_range with vma parameter]) [AC_MSG_CHECKING([if zap_pag_range with vma parameter])
......
...@@ -125,28 +125,24 @@ AC_ARG_ENABLE([modules], ...@@ -125,28 +125,24 @@ AC_ARG_ENABLE([modules],
AC_HELP_STRING([--disable-modules], AC_HELP_STRING([--disable-modules],
[disable building of Lustre kernel modules]), [disable building of Lustre kernel modules]),
[],[ [],[
case $target_os in LC_TARGET_SUPPORTED([
linux* | darwin*) enable_modules='yes'
enable_modules='yes' ],[
;; enable_modules='no'
*) ])
enable_modules='no'
;;
esac
]) ])
AC_MSG_RESULT([$enable_modules ($target_os)]) AC_MSG_RESULT([$enable_modules ($target_os)])
if test x$enable_modules = xyes ; then if test x$enable_modules = xyes ; then
case $target_os in case $target_os in
linux*) linux*)
LC_LINUX_SUPPORTED([LB_PROG_LINUX], LB_PROG_LINUX
[AC_MSG_ERROR([Modules are not supported on $target_os])])
;; ;;
darwin*) darwin*)
LC_DARWIN_SUPPORTED([LB_PROG_DARWIN], LB_PROG_DARWIN
[AC_MSG_ERROR([Modules are not supported on $target_os])])
;; ;;
*) *)
# This is strange - Lustre supports a target we don't
AC_MSG_ERROR([Modules are not supported on $target_os]) AC_MSG_ERROR([Modules are not supported on $target_os])
;; ;;
esac esac
......
...@@ -51,18 +51,23 @@ cvs_cmd () ...@@ -51,18 +51,23 @@ cvs_cmd ()
local dir="$1" local dir="$1"
local module="$2" local module="$2"
local tag="$3" local tag="$3"
local cvstag="" local cotag=""
local update=""
if [ "$tag" != "HEAD" ] ; then if [ "$tag" = "HEAD" ] ; then
cvstag="-r $tag" cotag=""
uptag="-A"
else
cotag="-r $tag"
uptag="-r $tag"
fi fi
if [ -d "$dir" ] ; then if [ -d "$dir" ] ; then
echo "$progname: Updating $dir to $tag" echo "$progname: Updating $dir to $tag"
( cd "$dir" && cvs up $cvstag ) ( cd "$dir" && cvs up $uptag )
else else
echo "$progname: Checking out $dir from $tag" echo "$progname: Checking out $dir from $tag"
cvs co $cvstag -d "$dir" "$module" cvs co $cotag -d "$dir" "$module"
fi fi
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment