X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootstrapfs.spec;h=f9d0fcd47965b6f0033ba2772d1b5dc42e0c2439;hb=0a880dc9438994d8f940da5b7c35cec1512205c8;hp=083edf19a2423d026bbad4cddb42b89fa29b8e91;hpb=5f45a178d867d1114d74b0617dcdc6cd79ff7891;p=nodeimage.git diff --git a/bootstrapfs.spec b/bootstrapfs.spec index 083edf1..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}} @@ -85,7 +85,7 @@ pushd bootstrapfs/nodeconfig/yum for fcdistro in $(ls); do [ -d $fcdistro ] || continue # get packages to exclude on nodes for that fcdistro/pldistro - NODEYUMEXCLUDE="exclude=$(../../../build/nodeyumexclude.sh $fcdistro $pldistro)" + NODEYUMEXCLUDE="exclude=$(../../../build/nodeyumexclude.sh $fcdistro %{pldistro})" pushd $fcdistro/yum.myplc.d echo "* Handling NODEYUMEXCLUDE in yum repo for $fcdistro/$pldistro ($NODEYUMEXCLUDE)" for filein in $(find . -name '*.in') ; do @@ -152,6 +152,9 @@ rm -rf $RPM_BUILD_ROOT /etc/plc.d %changelog +* Thu Feb 16 2012 Thierry Parmentelat - bootstrapfs-2.0-14 +- changes needed for build with yumexcludes defined in a separate pkgs file + * Wed Aug 31 2011 Thierry Parmentelat - bootstrapfs-2.0-13 - plc.d/packages: rewrote comments about some corner cases where it fails - plc.d/packages: marginally more robust