X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=blobdiff_plain;f=bootstrapfs.spec;h=9b0179191631aca12b5e6bcc735dfa207ccc0be5;hp=da84c1074cbd970acc7e53f82d6c6b190421e03a;hb=93d5af679f27df402ba8f2f06860d34bc331a828;hpb=ee50ab5ee36234b25f63068c7911772dd7a70a97 diff --git a/bootstrapfs.spec b/bootstrapfs.spec index da84c10..9b01791 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 1 +%define taglevel 12 # 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} @@ -31,6 +34,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: tar, gnupg, sharutils, bzip2 +# this is for plc.d/packages that uses ed for hacking yumgroups.xml +Requires: ed # 5.0 now has 3-fold nodefamily %define obsolete_nodefamily %{pldistro}-%{_arch} @@ -63,12 +68,19 @@ for the MyPLC side. %build ############################## node-side -pushd BootstrapFS +[ -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 -pushd BootstrapFS/nodeconfig/yum +# 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 @@ -90,35 +102,23 @@ popd rm -rf $RPM_BUILD_ROOT ############################## node-side -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 +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 ############################## server-side -# xxx unfinished business here -# xxx in a multi-flavour myplc, we should ship for all fcdistros -# and let the php scripts do the right thing -pushd BootstrapFS -echo "* Installing MyPLC-side nodes yum config utilities" -# expose (fixed) myplc.repo.php as https:///yum/myplc.repo.php -install -D -m 644 ./nodeconfig/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 ./nodeconfig/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 ./nodeconfig/yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo +# 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" @@ -138,10 +138,12 @@ rm -rf $RPM_BUILD_ROOT %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,-) @@ -150,6 +152,44 @@ rm -rf $RPM_BUILD_ROOT /etc/plc.d %changelog +* Fri Jun 10 2011 Thierry Parmentelat - bootstrapfs-2.0-12 +- minor tweak in plc.d/packages + +* Mon Jun 06 2011 Baris Metin - bootstrapfs-2.0-11 +- sl6 templates + +* Thu Feb 17 2011 Thierry Parmentelat - bootstrapfs-2.0-10 +- bugfix for multi-flavour deployments + +* Fri Feb 04 2011 Thierry Parmentelat - bootstrapfs-2.0-9 +- for multi-flavours : 'packages' step in plc.d now handles vserver links and related hacks in yumgroups + +* Thu Jan 27 2011 Thierry Parmentelat - bootstrapfs-2.0-8 +- no semantic change - attempt to speed up build + +* 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