X-Git-Url: http://git.onelab.eu/?p=nodeimage.git;a=blobdiff_plain;f=bootstrapfs.spec;h=083edf19a2423d026bbad4cddb42b89fa29b8e91;hp=52731e765b8d1379dd8c75baf8eadc5fb27e2b01;hb=5f45a178d867d1114d74b0617dcdc6cd79ff7891;hpb=dd2d1408ad86916a245673a11fd4c5c12d617b37 diff --git a/bootstrapfs.spec b/bootstrapfs.spec index 52731e7..083edf1 100644 --- a/bootstrapfs.spec +++ b/bootstrapfs.spec @@ -1,22 +1,26 @@ # -# $Id$ -# -%define url $URL$ -%define nodefamily %{pldistro}-%{_arch} +%define nodefamily %{pldistro}-%{distroname}-%{_arch} +%define extensionfamily %{distroname}-%{_arch} %define name bootstrapfs-%{nodefamily} -%define version 1.0 -%define taglevel 6 +%define version 2.0 +%define taglevel 13 # 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} @@ -30,6 +34,12 @@ 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} +Obsoletes: bootstrapfs-%{obsolete_nodefamily} AutoReqProv: no %define debug_package %{nil} @@ -45,60 +55,167 @@ Group: System Environment/Base %description plain This package provides the same functions as %{name} but with uncompressed tarball for faster tests. +%package -n nodeyum +Summary: the MyPLC-side utilities for tweaking nodes yum configs +Group: System Environment/Base +%description -n nodeyum +Utility scripts for configuring node updates. This package is designed +for the MyPLC side. + %prep %setup -q %build -pushd BootstrapFS + +############################## node-side +[ -d bootstrapfs ] || ln -s BootstrapFS bootstrapfs +pushd bootstrapfs ./build.sh %{pldistro} -popd BootstrapFS +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 packages to exclude on nodes for that 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 + file=$(echo $filein | sed -e "s,\.in$,,") + sed -e "s,@NODEYUMEXCLUDE@,$NODEYUMEXCLUDE,g" $filein > $file + done + rm -f stock.repo + cat *.repo > stock.repo + popd +done +popd %install rm -rf $RPM_BUILD_ROOT -pushd BootstrapFS -arch=$(uname -i) - -install -D -m 644 bootstrapfs-%{pldistro}-${arch}.tar.bz2 \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-%{pldistro}-${arch}.tar.bz2 -install -D -m 644 bootstrapfs-%{pldistro}-${arch}.tar \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-%{pldistro}-${arch}.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}-${arch}.tar.bz2 \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-${NAME}-${arch}.tar.bz2 - install -D -m 644 %{pldistro}-filesystems/bootstrapfs-${NAME}-${arch}.tar \ - $RPM_BUILD_ROOT/var/www/html/boot/bootstrapfs-${NAME}-${arch}.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 +############################## 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 -# If run under sudo -if [ -n "$SUDO_USER" ] ; then - # Allow user to delete the build directory - chown -h -R $SUDO_USER . - # Some temporary cdroot files like /var/empty/sshd and - # /usr/bin/sudo get created with non-readable permissions. - find . -not -perm +0600 -exec chmod u+rw {} \; - # Allow user to delete the built RPM(s) - chown -h -R $SUDO_USER %{_rpmdir}/%{_arch} -fi - -%post %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 +* 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 + +* 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 +- 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 + +* Thu Oct 22 2009 Thierry Parmentelat - BootstrapFS-1.0-10 +- cosmetic change in message at build-time + +* Fri Oct 09 2009 Thierry Parmentelat - BootstrapFS-1.0-9 +- can use groups in the pkgs file with +++ for space + +* Tue Apr 07 2009 Thierry Parmentelat - BootstrapFS-1.0-8 +- bugfix for when a .post script is not needed + +* Tue Apr 07 2009 Thierry Parmentelat - BootstrapFS-1.0-7 +- search post-install scripts (.post) in path (distro, then planetlab) +- mostly useful for externally-defined pldistros + * Thu Jan 08 2009 Thierry Parmentelat - BootstrapFS-1.0-6 - fix build bug when dealing with extensions @@ -128,3 +245,5 @@ fi * Fri Sep 2 2005 Mark Huang - - Initial build. + +%define module_current_branch 1.0