Fix build breakage introduced by lnet reorg.

Completely removed changes until something more compatable can be designed.

Backed out changes to build tree:
autogen.sh                      reverted back to rev 1.4
autoMakefile.am.toplevel        reverted back to rev 1.8
buildcvs                        reverted back to rev 1.44
Makefile.in.toplevel            reverted back to rev 1.1
autoconf/lustre-build-darwin.m4 reverted back to rev 1.8
autoconf/lustre-build-linux.m4  reverted back to rev 1.15
autoconf/lustre-build.m4        reverted back to rev 1.28

diff --git a/build/Makefile.in.toplevel b/build/Makefile.in.toplevel
index 2d6bd50..7440384 100644 (file)
--- a/build/Makefile.in.toplevel
+++ b/build/Makefile.in.toplevel
@@ -1,5 +1,4 @@
-subdir-m += lnet
-#subdir-m += portals
+subdir-m += portals
 subdir-m += lustre
 
 @INCLUDE_RULES@

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 045f722..5ecc7d1 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,9 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-#SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet portals lustre
-#DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet portals lustre
-SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
-DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet lustre
+SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ portals lustre
+DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio portals lustre
 
 EXTRA_DIST := config.h.in
 
@@ -30,8 +28,7 @@ tags:
 
 if MODULES
 all-sources:
-       $(MAKE) sources -C lnet
-#      $(MAKE) sources -C portals
+       $(MAKE) sources -C portals
        $(MAKE) sources -C lustre
 
 if LINUX

diff --git a/build/autoconf/lustre-build-darwin.m4 b/build/autoconf/lustre-build-darwin.m4
index 91a8a14..8b96dfb 100644 (file)
--- a/build/autoconf/lustre-build-darwin.m4
+++ b/build/autoconf/lustre-build-darwin.m4
@@ -93,9 +93,7 @@ AC_SUBST(kextdir)
 AC_SUBST(plistdir)
 AC_SUBST(macosdir)
 
-LN_PROG_DARWIN
-
-#LP_PROG_DARWIN
+LP_PROG_DARWIN
 
 LC_PROG_DARWIN
 ])

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 14895fb..03e5501 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -329,11 +329,8 @@ fi
 
 #LB_LINUX_CONFIG_BIG_STACK
 
-# LNet tests
-LN_PROG_LINUX
-
 # Portals tests
-#LP_PROG_LINUX
+LP_PROG_LINUX
 
 # Lustre tests
 LC_PROG_LINUX

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index f31f543..2b3ffe9 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -356,8 +356,7 @@ AC_SUBST(sysconfdir)
 docdir='${datadir}/doc/$(PACKAGE)'
 AC_SUBST(docdir)
 
-LN_PATH_DEFAULTS
-#LP_PATH_DEFAULTS
+LP_PATH_DEFAULTS
 LC_PATH_DEFAULTS
 ])
 
@@ -416,7 +415,7 @@ AC_TRY_COMPILE([],[],[
        CC="$CC_save"
 ])
 
-CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
+CPPFLAGS="-I\$(top_builddir)/portals/include -I\$(top_srcdir)/portals/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
 AC_SUBST(LLCPPFLAGS)
@@ -424,8 +423,8 @@ AC_SUBST(LLCPPFLAGS)
 LLCFLAGS="-g -Wall -fPIC"
 AC_SUBST(LLCFLAGS)
 
-# everyone builds against lnet and lustre
-EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/lnet/include -I$PWD/lustre/include"
+# everyone builds against portals and lustre
+EXTRA_KCFLAGS="$EXTRA_KCFLAGS -g -I$PWD/portals/include -I$PWD/lustre/include"
 AC_SUBST(EXTRA_KCFLAGS)
 ])
 
@@ -458,8 +457,7 @@ AC_SUBST(SYSIO)
 LB_LINUX_CONDITIONALS
 LB_DARWIN_CONDITIONALS
 
-LN_CONDITIONALS
-#LP_CONDITIONALS
+LP_CONDITIONALS
 LC_CONDITIONALS
 ])
 
@@ -490,8 +488,7 @@ LB_CONFIG_MODULES
 
 LC_CONFIG_LIBLUSTRE
 
-LN_CONFIGURE
-#LP_CONFIGURE
+LP_CONFIGURE
 LC_CONFIGURE
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIGURE
@@ -509,8 +506,7 @@ build/Rules
 build/lustre.spec
 ])
 
-LN_CONFIG_FILES
-#LP_CONFIG_FILES
+LP_CONFIG_FILES
 LC_CONFIG_FILES
 if test "$SNMP_DIST_SUBDIR" ; then
        LS_CONFIG_FILES

diff --git a/build/autogen.sh b/build/autogen.sh
index 8ec1324..b27e0f9 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -79,8 +79,7 @@ check_version() {
 
 echo "Checking for a complete tree..."
 # required directories
-#for dir in build lnet portals lustre ; do
-for dir in build lnet lustre ; do
+for dir in build portals lustre ; do
     if [ ! -d "$dir" ] ; then
        cat >&2 <<EOF
 Your tree seems to be missing $dir.

diff --git a/build/buildcvs b/build/buildcvs
index 05ab503..763180a 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -1,7 +1,6 @@
 # This file is sourced by lustre/lustrecvs
 
 portalstag="HEAD"
-lnettag="HEAD"
 libsysiotag="HEAD"
 snmptag=""
 
@@ -30,7 +29,6 @@ case "$lustretag" in
 
     b1_4_newconfig)    
         portalstag="b_hd_newconfig"
-        lnettag="b_hd_newconfig"
        ;;
 
     b_cmd*)
@@ -84,6 +82,5 @@ esac
 
 cvs_cmd libsysio libsysio "$libsysiotag"
 cvs_cmd portals portals "$portalstag"
-cvs_cmd lnet lnet "$lnettag"
 cvs_cmd snmp lustre-snmp "$snmptag"
 cvs_cmd lustre lustre-core "$lustretag"