X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootstrapfs.spec;h=f9d0fcd47965b6f0033ba2772d1b5dc42e0c2439;hb=69b386580192c18271fbcccc73821812a8dd3bfa;hp=f2a15db34c422b4e5a93fa55671d620c5bf3b976;hpb=49099a11ab0dd37eb0069738aa5d6e0664399d48;p=bootstrapfs.git

diff --git a/bootstrapfs.spec b/bootstrapfs.spec
index f2a15db..f9d0fcd 100644
--- a/bootstrapfs.spec
+++ b/bootstrapfs.spec
@@ -5,7 +5,7 @@
 
 %define name bootstrapfs-%{nodefamily}
 %define version 2.0
-%define taglevel 13
+%define taglevel 14
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -84,13 +84,13 @@ pushd bootstrapfs/nodeconfig/yum
 # scan fcdistros and catenate all repos in 'stock.repo' so db-config can be distro-independant
 for fcdistro in $(ls); do
     [ -d $fcdistro ] || continue
-    # get kexcludes for that distro
-    KEXCLUDE="exclude=$(../../../build/getkexcludes.sh -f $fcdistro)"
+    # get packages to exclude on nodes for that fcdistro/pldistro
+    NODEYUMEXCLUDE="exclude=$(../../../build/nodeyumexclude.sh $fcdistro %{pldistro})"
     pushd $fcdistro/yum.myplc.d
-    echo "* Handling KEXCLUDE in yum repo for $fcdistro ($KEXCLUDE)"
+    echo "* Handling NODEYUMEXCLUDE in yum repo for $fcdistro/$pldistro ($NODEYUMEXCLUDE)"
     for filein in $(find . -name '*.in') ; do
 	file=$(echo $filein | sed -e "s,\.in$,,")
-	sed -e "s,@KEXCLUDE@,$KEXCLUDE,g" $filein > $file
+	sed -e "s,@NODEYUMEXCLUDE@,$NODEYUMEXCLUDE,g" $filein > $file
     done
     rm -f stock.repo
     cat *.repo > stock.repo
@@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/plc.d
 
 %changelog
+* Thu Feb 16 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-14
+- changes needed for build with yumexcludes defined in a separate pkgs file
+
 * Wed Aug 31 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-13
 - plc.d/packages: rewrote comments about some corner cases where it fails
 - plc.d/packages: marginally more robust