X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootcd.spec;h=8370632f20d4b86ae2d99ef9f14966759607a7d0;hb=44168eb5e74cff6bdc3580f233858e4b25f0b49a;hp=c14816ef20c30f3ec41ea227362ac151e978d37d;hpb=d97e3cae8d0eaa1a500621ef82c2475db2fa6ce5;p=bootcd.git diff --git a/bootcd.spec b/bootcd.spec index c14816e..8370632 100644 --- a/bootcd.spec +++ b/bootcd.spec @@ -1,90 +1,143 @@ -%define name bootcd -%define version 3.3 -%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}} -# XXX Get this from /etc/planetlab -%define configuration default +# +# $Id$ +# +%define url $URL$ + +%define nodefamily %{pldistro}-%{_arch} + +%define name bootcd-%{nodefamily} +%define version 4.2 +%define taglevel 7 + +# pldistro already in the rpm name +#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release %{taglevel}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central -Distribution: PlanetLab 3.2 -URL: http://cvs.planet-lab.org/cvs/bootcd_v3 +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) -Summary: The PlanetLab Boot CD -Name: bootcd +Summary: Boot CD material for %{nodefamily} +Name: %{name} Version: %{version} Release: %{release} License: BSD Group: System Environment/Base Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +# other archs must be able to install this +BuildArch: noarch + +Requires: dosfstools, mkisofs, gzip, mtools, syslinux + +Requires: pyplnet AutoReqProv: no %define debug_package %{nil} %description -The PlanetLab Boot CD securely boots PlanetLab nodes into an immutable +The Boot CD securely boots PlanetLab nodes into an immutable environment. %prep %setup -q %build -./build.sh build %{configuration} +pushd BootCD + +# Build the reference image +./prep.sh %{pldistro} %{nodefamily} + +popd %install -install -d $RPM_BUILD_ROOT/var/www/html/download -pushd build/%{configuration} -rm -f $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5 -bzip2 -c PlanetLab-BootCD-%{version}.iso > \ - $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.iso.bz2 -md5sum $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.iso.bz2 >> \ - $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5 - -bzip2 -c PlanetLab-BootCD-%{version}.usb > \ - $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.usb.bz2 -md5sum $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.usb.bz2 >> \ - $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5 - -bzip2 -c PlanetLab-BootCD-%{version}-biginitrd.usb > \ - $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}-biginitrd.usb.bz2 -md5sum $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}-biginitrd.usb.bz2 >> \ - $RPM_BUILD_ROOT/var/www/html/download/PlanetLab-BootCD-%{version}.md5 +rm -rf $RPM_BUILD_ROOT + +pushd BootCD + +# Install the reference image and build scripts +install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name} +install -m 755 build.sh $RPM_BUILD_ROOT/%{_datadir}/%{name}/ +tar cpf - \ + build/isofs/bootcd.img \ + build/isofs/kernel \ + build/passwd \ + build/version.txt \ + build/nodefamily \ + configurations | \ + tar -C $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -xpf - + popd -# If run under sudo, allow user to delete the build directory -if [ -n "$SUDO_USER" ] ; then - chown -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 {} \; -fi - %clean rm -rf $RPM_BUILD_ROOT -# If run under sudo, allow user to delete the built RPM +# If run under sudo if [ -n "$SUDO_USER" ] ; then - chown $SUDO_USER %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm + # 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 < /etc/planetlab/nodefamily ; } %changelog +* Tue Dec 02 2008 Daniel Hokka Zakrisson - BootCD-4.2-7 +- Allow multiple -k options to the build.sh script. +- Probe devices in PCI bus order. + +* Fri Nov 14 2008 Thierry Parmentelat - BootCD-4.2-6 +- add support for fedora9 images - compliant with upstart +- formerly monolythic dir 'conf_files/' split into 'etc/' and 'initscripts/' + +* Tue Sep 23 2008 Thierry Parmentelat - BootCD-4.2-5 +- cosmetic - pl_boot to display timestamps + +* Mon Aug 04 2008 Stephen Soltesz - BootCD-4.2-4 +- adds -k as an argument to build.sh to pass additional kernel parameters to the +- bootcd and kexec kernel. + +* Mon May 05 2008 Thierry Parmentelat - BootCD-4.2-3 +- rpm release tag does not need pldistro as it is already part of the rpm name + +* Thu Apr 24 2008 Thierry Parmentelat - BootCD-4.2-2 +- change location of nodefamily in /etc/planetlab/ + +* Wed Apr 23 2008 Thierry Parmentelat - BootCD-4.2-1 +- new name for the rpm, to allow simultaneous rpm-installs for several nodefamily (pldistro+arch) +- now installs in /usr/share/bootcd- with a legacy symlink (requires MyPLC-4.2-7) +- nodefamily exported under bootcd.img in /etc/nodefamily (for bm) and under build/nodefamily (for build.sh) + +* Wed Mar 26 2008 Thierry Parmentelat - BootCD-3.4-4 BootCD-3.4-5 +- kargs.txt for serial boot fixed: now properly exposed to bootmanager through the overlay image +- build.sh cleaned up in the process +- actual location of selected node config file displayed +- import pypci rather than pypciscan + +* Thu Feb 14 2008 Thierry Parmentelat - bootcd-3.4-3 bootcd-3.4-4 +- build.sh support for -s (recommended vs using type) +- build.sh cleanup - usage clearer wrt types - removed old code +- fixed modprobe with args in pl_hwinit + +* Thu Jan 31 2008 Thierry Parmentelat - bootcd-3.4-2 bootcd-3.4-3 +- load floppy with modprobe flags +- support for creating a usb partition +- removed obsolete files newbuild.sh, bootcustom.sh and cdcustom.sh + * Mon Jan 29 2006 Marc E. Fiuczynski - - added biginitrd usb image * Fri Sep 2 2005 Mark Huang - - Initial build. +%define module_current_branch 3.4