X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=634604dbc7df3e8f0bcac5d83baf1b0fd4fad44b;hb=978679ec01fb825958c80648f624eeff24dfaf4a;hp=decb529170bd83feb8b4d4279b6e93116acc0483;hpb=56d33e381ce1e3ca55de06f1f1637db39e296503;p=vserver-reference.git diff --git a/vserver-reference.spec b/vserver-reference.spec index decb529..634604d 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,13 +1,19 @@ -%define name vserver-reference -%define version 3.0 -%define release 2.planetlab%{?date:.%{date}} +# +# $Id$ +# +%define url $URL$ -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab 3.0 -URL: http://www.planet-lab.org +%define slicefamily %{pldistro}-%{distroname}-%{_arch} -Summary: VServer reference image +%define name vserver +%define version 5.0 +%define taglevel 2 + +# pldistro already in the rpm name +#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release %{taglevel}%{?date:.%{date}} + +Summary: VServer reference image for slice family %{slicefamily} Name: %{name} Version: %{version} Release: %{release} @@ -15,114 +21,186 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildArchitectures: noarch -Requires: util-vserver, e2fsprogs, yum +# this would not be right +#BuildArch: noarch + +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) + +%define debug_package %{nil} %description +This package does not really exist. + +%package %{slicefamily} +Summary: VServer reference image +Group: Applications/System +AutoReqProv: no +Requires: util-vserver, e2fsprogs, yum +Requires(pre): util-vserver-core, findutils + +%description %{slicefamily} This package creates the virtual server (VServer) reference image used as the installation base for new PlanetLab slivers. +%package systemslices-%{slicefamily} +Summary: System slice packages +Group: Applications/System +Requires: vserver-%{slicefamily} >= %{version}-%{release} +AutoReqProv: no + +%description systemslices-%{slicefamily} +This package installs the stubs necessary to create system slices +(typically planetflow) on top of the reference image. + %prep %setup -q %build +[ -d vserver-reference ] || ln -s VserverReference vserver-reference + +pushd vserver-reference +./build.sh %{pldistro} %{slicefamily} +popd %install rm -rf $RPM_BUILD_ROOT +pushd vserver-reference +install -D -m 755 initscripts/vserver-reference $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference +install -D -m 644 cron.d/vserver-reference $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference +install -D -m 644 logrotate/vserver-reference $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference +find vservers | cpio -p -d -u $RPM_BUILD_ROOT/ +popd + %clean rm -rf $RPM_BUILD_ROOT -%post -. /usr/lib/util-vserver/util-vserver-vars -VROOT=$VROOTDIR/vserver-reference - -# Pause vcached -service vcached stop - -# Remove old installation first -if [ -d $VROOT ] ; then - if grep -q $VROOT/proc /proc/mounts ; then - umount $VROOT/proc - fi - if grep -q $VROOT/dev/pts /proc/mounts ; then - umount $VROOT/dev/pts - fi - chattr -R -i $VROOT - rm -rf $VROOT -fi - -$PKGLIBDIR/install-pre.sh vserver-reference - -# Mount /dev/pts in reference image -mkdir -p $VROOT/dev/pts -mount -t devpts none $VROOT/dev/pts - -# Mount /proc in reference image -mkdir -p $VROOT/proc -mount -t proc none $VROOT/proc - -# Prevent all locales from being installed in reference image -mkdir -p $VROOT/etc/rpm -cat > $VROOT/etc/rpm/macros < - VserverReference-5.0-2 +- iron out system slices reference image update + +* Fri Jan 29 2010 Thierry Parmentelat - VserverReference-5.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 +- nodefamily is 3-fold with pldistro-fcdistro-arch +- new module layout + +* Tue Oct 20 2009 Thierry Parmentelat - VserverReference-4.2-16 +- fix issue about locating the post-install script(s) +- this was causing the onelab distro to miss the /etc/sudoers patch + +* Mon Oct 19 2009 Baris Metin - VserverReference-4.2-15 +- - comment out requiretty + +* Fri Oct 09 2009 Thierry Parmentelat - VserverReference-4.2-14 +- can use groups in the pkgs file with +++ for space + +* Mon Aug 10 2009 Stephen Soltesz - VserverReference-4.2-13 +- Added remove for all VROOTs rather than the last one. BUG FIX. + +* Tue Mar 24 2009 Thierry Parmentelat - VserverReference-4.2-12 +- fix for fedora 10 + +* Thu Oct 02 2008 Thierry Parmentelat - VserverReference-4.2-11 +- on 64bits archs, locates util-vserver's config file correctly + +* Thu Jul 03 2008 Daniel Hokka Zakrisson - VserverReference-4.2-10 +- Use the correct yum.conf to get access to required packages such as pf2slice. + +* Mon Jun 30 2008 Daniel Hokka Zakrisson - VserverReference-4.2-9 +- Scriptlet fix. + +* Fri Jun 27 2008 Daniel Hokka Zakrisson - VserverReference-4.2-8 +- Unset the immutable and iunlink bits to make sure we can install the package. + +* Fri Jun 27 2008 Daniel Hokka Zakrisson - VserverReference-4.2-7 +- Let rpm remove the files. + +* Thu Apr 24 2008 Thierry Parmentelat - VserverReference-4.2-6 +- empty change, this should *not* be a noarch package + +* Mon Apr 21 2008 Thierry Parmentelat - VserverReference-4.2-5 +- tweaked pre script that was removing everything under /vservers/.vref +- dismantle vcached (as far as this module is concerned) +- sudo to log in /var/log/sudo + +* Fri Mar 28 2008 Thierry Parmentelat - VserverReference-4.2-3 VserverReference-4.2-4 +- bugfix, 4.2-3 was broken as the slicefamily stamp could not get created, thus nm issued 'vuseradd -t default' + +* Wed Mar 26 2008 Thierry Parmentelat - VserverReference-4.2-2 VserverReference-4.2-3 +- a single node can now install several instances of this package +- package name contains slicefamily - -- +- setattr --iunlink or --~iunlink appropriately (uses /proc/virtual/info) +- does not copy yum.conf from host anymore + +* Fri Feb 15 2008 Thierry Parmentelat - vserver-4.2-1 vserver-4.2-2 +- vserver image to properly use links rather than copies + +* Thu Jan 31 2008 Thierry Parmentelat - vserver-4.2-0 vserver-4.2-1 +- more careful scan of the vserver-*.pkgs image specifications + +* Tue Sep 1 2005 Mark Huang 3.1-1.planetlab +- Pre-package vserver-reference instead of building it on nodes + +* Tue Nov 30 2004 Mark Huang 3.0-5.planetlab +- PL3118 and PL3131 fix: set barrier bit on /vservers instead of old + immulink bit. Do not reset the immutable bit on the new + vserver-reference directory when deleting it after an error. + +* Mon Nov 15 2004 Mark Huang 3.0-4.planetlab +- bump release to install Fedora Core 2 updates as of Tue Nov 9 2004 +- PL3017 fix: rebuild vserver-reference image in case it was built + with i386 glibc + +* Mon Nov 15 2004 Mark Huang 3.0-4.planetlab +- bump release to install Fedora Core 2 updates as of Tue Nov 9 2004 +- PL3017 fix: rebuild vserver-reference image in case it was built + with i386 glibc + +* Sun Oct 10 2004 Mark Huang 3.0-3.planetlab +- dynamically install reference image at init time + * Sun Oct 10 2004 Mark Huang 3.0-2.planetlab - dynamically install reference image * Tue Sep 14 2004 Mark Huang 3.0-1.planetlab - initial build + +%define module_current_branch 4.2