From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 1 Sep 2005 18:58:45 +0000 (+0000)
Subject: - restore RPMBUILD functionality, vserver-reference (and, soon, others)
X-Git-Tag: planetlab-3_2-branch-point~7
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3654dc7eff727f958220d76a066d881f46a373db;p=build.git

- restore RPMBUILD functionality, vserver-reference (and, soon, others)
  require root privs
---

diff --git a/Makefile b/Makefile
index 29955cb9..bfc8aec7 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.72 2005/07/14 18:13:15 mlhuang Exp $
+# $Id: Makefile,v 1.74 2005/08/21 22:27:22 mlhuang Exp $
 #
 
 # Default target
@@ -16,6 +16,7 @@ all:
 # TAG: CVS tag to patch to (if not HEAD)
 # MODULE: CVS module name to use (if not HEAD)
 # SPEC: RPM spec file template
+# RPMBUILD: If not rpmbuild
 # RPMFLAGS: Miscellaneous RPM flags
 # CVS_RSH: If not ssh
 # ALL: default targets
@@ -71,8 +72,13 @@ ALL += util-vserver
 vserver-reference-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
 vserver-reference-MODULE := vserver-reference
 vserver-reference-SPEC := vserver-reference/vserver-reference.spec
+# Package must be built as root
+vserver-reference-RPMBUILD := sudo rpmbuild
 ALL += vserver-reference
 
+# Reference image requires a dummy kernel and PlanetLabKeys
+vserver-reference: kernel PlanetLabKeys
+
 #
 # lkcdutils
 #
@@ -349,6 +355,7 @@ TAG := $(if $($(package)-TAG),$($(package)-TAG),$(TAG))
 MODULE := $($(package)-MODULE)
 SPEC := $($(package)-SPEC)
 RPMFLAGS := $($(package)-RPMFLAGS)
+RPMBUILD := $(if $($(package)-RPMBUILD),$($(package)-RPMBUILD),rpmbuild)
 CVS_RSH := $(if $($(package)-CVS_RSH),$($(package)-CVS_RSH),ssh)
 
 include Makerules
diff --git a/Makerules b/Makerules
index 6e0da0ca..ffee0240 100644
--- a/Makerules
+++ b/Makerules
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: Makerules,v 1.14 2005/05/04 19:13:14 mlhuang Exp $
+# $Id$
 #
 
 # Base cvsps and rpmbuild in the current directory
@@ -151,7 +151,7 @@ all: RPMS/$(ARCH)/$(NVR).$(ARCH).rpm SRPMS/$(NVR).src.rpm
 # Build RPM
 RPMS/$(ARCH)/$(NVR).$(ARCH).rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros
 	mkdir -p BUILD RPMS
-	rpmbuild $(RPMFLAGS) -bb $<
+	$(RPMBUILD) $(RPMFLAGS) -bb $<
 
 # Build SRPM
 SRPMS/$(NVR).src.rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros
diff --git a/Rules.mk b/Rules.mk
index 6e0da0ca..ffee0240 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: Makerules,v 1.14 2005/05/04 19:13:14 mlhuang Exp $
+# $Id$
 #
 
 # Base cvsps and rpmbuild in the current directory
@@ -151,7 +151,7 @@ all: RPMS/$(ARCH)/$(NVR).$(ARCH).rpm SRPMS/$(NVR).src.rpm
 # Build RPM
 RPMS/$(ARCH)/$(NVR).$(ARCH).rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros
 	mkdir -p BUILD RPMS
-	rpmbuild $(RPMFLAGS) -bb $<
+	$(RPMBUILD) $(RPMFLAGS) -bb $<
 
 # Build SRPM
 SRPMS/$(NVR).src.rpm: SPECS/$(notdir $(SPEC)) $(SOURCES) .rpmmacros