git://git.onelab.eu
/
bootstrapfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kexclude->yumexclude
[bootstrapfs.git]
/
bootstrapfs.spec
diff --git
a/bootstrapfs.spec
b/bootstrapfs.spec
index
9b01791
..
26eb631
100644
(file)
--- a/
bootstrapfs.spec
+++ b/
bootstrapfs.spec
@@
-5,7
+5,7
@@
%define name bootstrapfs-%{nodefamily}
%define version 2.0
%define name bootstrapfs-%{nodefamily}
%define version 2.0
-%define taglevel 1
2
+%define taglevel 1
3
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
# 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
# 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 $fc
distro)"
+ # get
packages to exclude on nodes for that fcdistro/pl
distro
+
NODEYUMEXCLUDE="exclude=$(../../../build/nodeyumexcludes.sh $fcdistro $pl
distro)"
pushd $fcdistro/yum.myplc.d
pushd $fcdistro/yum.myplc.d
- echo "* Handling
KEXCLUDE in yum repo for $fcdistro ($K
EXCLUDE)"
+ echo "* Handling
NODEYUMEXCLUDE in yum repo for $fcdistro/$pldistro ($NODEYUM
EXCLUDE)"
for filein in $(find . -name '*.in') ; do
file=$(echo $filein | sed -e "s,\.in$,,")
for filein in $(find . -name '*.in') ; do
file=$(echo $filein | sed -e "s,\.in$,,")
- sed -e "s,@
KEXCLUDE@,$K
EXCLUDE,g" $filein > $file
+ sed -e "s,@
NODEYUMEXCLUDE@,$NODEYUM
EXCLUDE,g" $filein > $file
done
rm -f stock.repo
cat *.repo > stock.repo
done
rm -f stock.repo
cat *.repo > stock.repo
@@
-152,6
+152,10
@@
rm -rf $RPM_BUILD_ROOT
/etc/plc.d
%changelog
/etc/plc.d
%changelog
+* 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
+
* Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-12
- minor tweak in plc.d/packages
* Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-12
- minor tweak in plc.d/packages