[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lustre-cvs
Subject:    [lustre-cvs] HEAD: lustre/scripts lmake lustre-kernel-2.4.spec.in lustre.spec.in
From:       Andreas Dilger <adilger () moraine ! clusterfs ! com>
Date:       2004-02-20 20:32:35
Message-ID: 200402202032.i1KKWZhZ022908 () lists ! clusterfs ! com
[Download RAW message or body]

Update of /cvsroot/lustre/lustre/scripts
In directory moraine.clusterfs.com:/tmp/cvs-serv22531/scripts

Modified Files:
	lmake lustre-kernel-2.4.spec.in lustre.spec.in 
Log Message:
Lustre v1.0.4


Index: lmake
===================================================================
RCS file: /cvsroot/lustre/lustre/scripts/lmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -b -B -p -r1.3 -r1.4
--- lmake	30 Jan 2004 23:46:25 -0000	1.3
+++ lmake	20 Feb 2004 20:32:32 -0000	1.4
@@ -219,7 +219,7 @@ load_target()
     else
 	EXTRA_VERSION="${EXTRA_VERSION}_lustre.$(get_lustre_version)"
     fi
-    EXTRA_VERSION=${EXTRA_VERSION//-/_}
+    # EXTRA_VERSION=${EXTRA_VERSION//-/_}
 }
 
 tarflags()
@@ -328,7 +328,7 @@ build_lustre()
 {
     (( $BUILD_LUSTRE )) || return 0
     pushd "$TOPDIR" >/dev/null
-    make -j $JOBS -s
+    make -j $JOBS -s || fatal 1 "Error building Lustre."
     popd >/dev/null
 }
 

Index: lustre-kernel-2.4.spec.in
===================================================================
RCS file: /cvsroot/lustre/lustre/scripts/lustre-kernel-2.4.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -b -B -p -r1.3 -r1.4
--- lustre-kernel-2.4.spec.in	30 Jan 2004 23:46:26 -0000	1.3
+++ lustre-kernel-2.4.spec.in	20 Feb 2004 20:32:32 -0000	1.4
@@ -385,10 +385,12 @@ BuildKernel smp
 %endif
 
 # we want this one last, so that it is the one populating /usr/bin
-%if %{buildup} && %{buildbase}
+%if %{buildbase}
+%if %{buildup}
 BuildKernel
-%elseif %{buildbase}
+%else
 BuildLustre
+%endif
 %endif
 
 %if %{buildbase}

Index: lustre.spec.in
===================================================================
RCS file: /cvsroot/lustre/lustre/scripts/lustre.spec.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -w -b -B -p -r1.40 -r1.41
--- lustre.spec.in	30 Jan 2004 23:46:26 -0000	1.40
+++ lustre.spec.in	20 Feb 2004 20:32:32 -0000	1.41
@@ -1,5 +1,5 @@
 # lustre.spec
-%define version 1.0.3
+%define version 1.0.4
 %define kversion @LINUXRELEASE@
 %define linuxdir @LINUX@
 %define enable_doc @ENABLE_DOC@

_______________________________________________
Lustre-cvs mailing list
Lustre-cvs@lists.clusterfs.com
https://lists.clusterfs.com/mailman/listinfo/lustre-cvs
[prev in list] [next in list] [prev in thread] [next in thread]