X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootstrapfs.spec;h=a588f13b0520770fa9d9b323d36698307ed91faa;hb=beab057094dd2feb3ebe3451daf9b5a712fed487;hp=90d07d37270b8a0ce49575e90aaf21a8ee2514bb;hpb=296b3d4af2f78b2f8c401748685b6cdf1b8dfcd7;p=bootstrapfs.git diff --git a/bootstrapfs.spec b/bootstrapfs.spec index 90d07d3..a588f13 100644 --- a/bootstrapfs.spec +++ b/bootstrapfs.spec @@ -1,23 +1,26 @@ # -# $Id$ -# -%define url $URL$ %define nodefamily %{pldistro}-%{distroname}-%{_arch} %define extensionfamily %{distroname}-%{_arch} %define name bootstrapfs-%{nodefamily} %define version 2.0 -%define taglevel 0 +%define taglevel 7 # pldistro already in the rpm name #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define release %{taglevel}%{?date:.%{date}} +# we don't really need the standard postinstall process from rpm that +# strips files and byte-compiles python files. all files in this +# package are comming from other rpm files and they've already went +# through this post install processing. - baris +%define __os_install_post %{nil} + Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} Summary: The PlanetLab Bootstrap Filesystems for %{nodefamily} Name: %{name} @@ -56,28 +59,30 @@ Group: System Environment/Base %description -n nodeyum Utility scripts for configuring node updates. This package is designed for the MyPLC side. -# need the apache user at install-time -Requires: httpd %prep %setup -q %build -pushd BootstrapFS -./build.sh %{pldistro} -popd BootstrapFS -# xxx in a multi-flavour myplc, we should ship for all fcdistros -# and let the php scripts do the right thing - -pushd BootstrapFS/nodeconfig/yum - -# expand list of kexcludes +############################## node-side +[ -d bootstrapfs ] || ln -s BootstrapFS bootstrapfs +pushd bootstrapfs +./build.sh %{pldistro} +for tar in *.tar *.tar.bz2; do + echo "* Computing SHA1 checksum for $tar" + sha1sum $tar > $tar.sha1sum + chmod 444 $tar.sha1sum +done +popd +############################## server-side +# ship all fcdistros for multi-fcdistros myplc, and let the php scripts do the right thing +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)" pushd $fcdistro/yum.myplc.d echo "* Handling KEXCLUDE in yum repo for $fcdistro ($KEXCLUDE)" @@ -89,62 +94,91 @@ for fcdistro in $(ls); do cat *.repo > stock.repo popd done - popd %install rm -rf $RPM_BUILD_ROOT -pushd BootstrapFS -#arch=$(uname -i) - -install -D -m 644 bootstrapfs-%{nodefamily}.tar.bz2 \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-%{nodefamily}.tar.bz2 -install -D -m 644 bootstrapfs-%{nodefamily}.tar \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-%{nodefamily}.tar - -for pkgs in $(ls ../build/config.%{pldistro}/bootstrapfs-*.pkgs) ; do - NAME=$(basename $pkgs .pkgs | sed -e s,bootstrapfs-,,) - install -D -m 644 %{pldistro}-filesystems/bootstrapfs-${NAME}-%{extensionfamily}.tar.bz2 \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-${NAME}-%{extensionfamily}.tar.bz2 - install -D -m 644 %{pldistro}-filesystems/bootstrapfs-${NAME}-%{extensionfamily}.tar \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-${NAME}-%{extensionfamily}.tar +############################## node-side +pushd bootstrapfs +for out in *.tar *.tar.bz2 ; do + echo "* Installing $out" + install -D -m 644 $out $RPM_BUILD_ROOT/var/www/html/boot/$out +done +for out in *.sha1sum; do + echo "* Installing $out" + install -D -m 444 $out $RPM_BUILD_ROOT/var/www/html/boot/$out done popd -pushd BootstrapFS/nodeconfig/yum -echo "* Installing MyPLC-side yum stuff" -# expose (fixed) myplc.repo.php as https:///yum/myplc.repo.php -install -D -m 644 ./yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php -# expose the fcdistro-dependant yum.conf as https:///yum/yum.conf -install -D -m 644 ./yum/%{distroname}/yum.conf $RPM_BUILD_ROOT/var/www/html/yum/yum.conf -# expose the (fcdistro-dependant) stock.repo as https:///yum/stock.repo -install -D -m 644 ./yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo +############################## server-side +# ship all fcdistros for multi-fcdistros myplc, and let the php scripts do the right thing +pushd bootstrapfs +echo "* Installing MyPLC-side nodes yum config utilities (support for multi-fcdistro)" +mkdir -p $RPM_BUILD_ROOT/var/www/html/yum/ +rsync -av ./nodeconfig/yum/ $RPM_BUILD_ROOT/var/www/html/yum/ + +# Install initscripts +echo "* Installing plc.d initscripts" +find plc.d | cpio -p -d -u ${RPM_BUILD_ROOT}/etc/ +chmod 755 ${RPM_BUILD_ROOT}/etc/plc.d/* + +echo "* Installing db-config.d files" +mkdir -p ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d +cp db-config.d/* ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d +chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/* popd %clean rm -rf $RPM_BUILD_ROOT -%post -n nodeyum -# the boot manager upload area -mkdir -p /var/log/bm -chown apache:apache /var/log/bm -chmod 700 /var/log/bm - %files %defattr(-,root,root,-) /var/www/html/boot/bootstrapfs*.tar.bz2 +/var/www/html/boot/bootstrapfs*.tar.bz2.sha1sum %files plain %defattr(-,root,root,-) /var/www/html/boot/bootstrapfs*.tar +/var/www/html/boot/bootstrapfs*.tar.sha1sum %files -n nodeyum %defattr(-,root,root,-) /var/www/html/yum +/etc/planetlab/db-config.d +/etc/plc.d %changelog +* Sun Jan 23 2011 Thierry Parmentelat - bootstrapfs-2.0-7 +- yum repo template for f14 nodes +- tweaks the way /etc/plc.d/packages works + +* Mon Jul 05 2010 Baris Metin - BootstrapFS-2.0-6 +- add sha1sum +- module name changes + +* Tue Apr 27 2010 Talip Baris Metin - BootstrapFS-2.0-5 +- support different flavours of vservers on nodes + +* Mon Apr 12 2010 Thierry Parmentelat - BootstrapFS-2.0-4 +- fix unmatched $ in URL svn keywords + +* Fri Apr 02 2010 Thierry Parmentelat - BootstrapFS-2.0-3 +- choice between various pldistros is not made at build time, but at run time +- relies on GetNodeFlavour to expose the node's fcdistro - requires PLCAPI-5.0-5 +- in addition, the baseurl for the myplc repo is http:// and not https:// anymore +- the https method does not work on fedora 12, and GPG is used below anyway + +* Fri Mar 12 2010 Thierry Parmentelat - BootstrapFS-2.0-2 +- new slicerepo package for exposing stuff to slivers + +* Fri Jan 29 2010 Thierry Parmentelat - BootstrapFS-2.0-1 +- first working version of 5.0: +- pld.c/, db-config.d/ and nodeconfig/ scripts should now sit in the module they belong to +- nodefailiy is 3-fold with pldistro-fcdistro-arch +- new module nodeyum; first draft has the php scripts and conf_files for tweaking nodes yum config + * Mon Jan 04 2010 Thierry Parmentelat - BootstrapFS-1.0-11 - for building on fedora12