From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 5 Jan 2011 11:27:47 +0000 (+0100)
Subject: when refreshing modules.list, sum modules from centos5 and f12
X-Git-Tag: 5.0-rc18~129^2~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=6f4cec53a7c08a360cce7c21ad8a3bc898f6ef68;p=build.git

when refreshing modules.list, sum modules from centos5 and f12
centos5 has more of our modules, bus now skips sfa
---

diff --git a/modules.update b/modules.update
index 0d7f9b2b..12ebce31 100755
--- a/modules.update
+++ b/modules.update
@@ -3,15 +3,17 @@
 # redirect this into modules.list to get it refreshed
 #
 
-# keep centos5 as the default target rather than - more accurate - f8 b/c we need more of our modules on centos
-fcdistro=centos5
+# run on several distros as we filter out duplicates anyways
+# centos5 has more of our modules, but skips sfa
+fcdistros="centos5 f12"
 
-( \
-  make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ; \
-  make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ; \
+( for fcdistro in $fcdistros; do 
+    make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
+  done 2>/dev/null ;
   echo tests
 ) | sort -uf | grep -v '^build$'