X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootmanager.spec;h=b1bb876bc2e740ba3a2a5d4f978e4bdaf73331fe;hb=9c46d734af375c1d6dd610cb2d451a58f97d0232;hp=5decaf5bc64be5e193615e90f51908490ea80efa;hpb=6f5953682a20b25ef54caf5b9fbaeee266502fac;p=bootmanager.git diff --git a/bootmanager.spec b/bootmanager.spec index 5decaf5..b1bb876 100644 --- a/bootmanager.spec +++ b/bootmanager.spec @@ -4,8 +4,8 @@ %define url $URL$ %define name bootmanager -%define version 4.3 -%define taglevel 12 +%define version 5.0 +%define taglevel 11 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -22,13 +22,22 @@ License: BSD Group: System Environment/Base Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildArch: noarch Requires: tar, gnupg, sharutils, bzip2, pypcilib -Requires: PLCAPI >= 4.3 +# need the apache user at install-time +Requires: httpd +Requires: PLCAPI >= 5.0 # the python code packaged in these are shipped on the node as well Requires: pypcilib pyplnet monitor-runlevelagent +### avoid having yum complain about updates, as stuff is moving around +# plc.d/bootmanager +Conflicts: myplc <= 4.3 +# nodeconfig/boot/* +Conflicts: nodeconfig <= 4.3 + AutoReqProv: no %define debug_package %{nil} @@ -46,45 +55,92 @@ gcc -shared -fPIC -ldl -Os -o source/libc-opendir-hack.so source/libc-opendir-ha rm -rf $RPM_BUILD_ROOT # Install source so that it can be rebuilt -find build.sh source | cpio -p -d -u $RPM_BUILD_ROOT/%{_datadir}/%{name}/ +find build.sh source | cpio -p -d -u $RPM_BUILD_ROOT/%{_datadir}/%{name}/regular/ + +install -m 644 README $RPM_BUILD_ROOT/%{_datadir}/%{name}/README -touch bootmanager.sh -install -D -m 755 bootmanager.sh $RPM_BUILD_ROOT/var/www/html/boot/bootmanager.sh +# formerly in the nodeconfig module +install -D -m 755 nodeconfig/boot/index.php $RPM_BUILD_ROOT/var/www/html/boot/index.php +install -D -m 755 nodeconfig/boot/upload-bmlog.php $RPM_BUILD_ROOT/var/www/html/boot/upload-bmlog.php +install -D -m 755 nodeconfig/boot/getnodeid.php $RPM_BUILD_ROOT/var/www/html/boot/getnodeid.php -# This is only required for 2.x bootcds. -install -D -m 644 support-files/uudecode.gz $RPM_BUILD_ROOT/var/www/html/boot/uudecode.gz +# formerly in the MyPLC module +install -D -m 755 plc.d/bootmanager $RPM_BUILD_ROOT/etc/plc.d/bootmanager %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 - %post -cat < - bootmanager-5.0-11 +- replace deprecated popen2 with subprocess and handle fsck return codes in a different code path + +* Fri Jul 30 2010 S.Çağlar Onur - bootmanager-5.0-10 +- Fix typo + +* Fri Jul 30 2010 Baris Metin - bootmanager-5.0-9 +- fix typo + +* Wed Jul 28 2010 S.Çağlar Onur - bootmanager-5.0-8 +- disable time/count based filesystem checks + +* Tue Jul 27 2010 S.Çağlar Onur - bootmanager-5.0-7 +- Fix new disk additions to LVM array + +* Wed Jul 07 2010 Thierry Parmentelat - BootManager-5.0-6 +- bugfix for centos5/python2.4 missing hashlib + +* Mon Jul 05 2010 Baris Metin - BootManager-5.0-5 +- check sha1sum of downloaded bootstrapfs +- try recovering filesystem errors + +* Wed Jun 23 2010 Thierry Parmentelat - BootManager-5.0-4 +- nicer initscript now uses 'action' from /etc/init.d/functions +- bugfix for nodes with extensions + +* Fri Apr 02 2010 Thierry Parmentelat - BootManager-5.0-3 +- create /etc/planetlab if missing +- uses key 'ssh_rsa_key' in BootUpdateNode (requires PLCAPI-5.0.5) + +* Sat Feb 13 2010 Thierry Parmentelat - BootManager-5.0-2 +- caglar's change to run MkInitrd right before kexec +- plus clean up old code + +* Fri Jan 29 2010 Thierry Parmentelat - BootManager-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 +- uses PLCAPI's GetNodeFlavour to get all info on the bootstrapfs tarball(s) to install +- installation layout on the plc side has changed, more consistent for e.g. 'alpha' bootmanagers + +* Sat Jan 09 2010 Thierry Parmentelat - BootManager-4.3-16 +- support for fedora 12 + +* Sat Dec 19 2009 Marc Fiuczynski - BootManager-4.3-15 +- - support for when the node is behind a NAT +- - clean up RUN_LEVEL support +- - support for early sshd + +* Thu Nov 19 2009 Daniel Hokka Zakrisson - BootManager-4.3-14 +- Add NAT model option for nodes which don't resolve properly. + * Mon Sep 07 2009 Stephen Soltesz - BootManager-4.3-12 - Moved some configuration values from BootServerRequest.py to 'configuration' file. - BootServerRequest takes the 'VARS' variable to read these values. @@ -180,4 +236,4 @@ chkconfig --del monitor-runlevelagent * Fri Sep 2 2005 Mark Huang - - Initial build. -%define module_current_branch 3.2 +%define module_current_branch 4.3