X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=blobdiff_plain;f=vserver-reference.spec;h=ac4506b2f8221a92917ed32a1e7667c489dcc5c0;hp=ac3d79ad7b621a545b9399dff10fc35d7d976e9c;hb=4dba1b2a8e234959a514262bdc662ef1ecea0199;hpb=d81c1f611c24b5b26b4d8c754d16f59d95b6a713 diff --git a/vserver-reference.spec b/vserver-reference.spec index ac3d79a..ac4506b 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -6,13 +6,20 @@ %define slicefamily %{pldistro}-%{distroname}-%{_arch} %define name vserver -%define version 4.2 -%define taglevel 13 +%define version 5.0 +%define taglevel 5 # 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} + Summary: VServer reference image for slice family %{slicefamily} Name: %{name} Version: %{version} @@ -39,7 +46,6 @@ 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 @@ -59,34 +65,25 @@ This package installs the stubs necessary to create system slices %setup -q %build -pushd VserverReference +[ -d vserver-reference ] || ln -s VserverReference vserver-reference + +pushd vserver-reference ./build.sh %{pldistro} %{slicefamily} popd %install rm -rf $RPM_BUILD_ROOT -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 +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 -# 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 - %files %{slicefamily} %defattr(-,root,root) %{_initrddir}/vserver-reference @@ -100,17 +97,9 @@ fi %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 @@ -118,7 +107,40 @@ M=$((60 * $RANDOM / 32768)) H=$((24 * $RANDOM / 32768)) sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference +%post systemslices-%{slicefamily} +# need to do this for systemslices, for when a new image shows up +# we've already the service installed and enabled, as systemslices requires the plain package +[ "$PL_BOOTCD" = "1" ] || service vserver-reference force + %changelog +* Wed Dec 29 2010 Daniel Hokka Zakrisson - vserver-reference-5.0-5 +- Remove ugly hack that breaks su/sudo on upgrades. + +* Tue Dec 07 2010 Thierry Parmentelat - vserver-reference-5.0-4 +- optimize rpm construction - skips stripping and the like + +* Mon Jul 05 2010 Baris Metin - VserverReference-5.0-3 +- module name changes + +* Fri Mar 12 2010 Thierry Parmentelat - 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. @@ -189,3 +211,5 @@ sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference * Tue Sep 14 2004 Mark Huang 3.0-1.planetlab - initial build + +%define module_current_branch 4.2