X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=9f2704e42d6b2736b4d0cd7f856e4880ccaf7be1;hb=4d3eb0f230df155faa31ba74bd039cf539ac3db0;hp=028f677102bc35b2ed26a25bb98359d099334384;hpb=e89fafdb30e3371bd01efe7154e5366e2c5a85f4;p=myplc.git diff --git a/myplc.spec b/myplc.spec index 028f677..9f2704e 100644 --- a/myplc.spec +++ b/myplc.spec @@ -1,21 +1,31 @@ -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab 4.0 -URL: http://cvs.planet-lab.org/cvs/myplc +# +# $Id$ +# +%define url $URL$ + +%define name myplc +%define version 4.2 +%define taglevel 10 + +%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} Summary: PlanetLab Central (PLC) Portable Installation -Name: myplc -Version: 0.5 -Release: 2%{?pldistro:.%{pldistro}}%{?date:.%{date}} +Name: %{name} +Version: %{version} +Release: %{release} License: PlanetLab Group: Applications/Systems Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -# for preventing myplc-devel from being built -# *should* support invokation like rpmbuild --define "build_level 0" -# *but* this does not seem to work : so just set to 0 here -%{!?build_level: %define build_devel 1} +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) + +Requires: tar + +Provides: myplc %define debug_package %{nil} @@ -23,44 +33,23 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 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. - -%if %{build_devel} -%package devel -Summary: PlanetLab Central (PLC) Development Environment -Group: Development/Tools -AutoReqProv: no -%endif - -%if %{build_devel} -%description devel -This package install a complete PlanetLab development environment -contained within a chroot jail. The default installation consists of a -local CVS repository bootstrapped with a snapshot of all PlanetLab -source code, and all the tools necessary to compile it. -%endif +system. The related Web Interface is now separately packaged +in the PLCWWW component. %prep %setup -q %build -pushd myplc -%if %{build_devel} -echo -n "XXXXXXXXXXXXXXX myplc::build_devel " ; date -./build_devel.sh %{?cvstag:-t %{cvstag}} -%endif -echo -n "XXXXXXXXXXXXXXX myplc::build " ; date -./build.sh %{?cvstag:-t %{cvstag}} -echo -n "XXXXXXXXXXXXXXX myplc::endbuild " ; date +pushd MyPLC +./build.sh %{pldistro} popd %install rm -rf $RPM_BUILD_ROOT -pushd myplc +pushd MyPLC # # myplc @@ -81,29 +70,6 @@ install -D -m 644 root.img $RPM_BUILD_ROOT/plc/root.img # Install data directory find data | cpio -p -d -u $RPM_BUILD_ROOT/plc/ -# -# myplc-devel -# - -%if %{build_devel} - -# Install host startup script and configuration file -install -D -m 755 host.init $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/plc-devel -install -D -m 644 plc-devel.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/plc-devel - -# Install root filesystem -install -d -m 755 $RPM_BUILD_ROOT/plc/devel/root -install -D -m 644 devel/root.img $RPM_BUILD_ROOT/plc/devel/root.img - -# Install data directory -find devel/data | cpio -p -d -u $RPM_BUILD_ROOT/plc/ - -# Make sure /cvs is never upgraded once installed by giving it a -# unique name. A hard-linked copy is made in %post. -mv $RPM_BUILD_ROOT/plc/devel/data/{cvs,cvs-%{version}-%{release}} - -%endif - popd %clean @@ -112,17 +78,17 @@ 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 - %{_sysconfdir}/init.d/plc stop + %{_sysconfdir}/init.d/plc safestop fi # Old versions of myplc used to ship with a bootstrapped database and @@ -178,46 +144,13 @@ fi %preun # 0 = erase, 1 = upgrade if [ $1 -eq 0 ] ; then - %{_sysconfdir}/init.d/plc stop + %{_sysconfdir}/init.d/plc safestop if [ -x /sbin/chkconfig ] ; then /sbin/chkconfig plc off /sbin/chkconfig --del plc fi fi -%if %{build_devel} -%pre devel -if [ -x %{_sysconfdir}/init.d/plc-devel ] ; then - %{_sysconfdir}/init.d/plc-devel stop -fi -%endif - -%if %{build_devel} -%post devel -if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig --add plc-devel - /sbin/chkconfig plc-devel on -fi - -# If /cvs does not already exist, make a hard-linked copy of this -# version's /cvs repository. -if [ ! -d /plc/devel/data/cvs ] ; then - cp -rl /plc/devel/data/{cvs-%{version}-%{release},cvs} -fi -%endif - -%if %{build_devel} -%preun devel -# 0 = erase, 1 = upgrade -if [ $1 -eq 0 ] ; then - %{_sysconfdir}/init.d/plc-devel stop - if [ -x /sbin/chkconfig ] ; then - /sbin/chkconfig plc-devel off - /sbin/chkconfig --del plc-devel - fi -fi -%endif - %files %defattr(-,root,root,-) # Host startup script and configuration file @@ -235,23 +168,77 @@ fi %dir /plc/data %config(noreplace) /plc/data/* -%if %{build_devel} -%files devel -%defattr(-,root,root,-) -# Host startup script and configuration file -%{_sysconfdir}/init.d/plc-devel -%{_sysconfdir}/sysconfig/plc-devel - -# Root filesystem -/plc/devel/root.img -/plc/devel/root - -# Data directory -%dir /plc/devel/data -%config(noreplace) /plc/devel/data/* -%endif - %changelog +* Thu May 08 2008 Thierry Parmentelat - MyPLC-4.2-10 +- defaults for *_IP conf vars now void, expect more accurate /etc/hosts +- gethostbyname uses python rather than perl (hope this shrinks deps) +- doc: reviewed myplc doc - deprecated everything related to myplc-devel +- doc: packaging doc in myplc-native (myplc&PLCAPI) & rm'ed target files from svn +- make sync now works towards vserver-based myplc only + +* Mon May 05 2008 Stephen Soltesz - MyPLC-4.2-9 +- +- added vsys 'pfmount' script to the default netflow slice attributes. +- + +* Thu Apr 24 2008 Thierry Parmentelat - MyPLC-4.2-8 +- plc.d/bootcd step altered for handling legacy bootcd smooth migration +- to new bootcd packaging + +* Wed Apr 23 2008 Thierry Parmentelat - MyPLC-4.2-7 +- changes needed for bootcd 4.2 : new, possible multiple, installation locations, and new rpm name + +* Tue Apr 22 2008 Thierry Parmentelat - MyPLC-4.2-6 +- packaging of mplc-release in myplc-native +- sudoers.php is new to PlanetLabConf (needs nodeconfig-4.2-4) +- resolv file in /etc/resolv.conf, not plc_resolv.conf +- improved sirius script +- remove the 'driver' node-network-setting that was unused, and new 'Multihome' category +- expires more properly set + +* Mon Apr 07 2008 Stephen Soltesz - MyPLC-4.2-4 MyPLC-4.2-5 +- + +* Wed Mar 26 2008 Thierry Parmentelat - MyPLC-4.2-3 MyPLC-4.2-4 +- renew_reminder script moved to support-scripts/ +- gen-aliases script added in support-scripts/ +- sirius initscript moved to plc_sliceinitscripts (formerly inlined in db-config) +- plc-map script : no javascript for googlemap anymore, see new plc-kml script instead +- nodefamily-aware (creates legacy symlink /var/www/html/install-rpms/planetlab) +- new native slice attributes 'capabilities', 'vsys' and 'codemux' +- new setting 'Mom list address' for sending emails to a separate destination +- starts rsyslogd/syslogd as appropriate +- expects nodeconfig package (former PlanetLabConf/ dir from PLCWWW) +- convenience generation of yum.conf in resulting image based on build/mirroring + +* 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.