From 3344930765a889bc0d327d54cb11b57df7dd773e Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 12 Sep 2007 20:26:20 +0000
Subject: [PATCH] update usage from .rpmbuild.sh -> rpmbuild.sh & get rid of
 makefile support to generate the file

---
 Makefile     |  4 ++--
 Rules.mk     | 13 +++----------
 planetlab.mk | 16 ++++++++--------
 3 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index 31e7bae5..d8b25277 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.87 2006/08/11 12:28:38 thierry Exp $
+# $Id: Makefile,v 1.88 2007/08/22 14:41:32 mef Exp $
 #
 
 # Default target
@@ -38,7 +38,7 @@ $(foreach package,$(ALL),$(package)-clean): %-clean:
 
 # Remove all generated files
 clean:
-	rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros tmp parseSpec .rpmbuild.sh
+	rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros tmp parseSpec
 
 .PHONY: all $(ALL) $(foreach package,$(ALL),$(package)-clean) clean
 
diff --git a/Rules.mk b/Rules.mk
index ccbdcc33..8ac499f3 100644
--- a/Rules.mk
+++ b/Rules.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: Rules.mk,v 1.36 2007/09/10 22:17:14 mef Exp $
+# $Id: Rules.mk,v 1.37 2007/09/10 22:24:20 mef Exp $
 #
 
 # Base rpmbuild in the current directory
@@ -120,7 +120,7 @@ SOURCES/%.tar: SOURCES/%
 all: $(RPMS) $(SRPM)
 
 # Build RPMS
-$(RPMS): $(SPECFILE) $(SOURCES) .rpmbuild.sh
+$(RPMS): $(SPECFILE) $(SOURCES)
 	mkdir -p BUILD RPMS
 	$(RPMBUILD) $(RPMFLAGS) -bb $<
 
@@ -131,7 +131,7 @@ $(wordlist 2,$(words $(RPMS)),$(RPMS)): $(firstword $(RPMS))
 endif
 
 # Build SRPM
-$(SRPM): $(SPECFILE) $(SOURCES) .rpmbuild.sh
+$(SRPM): $(SPECFILE) $(SOURCES)
 	mkdir -p SRPMS
 	$(RPMBUILD) $(RPMFLAGS) -bs $<
 
@@ -140,13 +140,6 @@ $(SRPM): $(SPECFILE) $(SOURCES) .rpmbuild.sh
 	echo "%_topdir $(HOME)" > $@
 	echo "%_tmppath $(HOME)/tmp" >> $@
 
-.rpmbuild.sh:
-	echo "# GENERATED BY Rules.mk" > $@
-	echo 'export HOME=${PWD}' >> $@
-	echo "# There must be a more clever way to pass all args to rpmbuild!" >> $@
-	echo 'rpmbuild $$1 $$2 $$3 $$4 $$5 $$6' >> $@
-	chmod 755 .rpmbuild.sh
-
 # Remove files generated by this package
 clean:
 	rm -rf \
diff --git a/planetlab.mk b/planetlab.mk
index 6769186b..47fac1ea 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id: planetlab.mk,v 1.67.2.5 2007/09/06 21:01:20 mef Exp $
+# $Id: planetlab.mk,v 1.69 2007/09/06 21:02:43 mef Exp $
 #
 
 #
@@ -186,7 +186,7 @@ ALL += libhttpd++
 
 proper-MODULE := proper
 proper-SPEC := proper/proper.spec
-proper-RPMBUILD := sudo sh .rpmbuild.sh
+proper-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += proper
 
 proper: libhttpd++
@@ -297,7 +297,7 @@ ALL += PLCWWW
 vserver-reference-MODULE := vserver-reference build
 vserver-reference-SPEC := vserver-reference/vserver-reference.spec
 # Package must be built as root
-vserver-reference-RPMBUILD := sudo sh .rpmbuild.sh
+vserver-reference-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += vserver-reference
 
 # vserver-reference may require current packages
@@ -309,7 +309,7 @@ vserver-reference: $(filter-out vserver-reference,$(ALL))
 
 bootmanager-MODULE := bootmanager build
 bootmanager-SPEC := bootmanager/bootmanager.spec
-bootmanager-RPMBUILD := sudo sh .rpmbuild.sh
+bootmanager-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += bootmanager
 
 # bootmanager requires current packages
@@ -324,7 +324,7 @@ bootmanager: RPMS/yumgroups.xml
 
 bootcd-MODULE := bootcd build bootmanager
 bootcd-SPEC := bootcd/bootcd.spec
-bootcd-RPMBUILD := sudo sh .rpmbuild.sh
+bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += bootcd
 
 # bootcd requires current packages
@@ -337,7 +337,7 @@ bootcd: $(filter-out bootcd,$(ALL))
 myplc-MODULE := build myplc new_plc_www plc/scripts
 myplc-SPEC := myplc/myplc.spec
 # Package must be built as root
-myplc-RPMBUILD := sudo sh .rpmbuild.sh
+myplc-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += myplc
 
 # MyPLC may require current packages
@@ -353,7 +353,7 @@ myplc: RPMS/yumgroups.xml
 myplc-devel-MODULE := build myplc
 myplc-devel-SPEC := myplc/myplc-devel.spec
 # Package must be built as root
-myplc-devel-RPMBUILD := sudo sh .rpmbuild.sh
+myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += myplc-devel
 
 #
@@ -363,7 +363,7 @@ ALL += myplc-devel
 myplc-native-MODULE := build myplc plc/scripts
 myplc-native-SPEC := myplc/myplc-native.spec
 # Package must be built as root
-myplc-native-RPMBUILD := sudo sh .rpmbuild.sh
+myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += myplc-native
 
 # MyPLC may require current packages
-- 
2.47.0