Branch HEAD

b=15969

Instead of fighting with a special case of having libcfs only exist on HEAD, I
created an empty branch for b1_x in libcfs.

diff --git a/build/autogen.sh b/build/autogen.sh
index b406459..5d77897 100644 (file)
--- a/build/autogen.sh
+++ b/build/autogen.sh
@@ -83,7 +83,7 @@ if [ -d kernel_patches ] ; then
     REQUIRED_DIRS="build"
     CONFIGURE_DIRS=""
 else
-    REQUIRED_DIRS="build lnet lustre"
+    REQUIRED_DIRS="build libcfs lnet lustre"
     OPTIONAL_DIRS="snmp portals"
     CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
 fi

diff --git a/build/buildcvs b/build/buildcvs
index 0df9ab6..bf2a6b1 100644 (file)
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -7,7 +7,7 @@ snmptag="HEAD"
 ldiskfstag="HEAD"
 ldiskfstag_head="b1_8_iam"
 lustreiokittag="HEAD"
-libcfstag=""
+libcfstag="b1_x"
 dmutag=""
 hg_base_url="http://www.wizy.org/mercurial"
 
@@ -268,8 +268,6 @@ cvs_cmd lustre lustre-core "$lustretag"
 cvs_cmd ldiskfs ldiskfs "$ldiskfstag"
 cvs_cmd lustre-iokit lustre-iokit "$lustreiokittag"
 hg_cmd zfs-lustre "$hg_base_url" "$dmutag"
-if [ -n $libcfstag ]; then
-    cvs_cmd libcfs libcfs "$libcfstag"
-fi
+cvs_cmd libcfs libcfs "$libcfstag"
 
 [ -a ldiskfs/build ] || ln -sf ../build ldiskfs/build