X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc.spec;h=f870235c0ff3f21b63cd3ef923bdca5c1a23e55e;hb=824883e3d4f1f9edf5afeb85b2567ca74f6e20c2;hp=de7ba0b97ec98e2a2972ef43d8f3c0b8c5d3715a;hpb=8c084b188dfc3f2ec7b2ae9a5aa596eea2b6820f;p=myplc.git diff --git a/myplc.spec b/myplc.spec index de7ba0b..f870235 100644 --- a/myplc.spec +++ b/myplc.spec @@ -6,7 +6,7 @@ URL: http://cvs.planet-lab.org/cvs/myplc Summary: PlanetLab Central (PLC) Portable Installation Name: myplc Version: 0.5 -Release: 2%{?pldistro:.%{pldistro}}%{?date:.%{date}} +Release: 3%{?pldistro:.%{pldistro}}%{?date:.%{date}} License: PlanetLab Group: Applications/Systems Source0: %{name}-%{version}.tar.gz @@ -23,23 +23,11 @@ through a graphical interface. All PLC services are started up and shut down through a single System V init script installed in the host system. -%package devel -Summary: PlanetLab Central (PLC) Development Environment -Group: Development/Tools -AutoReqProv: no - -%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. - %prep %setup -q %build pushd myplc -./build_devel.sh ./build.sh popd @@ -67,25 +55,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 -# - -# 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}} - popd %clean @@ -94,12 +63,12 @@ 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 @@ -115,7 +84,8 @@ fi # 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. +# 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. @@ -125,15 +95,15 @@ 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" - mv /plc/data/$dir /plc/data/$dir.rpmsave + 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 - - # Except for the default configuration file and DTD, which really - # should be considered for upgrade. - mkdir -m 755 -p /plc/data/etc/planetlab - mv /plc/data/etc/planetlab.rpmsave/{default_config.xml,plc_config.dtd} \ - /plc/data/etc/planetlab/ || : fi %post @@ -142,9 +112,6 @@ if [ -x /sbin/chkconfig ] ; then /sbin/chkconfig plc on fi -# Force a regeneration to take into account new variables -touch /plc/data/etc/planetlab/default_config.xml - %triggerpostun -- %{name} # 0 = erase, 1 = upgrade if [ $1 -gt 0 ] ; then @@ -169,33 +136,6 @@ if [ $1 -eq 0 ] ; then fi fi -%pre devel -if [ -x %{_sysconfdir}/init.d/plc-devel ] ; then - %{_sysconfdir}/init.d/plc-devel stop -fi - -%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 - -%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 - %files %defattr(-,root,root,-) # Host startup script and configuration file @@ -213,21 +153,25 @@ fi %dir /plc/data %config(noreplace) /plc/data/* -%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/* - %changelog +* 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).