X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=blobdiff_plain;f=noderepo.spec;h=510d33563fe39542a9241ccd21f4727246bfcb4f;hp=f90c32c5cf3a51097c96213ef52e86219c009b38;hb=51411ee59c8bce4342793f13fc2f6af729f53d3a;hpb=95d1d7e39e9a774e9e5703094c981ab27f782a90 diff --git a/noderepo.spec b/noderepo.spec index f90c32c..510d335 100644 --- a/noderepo.spec +++ b/noderepo.spec @@ -1,5 +1,5 @@ # -# $Id: bootstrapfs.spec 7668 2008-01-08 11:49:43Z thierry $ +# $Id$ # %define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/BootstrapFS/trunk/bootstrapfs.spec $ @@ -8,20 +8,23 @@ # %{distrorelease} : e.g. 8 # %{node_rpms_plus} : as a +++ separated list of rpms from the build dir -%define nodefamily %{pldistro}-%{_arch} +%define nodefamily %{pldistro}-%{distroname}-%{_arch} +%define obsolete_nodefamily %{pldistro}-%{_arch} %define name noderepo-%{nodefamily} -%define version 1.0 -%define taglevel 0 +%define version 2.0 +%define taglevel 2 -%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +# pldistro already in the rpm name +#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release %{taglevel}%{?date:.%{date}} -Vendor: PlanetLab -Packager: PlanetLab Central +Vendor: OneLab +Packager: PlanetLab Europe Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) -Summary: The initial content of the yum repository for nodes +Summary: The yum repository for nodes, to be installed on the myplc-side Name: %{name} Version: %{version} Release: %{release} @@ -35,6 +38,10 @@ BuildArch: noarch BuildRequires: rsync Requires: myplc +# 5.0 now has 3-fold nodefamily +%define obsolete_nodefamily %{pldistro}-%{_arch} +Obsoletes: noderepo-%{obsolete_nodefamily} + %define debug_package %{nil} %description @@ -63,16 +70,67 @@ install -D -m 644 %{_topdir}/RPMS/yumgroups.xml $RPM_BUILD_ROOT/var/www/html/ins rm -rf $RPM_BUILD_ROOT %post +# it would at first glance seem to make sense to invoke service plc start gpg here as well, +# as noderepo might get installed before myplc gets even started +# this however exhibit a deadlock, as rpm --almatches -e gpg-pubkey waits for transaction lock +# that is help by the calling yum/rpm service plc start packages %files %defattr(-,root,root,-) /var/www/html/install-rpms/%{nodefamily} +# don't overwrite yumgroups.xml if exists +%config(noreplace) /var/www/html/install-rpms/%{nodefamily}/yumgroups.xml %changelog +* 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 + +* Thu Dec 04 2008 Thierry Parmentelat - BootstrapFS-1.0-5 +- optional package bootstrapfs---plain comes with uncompressed images for faster tests + +* Fri Nov 14 2008 Thierry Parmentelat - BootstrapFS-1.0-4 +- cosmetic changes in build: displays duration, and shows up in summary + +* Mon Sep 01 2008 Thierry Parmentelat - BootstrapFS-1.0-3 +- Do not overwrite yumgroups.xml upon updates of noderepo + +* Thu Jul 03 2008 Thierry Parmentelat - BootstrapFS-1.0-2 +- uses the right yum.conf when building images + +* Mon May 05 2008 Thierry Parmentelat - BootstrapFS-1.0-1 +- rpm release tag does not need pldistro as it is already part of the rpm name + * Wed Mar 26 2008 Thierry Parmentelat - BootstrapFS-0.1-2 BootstrapFS-1.0-0 - naming scheme changed, tarball name now contains ''nodefamily'' as - - new package named 'noderepo' allows to ship the full set of node rpms to another (arch) myplc * Tue Mar 4 2008 Thierry Parmentelat - - Initial build. + +%define module_current_branch 1.0