From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 22 Aug 2007 14:41:32 +0000 (+0000)
Subject: final changes to gets things to build on FC6
X-Git-Tag: 4.2-rc2~598
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=013a4d3262606ab7bfe5f1009c3637cbb6705d9d;p=build.git

final changes to gets things to build on FC6
---

diff --git a/Makefile b/Makefile
index 6bc19333..31e7bae5 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.86 2006/03/08 21:38:50 mlhuang Exp $
+# $Id: Makefile,v 1.87 2006/08/11 12:28:38 thierry 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
+	rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros tmp parseSpec .rpmbuild.sh
 
 .PHONY: all $(ALL) $(foreach package,$(ALL),$(package)-clean) clean
 
diff --git a/Rules.mk b/Rules.mk
index 462d208c..473a4e15 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.33 2007/03/19 16:25:04 thierry Exp $
+# $Id: Rules.mk,v 1.34 2007/07/19 20:39:33 mef Exp $
 #
 
 # Base rpmbuild in the current directory
@@ -120,7 +120,7 @@ SOURCES/%.tar: SOURCES/%
 all: $(RPMS) $(SRPM)
 
 # Build RPMS
-$(RPMS): $(SPECFILE) $(SOURCES)
+$(RPMS): $(SPECFILE) $(SOURCES) .rpmbuild.sh
 	mkdir -p BUILD RPMS
 	$(RPMBUILD) $(RPMFLAGS) -bb $<
 
@@ -131,15 +131,21 @@ $(wordlist 2,$(words $(RPMS)),$(RPMS)): $(firstword $(RPMS))
 endif
 
 # Build SRPM
-$(SRPM): $(SPECFILE) $(SOURCES)
+$(SRPM): $(SPECFILE) $(SOURCES) .rpmbuild.sh
 	mkdir -p SRPMS
-	rpmbuild $(RPMFLAGS) -bs $<
+	$(RPMBUILD) $(RPMFLAGS) -bs $<
 
 # Base rpmbuild in the current directory
 .rpmmacros:
 	echo "%_topdir $(HOME)" > $@
 	echo "%_tmppath $(HOME)/tmp" >> $@
 
+.rpmbuild.sh:
+	echo "# GENERATED BY Rules.mk" > $@
+	echo "export HOME=$(HOME)" >> $@
+	echo "# There must be a more clever way to pass all args to rpmbuild!" >> $@
+	echo 'rpmbuild $$1 $$2 $$3 $$4 $$5 $$6' >> $@
+
 # Remove files generated by this package
 clean:
 	rm -rf \
diff --git a/planetlab.mk b/planetlab.mk
index 6eb8ff11..d0378376 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.63 2007/07/31 14:15:30 dhozac Exp $
+# $Id: planetlab.mk,v 1.64 2007/08/14 16:16:39 faiyaza Exp $
 #
 
 #
@@ -187,6 +187,7 @@ ALL += libhttpd++
 
 proper-MODULE := proper
 proper-SPEC := proper/proper.spec
+proper-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += proper
 
 proper: libhttpd++
@@ -289,7 +290,7 @@ ALL += PLCAPI
 vserver-reference-MODULE := vserver-reference build
 vserver-reference-SPEC := vserver-reference/vserver-reference.spec
 # Package must be built as root
-vserver-reference-RPMBUILD := sudo rpmbuild
+vserver-reference-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += vserver-reference
 
 # vserver-reference may require current packages
@@ -301,7 +302,7 @@ vserver-reference: $(filter-out vserver-reference,$(ALL))
 
 bootmanager-MODULE := bootmanager build
 bootmanager-SPEC := bootmanager/bootmanager.spec
-bootmanager-RPMBUILD := sudo rpmbuild
+bootmanager-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += bootmanager
 
 # bootmanager requires current packages
@@ -316,7 +317,7 @@ bootmanager: RPMS/yumgroups.xml
 
 bootcd-MODULE := bootcd build bootmanager
 bootcd-SPEC := bootcd/bootcd.spec
-bootcd-RPMBUILD := sudo rpmbuild
+bootcd-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += bootcd
 
 # bootcd requires current packages
@@ -329,7 +330,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 rpmbuild
+myplc-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += myplc
 
 # MyPLC may require current packages
@@ -345,7 +346,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 rpmbuild
+myplc-devel-RPMBUILD := sudo sh .rpmbuild.sh
 ALL += myplc-devel
 
 #