git://git.onelab.eu
/
sliceimage.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tagging module VserverReference -- from vserver-4.2-0 to vserver-4.2-1
[sliceimage.git]
/
vserver-reference.spec
diff --git
a/vserver-reference.spec
b/vserver-reference.spec
index
b5a6c0b
..
acd08c5
100644
(file)
--- a/
vserver-reference.spec
+++ b/
vserver-reference.spec
@@
-1,11
+1,13
@@
+#
+# $Id$
+#
+%define url $URL$
+
%define name vserver
%define name vserver
-%define version 4.
1
-%define
release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 4.
2
+%define
taglevel 1
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 4.0
-URL: http://cvs.planet-lab.org/cvs/vserver-reference
+%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Summary: VServer reference image
Name: %{name}
Summary: VServer reference image
Name: %{name}
@@
-15,8
+17,11
@@
Source0: %{name}-%{version}.tar.bz2
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
License: GPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires: util-vserver, e2fsprogs, yum
-Requires(pre): coreutils
+
+Vendor: PlanetLab
+Packager: PlanetLab Central <support@planet-lab.org>
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
%define debug_package %{nil}
%define debug_package %{nil}
@@
-27,6
+32,8
@@
This package does not really exist.
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
+Requires: util-vserver, e2fsprogs, yum
+Requires(pre): /bin/sh, coreutils
%description reference
This package creates the virtual server (VServer) reference image used
%description reference
This package creates the virtual server (VServer) reference image used
@@
-35,28
+42,28
@@
as the installation base for new PlanetLab slivers.
%package system-packages
Summary: System slice packages
Group: Applications/System
%package system-packages
Summary: System slice packages
Group: Applications/System
-Requires: vserver-reference = %{version}-%{release}
+Requires: vserver-reference
>
= %{version}-%{release}
AutoReqProv: no
%description system-packages
This package installs the RPMS necessary to create system ("root
AutoReqProv: no
%description system-packages
This package installs the RPMS necessary to create system ("root
-
resource") slices from the virtual server (VServer) reference image.
+resource") slices from the virtual server (VServer) reference image.
%prep
%setup -q
%build
%prep
%setup -q
%build
-pushd vserver-reference
-./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($2=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4)
-./system-packages.sh
+pushd VserverReference
+./build.sh %{pldistro}
popd
%install
rm -rf $RPM_BUILD_ROOT
popd
%install
rm -rf $RPM_BUILD_ROOT
-pushd
vserver-r
eference
+pushd
VserverR
eference
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 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
find vservers | cpio -p -d -u $RPM_BUILD_ROOT/
popd
@@
-78,11
+85,12
@@
fi
%defattr(-,root,root)
%{_initrddir}/vserver-reference
%{_sysconfdir}/cron.d/vserver-reference
%defattr(-,root,root)
%{_initrddir}/vserver-reference
%{_sysconfdir}/cron.d/vserver-reference
+%{_sysconfdir}/logrotate.d/vserver-reference
/vservers/.vref/default
%files system-packages
%defattr(-,root,root)
/vservers/.vref/default
%files system-packages
%defattr(-,root,root)
-/vservers/
system-packages
+/vservers/
.vstub
%define vcached_pid /var/run/vcached.pid
%define vcached_pid /var/run/vcached.pid
@@
-116,6
+124,9
@@
H=$((24 * $RANDOM / 32768))
sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
%changelog
sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
%changelog
+* 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 Sep 1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
- Pre-package vserver-reference instead of building it on nodes