Land b_build_gate onto HEAD (20081219_2157)

b=18078

Land the build gate branch to build HEAD since we are going to retire
b1_8_gate. No real changes here except indenting fixes.

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 71ee36c..6bb9c11 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -111,7 +111,7 @@ LB_LINUX_TRY_COMPILE([
                RHEL_KENEL="yes"
                AC_MSG_RESULT([yes])
        ],[
-               AC_MSG_RESULT([no])
+               AC_MSG_RESULT([no])
 ])
 
 AC_MSG_CHECKING([that SuSe kernel])
@@ -125,7 +125,7 @@ LB_LINUX_TRY_COMPILE([
                SUSE_KERNEL="yes"
                AC_MSG_RESULT([yes])
        ],[
-               AC_MSG_RESULT([no])
+               AC_MSG_RESULT([no])
 ])
 
 ])
@@ -462,11 +462,6 @@ AC_DEFUN([LB_PROG_LINUX],
 LB_LINUX_ARCH
 LB_LINUX_SYMVERFILE
 
-#if test $LINUX_ARCH == "powerpc64"; then
-#      AC_MSG_WARN([set compiler with -m64])
-#      CFLAGS="$CFLAGS -m64"
-#      CC="$CC -m64"
-#fi
 
 LB_LINUX_CONFIG([MODULES],[],[
        AC_MSG_ERROR([module support is required to build Lustre kernel modules.])
@@ -506,14 +501,14 @@ AC_DEFUN([LB_LINUX_CONDITIONALS],
 
 #
 # LB_CHECK_SYMBOL_EXPORT
-# check symbol exported or not
+# check symbol exported or not 
 # $1 - symbol
 # $2 - file(s) for find.
 # $3 - do 'yes'
 # $4 - do 'no'
 #
 # 2.6 based kernels - put modversion info into $LINUX/Module.modvers
-# or check
+# or check 
 AC_DEFUN([LB_CHECK_SYMBOL_EXPORT],
 [AC_MSG_CHECKING([if Linux was built with symbol $1 is exported])
 grep -q -E '[[[:space:]]]$1[[[:space:]]]' $LINUX/$SYMVERFILE 2>/dev/null

diff --git a/build/buildcvs b/build/buildcvs
index 3bd064f..a15222f 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -73,12 +73,12 @@ case "$lustretag" in
 
     b_mpilnd)
         # lnet mpilnd development branch
-       lnettag="b_mpilnd"
-       lustretag="HEAD"
-       ;;
+        lnettag="b_mpilnd"
+        lustretag="HEAD"
+        ;;
 
     b_new_cmd)
-       portalstag="b_new_portals"
+        portalstag="b_new_portals"
         # lnettag="b_lnet_tmp"
         ;;
 
@@ -147,15 +147,15 @@ case "$lustretag" in
 
     b_self_test)
         # lnet self test development branch
-       lnettag="b_self_test"
-       lustretag="HEAD"
-       ;;
+        lnettag="b_self_test"
+        lustretag="HEAD"
+        ;;
 
     b_usocklnd)
         # lnet usocklnd development branch
-       lnettag="b_usocklnd"
-       lustretag="b1_6_usocklnd"
-       ;;
+        lnettag="b_usocklnd"
+        lustretag="b1_6_usocklnd"
+        ;;
 
     b_uo2iblnd)
         # lnet u-o2iblnd development branch
@@ -189,10 +189,10 @@ case "$lustretag" in
 
     b_ula)
         # lnet "User Level Access" development branch
-       lnettag="b_ula"
-       lustretag="HEAD"
+        lnettag="b_ula"
+        lustretag="HEAD"
         ldiskfstag="$ldiskfstag_head"
-       ;;
+        ;;
 
     # CMD3
     b_post_cmd3|b_new_cmd_sles10|b1_6_head_sync|b_mixed_layout_req|b_mount_perm|b1_8_gns|b1_8_interop_server)
@@ -203,7 +203,7 @@ case "$lustretag" in
     #umds cleanup
     b_hd_umds_cln2)
         ldiskfstag="b1_8_iam_dynlock"
-       ;;
+        ;;
 
     # uOSS
     b_hd_dmu)
@@ -244,7 +244,7 @@ case "$lustretag" in
     # uOSS o2iblnd
     b_uoss_o2iblnd)
         lnettag="b_uoss_o2iblnd"
-       lustretag="b_hd_dmu"
+        lustretag="b_hd_dmu"
         ldiskfstag="$ldiskfstag_head"
         dmutag="zfs-lustre"
         ;;