X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=blobdiff_plain;f=vserver-reference.spec;h=7e95d5ee4e25ebd1d9cc7905e44dc7b014d088d1;hp=9082a80314e376ade8df6885bc8eead526324fb1;hb=bcee3966ef52071c75ea8bfbaec3c74a942914d4;hpb=5f14eeb17b00584920fb1ebd74faef5be837df65

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 9082a80..7e95d5e 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,13 +1,19 @@
-%define name vserver-reference
-%define version 3.0
-%define release 1.planetlab%{?date:.%{date}}
+#
+# $Id$
+#
+%define url $URL$
 
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
-URL: http://www.planet-lab.org
+%define slicefamily %{pldistro}-%{distroname}-%{_arch}
 
-Summary: VServer reference image
+%define name vserver
+%define version 4.2
+%define taglevel 15
+
+# 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,154 +21,177 @@ Source0: %{name}-%{version}.tar.bz2
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildArchitectures: noarch
-Requires: util-vserver
-AutoReqProv: no
-BuildRequires: e2fsprogs, yum
+# this would not be right
+#BuildArch: noarch
+
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+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.
 
-%define vrootdir /vservers
-%define vrefdir %{vrootdir}/%{name}
-%define installroot $RPM_BUILD_ROOT%{vrefdir}
+%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
 
-# chattr, mknod, mount, yum all require root privileges. Yech.
-if [ $UID -ne 0 ] ; then
-    echo You must be root to build the %{name} package.
-    false
-fi
-
 %build
+pushd VserverReference
+./build.sh %{pldistro} %{slicefamily}
+popd
 
 %install
-# Running as root
-export PATH="$PATH:/sbin:/usr/sbin"
-
-# Clean up
-if grep -q %{installroot}/proc /proc/mounts ; then
-    umount %{installroot}/proc
-fi
-if grep -q %{installroot}/dev/pts /proc/mounts ; then
-    umount %{installroot}/dev/pts
-fi
-chattr -R -i $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
-# Make /vservers
-mkdir -p $RPM_BUILD_ROOT%{vrootdir}
-chmod 000 $RPM_BUILD_ROOT%{vrootdir}
-chattr +t $RPM_BUILD_ROOT%{vrootdir}
-
-# Make /vservers/vserver-reference
-mkdir -p %{installroot}
-chattr -t %{installroot}
-chmod 755 %{installroot}
-
-MAKEDEV ()
-{
-    if grep -q %{installroot}/dev/pts /proc/mounts ; then
-	umount %{installroot}/dev/pts
-    fi
-    rm -rf %{installroot}/dev
-    mkdir -p %{installroot}/dev
-    mknod -m 666 %{installroot}/dev/null c 1 3
-    mknod -m 666 %{installroot}/dev/zero c 1 5
-    mknod -m 666 %{installroot}/dev/full c 1 7
-    mknod -m 644 %{installroot}/dev/random c 1 8
-    mknod -m 644 %{installroot}/dev/urandom c 1 9
-    mknod -m 666 %{installroot}/dev/tty c 5 0
-    mknod -m 666 %{installroot}/dev/ptmx c 5 2
-    touch %{installroot}/dev/hdv1
-}
-
-# Initialize /dev in reference image
-MAKEDEV
-
-# Mount /dev/pts in reference image
-mkdir -p %{installroot}/dev/pts
-mount -t devpts none %{installroot}/dev/pts
-
-# Mount /proc in reference image
-mkdir -p %{installroot}/proc
-mount -t proc none %{installroot}/proc
-
-# Create a dummy /etc/fstab in reference image
-mkdir -p %{installroot}/etc
-cat > %{installroot}/etc/fstab <<EOF
-# This fake fstab exists only to please df and linuxconf.
-/dev/hdv1	/	ext2	defaults	1 1
-EOF
-
-# Prevent all locales from being installed in reference image
-mkdir -p %{installroot}/etc/rpm
-cat > %{installroot}/etc/rpm/macros <<EOF
-%_install_langs en_US:en
-EOF
-
-# Initialize RPM database in reference image
-mkdir -p %{installroot}/var/lib/rpm
-rpm --root %{installroot} --initdb
-
-# XXX Get yum.conf from PlanetLabConf
-
-# Install RPMs in reference image
-yum -c ./yum.conf \
-%{?sslcertdir:--sslcertdir=%{sslcertdir}} \
---installroot=%{installroot} \
--y groupinstall VServer
-
-# Clean up /dev in reference image
-MAKEDEV
-
-# Configure authentication in reference image
-chroot %{installroot} authconfig --nostart --kickstart --enablemd5 --enableshadow || :
-
-# Disable all services in reference image
-chroot %{installroot} /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off"
-
-# Clean up
-if grep -q %{installroot}/proc /proc/mounts ; then
-    umount %{installroot}/proc
-fi
-if grep -q %{installroot}/dev/pts /proc/mounts ; then
-    umount %{installroot}/dev/pts
-fi
+pushd VserverReference
+install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
+install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
+install -D -m 644 vserver-reference.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference
+find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
+popd
 
 %clean
-# Running as root
-export PATH="$PATH:/sbin:/usr/sbin"
-
-# Clean up
-if grep -q %{installroot}/proc /proc/mounts ; then
-    umount %{installroot}/proc
-fi
-if grep -q %{installroot}/dev/pts /proc/mounts ; then
-    umount %{installroot}/dev/pts
-fi
-chattr -R -i $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
-%post
-# Copy configuration files from host to reference image
-for file in /etc/hosts /etc/resolv.conf /etc/yum.conf ; do
-    if [ -f $file ] ; then
-	echo $file | cpio -p -d -u %{vrefdir}
-    fi
-done
+# 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
 
-%preun
+%files %{slicefamily}
+%defattr(-,root,root)
+%{_initrddir}/vserver-reference
+%{_sysconfdir}/cron.d/vserver-reference
+%{_sysconfdir}/logrotate.d/vserver-reference
+/vservers/.vref/%{slicefamily}
 
-%files
+%files systemslices-%{slicefamily}
 %defattr(-,root,root)
-%{vrefdir}
+/vservers/.vstub/%{slicefamily}
+
+%define vcached_pid /var/run/vcached.pid
+
+# XXX: UGLY HACK
+%pre %{slicefamily}
+test -d /vservers/.vref/%{slicefamily} && \
+   find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink
+:
+
+%post %{slicefamily}
+chkconfig --add vserver-reference
+chkconfig vserver-reference on
+# store the default for nodemanager
+[ -f /etc/planetlab/slicefamily ] || { mkdir -p /etc/planetlab ; echo %{slicefamily} > /etc/planetlab/slicefamily ; }
+[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
+
+# Randomize daily run time
+M=$((60 * $RANDOM / 32768))
+H=$((24 * $RANDOM / 32768))
+sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
 
 %changelog
+* Mon Oct 19 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - VserverReference-4.2-15
+- - comment out requiretty
+
+* Fri Oct 09 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-14
+- can use groups in the pkgs file with +++ for space
+
+* Mon Aug 10 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - VserverReference-4.2-13
+- Added remove for all VROOTs rather than the last one.  BUG FIX.
+
+* Tue Mar 24 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-12
+- fix for fedora 10
+
+* Thu Oct 02 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-11
+- on 64bits archs, locates util-vserver's config file correctly
+
+* Thu Jul 03 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - 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 <daniel@hozac.com> - VserverReference-4.2-9
+- Scriptlet fix.
+
+* Fri Jun 27 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - 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 <daniel@hozac.com> - VserverReference-4.2-7
+- Let rpm remove the files.
+
+* Thu Apr 24 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-6
+- empty change, this should *not* be a noarch package
+
+* Mon Apr 21 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - VserverReference-4.2-2 VserverReference-4.2-3
+- a single node can now install several instances of this package
+- package name contains slicefamily - <pldistro>-<fcdistro>-<arch>
+- setattr --iunlink or --~iunlink appropriately (uses /proc/virtual/info)
+- does not copy yum.conf from host anymore
+
+* Fri Feb 15 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-4.2-1 vserver-4.2-2
+- vserver image to properly use links rather than copies
+
+* Thu Jan 31 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-4.2-0 vserver-4.2-1
+- more careful scan of the vserver-*.pkgs image specifications
+
+* Tue Sep  1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
+- Pre-package vserver-reference instead of building it on nodes
+
+* Tue Nov 30 2004 Mark Huang <mlhuang@cs.princeton.edu> 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 <mlhuang@cs.princeton.edu> 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 <mlhuang@cs.princeton.edu> 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 <mlhuang@cs.princeton.edu> 3.0-3.planetlab
+- dynamically install reference image at init time
+
+* Sun Oct 10 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-2.planetlab
+- dynamically install reference image
+
 * Tue Sep 14 2004 Mark Huang <mlhuang@cs.princeton.edu> 3.0-1.planetlab
 - initial build