X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=708a5c085c11b91e23b1a866366fc433305b1de7;hb=2c7efe735653de25fc516a5ed834c6a1bee8bc64;hp=8b22ada2b082729332aff236b67b3e5851b7dc7c;hpb=2baa8a8d4f1fc9574cc35f19b67b41c689b66a8a;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 8b22ada..708a5c0 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,40 +1,57 @@ -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab 3.3 -URL: http://cvs.planet-lab.org/cvs/myplc +# +# $Id$ +# +%define url $URL$ + +%define name myplc +%define version 4.2 +%define taglevel 3 + +%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} Summary: PlanetLab Central (PLC) Portable Installation -Name: myplc -Version: 0.3 -Release: 1%{?pldistro:.%{pldistro}}%{?date:.%{date}} -License: BSD +Name: %{name} +Version: %{version} +Release: %{release} +License: PlanetLab Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) + +Requires: tar + %define debug_package %{nil} %description MyPLC is a complete PlanetLab Central (PLC) portable installation contained within a chroot jail. The default installation consists of a web server, an XML-RPC API server, a boot server, and a database -server: the core components of PLC. The installation may be customized -through a graphical interface. All PLC services are started up and +server: the core components of PLC. All PLC services are started up and shut down through a single System V init script installed in the host -system. +system. The related Web Interface is now separately packaged +in the PLCWWW component. %prep %setup -q %build -pushd myplc -./build.sh -r 4 +pushd MyPLC +./build.sh %{pldistro} popd %install rm -rf $RPM_BUILD_ROOT -pushd myplc +pushd MyPLC + +# +# myplc +# # Install host startup script and configuration file install -D -m 755 host.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/plc @@ -59,28 +76,77 @@ rm -rf $RPM_BUILD_ROOT # If run under sudo if [ -n "$SUDO_USER" ] ; then # Allow user to delete the build directory - chown -R $SUDO_USER . + 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 -R $SUDO_USER %{_rpmdir}/%{_arch} + chown -h -R $SUDO_USER %{_rpmdir}/%{_arch} fi %pre if [ -x %{_sysconfdir}/init.d/plc ] ; then - service plc stop + %{_sysconfdir}/init.d/plc safestop +fi + +# Old versions of myplc used to ship with a bootstrapped database and +# /etc/planetlab directory. Including generated files in the manifest +# was dangerous; if /plc/data/var/lib/pgsql/data/base/1/16676 changed +# names from one RPM build to another, it would be rpmsaved and thus +# effectively deleted. Now we do not include these files in the +# manifest. However, to avoid deleting these files in the process of +# upgrading from one of these old versions of myplc, we must back up +# the database and /etc/planetlab and restore them after the old +# version has been uninstalled in %triggerpostun (also in %post, in +# case we are force upgrading to the same version). +# +# This code can be removed once all myplc-0.4-1 installations have +# been upgraded to at least myplc-0.4-2. + +# 0 = install, 1 = upgrade +if [ $1 -gt 0 ] ; then + for dir in /var/lib/pgsql/data /etc/planetlab ; do + if [ -d /plc/data/$dir ] ; then + echo "Preserving /plc/data/$dir" + mkdir -p /plc/data/$dir.rpmsave + tar -C /plc/data/$dir -cpf - . | \ + tar -C /plc/data/$dir.rpmsave -xpf - + + # Except for the default configuration file and DTD, which + # really should be considered for upgrade. + rm -f /plc/data/$dir.rpmsave/{default_config.xml,plc_config.dtd} + fi + done fi %post -chkconfig --add plc -chkconfig plc on +if [ -x /sbin/chkconfig ] ; then + /sbin/chkconfig --add plc + /sbin/chkconfig plc on +fi + +%triggerpostun -- %{name} +# 0 = erase, 1 = upgrade +if [ $1 -gt 0 ] ; then + for dir in /var/lib/pgsql/data /etc/planetlab ; do + if [ -d /plc/data/$dir.rpmsave -a -d /plc/data/$dir ] ; then + echo "Merging /plc/data/$dir" + if tar -C /plc/data/$dir.rpmsave -cpf - . | \ + tar -C /plc/data/$dir -xpf - ; then + rm -rf /plc/data/$dir.rpmsave + fi + fi + done +fi %preun # 0 = erase, 1 = upgrade if [ $1 -eq 0 ] ; then - chkconfig plc off - chkconfig --del plc + %{_sysconfdir}/init.d/plc safestop + if [ -x /sbin/chkconfig ] ; then + /sbin/chkconfig plc off + /sbin/chkconfig --del plc + fi fi %files @@ -101,6 +167,68 @@ fi %config(noreplace) /plc/data/* %changelog +* Thu Feb 14 2008 Thierry Parmentelat - myplc-4.2-2 myplc-4.2-3 +- refresh-peer.py removed (duplicate with PLCAPI) +- plc.d/ scripts cleaned up +- sirius initscript updated +- slice auto renewal fixed + +* Thu Jan 31 2008 Thierry Parmentelat - myplc-4.2-1 myplc-4.2-2 +- knows how to checkpoint and restore +- packages step more robust, in particular with empty node repository +- miscell tweaks for native packaging + +* Wed Jan 09 2008 Thierry Parmentelat - myplc-4.0-15 myplc-4.2-0 +moving to 4.2 - no change + +* Fri Jan 19 2007 Mark Huang - 0.5-3 +- Split off myplc-devel into separate spec file, so that it can be + built standalone. + +* Tue Aug 22 2006 Mark Huang - 0.4-3, 0.5-3 +- MyPLC 0.4 RC3. +- Fix upgrade path from RC1. +- Always regenerate plc_config.xml at first startup +- Upgrade kernel, iptables, vnet to 2.6.17-1.2142_FC4-3.planetlab +- Minor PlanetFlow fixes +- pl_mom/swapmon: Minor fixes +- bootcd: Added Supermicro IPMI support +- bootmanager: Cleanup, fixed check for new disks + +* Wed Aug 09 2006 Thierry Parmentelat +- introduces variable %{build_devel} to allow custom sites to skip building + the myplc-devel package. + +* Thu Jul 13 2006 Mark Huang - 0.4-2, 0.5-2 +- MyPLC 0.4 RC2. +- Fix many spec files (License replaces Copyright). +- Fix kernel build under gcc32 (module verification bug). +- Fix vnet build under gcc32 +- Fix PlanetFlow. MySQL RPM postinstall script no longer starts the + server. Also, get hostnames list from PLC_WWW_HOST, not + www.planet-lab.org. +- Fix pl_mom/bwmon to use cached values if NM is unresponsive +- Fix pl_mom/swapmon reset logic to avoid endless loops +- Remove ksymoops, add kernel-smp to standard PlanetLab package group +- Add kernel-smp boot support to bootmanager +- Add badblock search support to bootmanager +- Build development environment (myplc-devel). Add support for + building myplc itself inside myplc-devel. +- Move step-specific initialization to appropriate plc.d scripts +- Fix postgresql startup failure when bootstrapping +- Allow CA to be configured for each SSL certificate set. Stop doing + root CA stuff, this is outside the scope of MyPLC. MyPLC now only + generates self-signed certificates, but supports replacement of the + self-signed certificates with real certifcates signed by another CA, + as long as the CA is specified. +- Self-sign the MA/SA SSL certificate (and by extension, the MA/SA API + certificate). +- pl_mom: Workarounds for when NM queries time out. +- plc_api: Honor PLC_MAIL_ENABLED. + +* Wed Jul 6 2006 Mark Huang - 0.4-1, 0.5-1 +- First stable release of MyPLC 0.4 RC1. + * Wed Apr 5 2006 Mark Huang - 0.2-1 - Basic functionality complete. Consolidate into a single package installed in /plc.