From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sun, 4 Sep 2005 17:37:36 +0000 (+0000)
Subject: - re-run yum-arch after every package is built
X-Git-Tag: planetlab-3_2-branch-point~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2486cfb4fc366bea68309a755045a824c9dfbf7e;p=build.git

- re-run yum-arch after every package is built
---

diff --git a/Makefile b/Makefile
index e52fc6b9..bd3da7ef 100644
--- a/Makefile
+++ b/Makefile
@@ -289,8 +289,8 @@ ALL += vserver-reference
 # vserver-reference may require current packages
 vserver-reference: $(filter-out vserver-reference,$(ALL))
 
-# ...which should be indexed first
-vserver-reference: RPMS/yumgroups.xml RPMS/headers
+# ...and the yum manifest
+vserver-reference: RPMS/yumgroups.xml
 
 #
 # bootmanager
@@ -305,8 +305,8 @@ ALL += bootmanager
 # bootmanager may require current packages
 bootmanager: $(filter-out bootmanager,$(ALL))
 
-# ...which should be indexed first
-bootmanager: RPMS/yumgroups.xml RPMS/headers
+# ...and the yum manifest
+bootmanager: RPMS/yumgroups.xml
 
 ifeq ($(findstring $(package),$(ALL)),)
 
@@ -314,18 +314,15 @@ ifeq ($(findstring $(package),$(ALL)),)
 all: $(ALL)
         # Create package manifest
 	sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/SRPMS" SRPMS > SRPMS/packages.xml
-        # Generate yum headers
-	$(MAKE) RPMS/yumgroups.xml RPMS/headers
 
 RPMS/yumgroups.xml:
 	install -D -m 644 groups/v3_yumgroups.xml RPMS/yumgroups.xml
 
-RPMS/headers:
-	yum-arch RPMS
-
 # Recurse
 $(ALL):
 	$(MAKE) package=$@
+	yum-arch RPMS
+	yum-arch SRPMS
 
 # Upload packages to boot server
 SERVER := build@boot.planet-lab.org