X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootmanager.spec;h=460b86d8ff59ca126e8e2c4a2695e433d8fcb2d2;hb=de55450d9707b318aabf5b1caa542259e76a4eb9;hp=0484a6766901073c60525ae8b78976f44152f014;hpb=e245d17ff8957ce2d3a946a29ceee97b3cdf64f9;p=bootmanager.git diff --git a/bootmanager.spec b/bootmanager.spec index 0484a67..460b86d 100644 --- a/bootmanager.spec +++ b/bootmanager.spec @@ -4,8 +4,8 @@ %define url $URL$ %define name bootmanager -%define version 4.3 -%define taglevel 4 +%define version 5.0 +%define taglevel 0 %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} @@ -40,46 +49,99 @@ nodes. %setup -q %build +gcc -shared -fPIC -ldl -Os -o source/libc-opendir-hack.so source/libc-opendir-hack.c %install 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-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. +- UPLOAD_LOG_SCRIPT can point optionally to the 'upload-bmlog.php' or 'monitor/upload' +- (or any other interface that accepts a POST file) +- build.sh bundles cacerts for boot and monitor servers (if present) to +- authenticate the UPLOAD_LOG_SCRIPT. +- Previously, these certs were re-used from the bootcd, now they are bundled +- with BM. This allows the BM to point to a completely different myplc if +- desired, and it is still secure, because the original download is +- authenticated. + +* Wed Aug 26 2009 Stephen Soltesz - BootManager-4.3-11 +- raise a single exception for nodes with authentication errors +- fix syntax error in MakeInitrd.py + +* Mon Aug 10 2009 Stephen Soltesz - BootManager-4.3-10 +- Replace UpdateBootstate with UpdateRunlevel where appropriate. +- Removed failboot and install from forced states. +- Removed checks for initrd in Validate +- Added extra messages for Validate failures, not-installed, no kernel, failed fsck +- Added libc-opendir-hack.so patch from 3.2 branch for 2.6.12 bootcds on PL. + +* Mon Jun 29 2009 Marc Fiuczynski - BootManager-4.3-9 +- Special handling for "forcedeth" ethernet NIC. + +* Mon Jun 15 2009 Stephen Soltesz - BootManager-4.3-8 +- include a fix for public pl dealing with old/new boot images and root +- environments + +* Fri May 15 2009 Thierry Parmentelat - BootManager-4.3-7 +- review selection nodefamily at bootstrapfs install-time +- now based on (1) tags (2) nodefamily and (3) defaults +- this is required on very old bootcd + +* Wed Apr 29 2009 Marc Fiuczynski - BootManager-4.3-6 +- Use modprobe module to write out /etc/modprobe.conf. + +* Wed Apr 22 2009 Thierry Parmentelat - BootManager-4.3-5 +- minor updates - using the new modprobe module *not* in this tag + * Wed Apr 08 2009 Thierry Parmentelat - BootManager-4.3-4 - load device mapper if needed, for centos5-based bootcd variant @@ -134,4 +196,4 @@ EOF * Fri Sep 2 2005 Mark Huang - - Initial build. -%define module_current_branch 3.2 +%define module_current_branch 4.3