From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Mon, 11 Oct 2004 21:19:45 +0000 (+0000)
Subject: Removed vsh package, as util-vserver contains the new vsh binary.
X-Git-Tag: planetlab-3_0-branch-point~18
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b7ac6a003d9ef5423b1ffcfc88b2456762840950;p=build.git

Removed vsh package, as util-vserver contains the new vsh binary.

Added resman package.
---

diff --git a/Makefile b/Makefile
index 128538de..5a785f7a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id: Makefile,v 1.49 2004/10/11 04:26:22 mlhuang Exp $
+# $Id: Makefile,v 1.50 2004/10/11 19:18:13 mlhuang Exp $
 #
 
 # Default target
@@ -84,20 +84,6 @@ ALL += vnet
 # Build kernel first so we can bootstrap off of its build
 vnet: kernel
 
-#
-# vsh
-#
-
-vsh-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-vsh-INITIAL := HEAD
-vsh-TAG := HEAD
-vsh-MODULE := trampoline
-vsh-SPEC := trampoline/vsh.spec
-ALL += vsh
-
-# Build kernel first so we can bootstrap off of its build
-vsh: kernel
-
 #
 # util-vserver
 #
@@ -291,6 +277,17 @@ pl_sshd-MODULE := pl_sshd
 pl_sshd-SPEC := pl_sshd/pl_sshd.spec
 ALL += pl_sshd
 
+#
+# Resource Management Tools
+#
+
+resman-CVSROOT := :pserver:anon@build.planet-lab.org:/cvs
+resman-INITIAL := HEAD
+resman-TAG := HEAD
+resman-MODULE := resman
+resman-SPEC := resman/resman.spec
+ALL += resman
+
 #
 # ulogd
 #