X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootcd.spec;h=4e03a8d3f217fa8126e55357e39526efacd61d93;hb=e446dbf789817429d3648fec50bb0c7e1b605e43;hp=2d725954f7cc1382a45af637772310e2cccf6943;hpb=110e5257ab51c45b5afe0bf85ff38996f3defb45;p=bootcd.git diff --git a/bootcd.spec b/bootcd.spec index 2d72595..4e03a8d 100644 --- a/bootcd.spec +++ b/bootcd.spec @@ -1,22 +1,21 @@ # -# $Id$ -# -%define url $URL$ - -%define nodefamily %{pldistro}-%{_arch} +%define nodefamily %{pldistro}-%{distroname}-%{_arch} %define name bootcd-%{nodefamily} -%define version 4.2 -%define taglevel 16 +%define version 5.2 +%define taglevel 5 # pldistro already in the rpm name -#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define release %{taglevel}%{?date:.%{date}} +# structure - this results in 2 packages +# bootcd-initscripts - has the plc.d/ scripts +# bootcd- - has the actual stuff for a given nodefamily + Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} Summary: Boot CD material for %{nodefamily} Name: %{name} @@ -30,31 +29,59 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch Requires: dosfstools, mkisofs, gzip, mtools, syslinux +# yumdownloader is needed in bootcd-kernel +Requires: yum-utils +# mkdiskimage is used for USB-partitioned mode +# but it now comes in a separate rpm +%if "%{distro}" == "Fedora" && %{distrorelease} >= 14 +Requires: syslinux-perl +%endif Requires: pyplnet +# 5.0 now has 3-fold nodefamily +%define obsolete_nodefamily %{pldistro}-%{_arch} +Obsoletes: bootcd-%{obsolete_nodefamily} + AutoReqProv: no %define debug_package %{nil} %description The Boot CD securely boots PlanetLab nodes into an immutable -environment. +environment. This package is designed to be installed on a MyPLC +installation and provide the basics for the PLC to able to compute +BootCDs for its attached nodes. +See http://svn.planet-lab.org/wiki/NodeFamily + + +%package -n bootcd-initscripts +Summary: initscripts for the MyPLC installation +Group: System Environment/Base +%description -n bootcd-initscripts +This package contains the init scripts that get fired when the PLC is +restarted. + +### avoid having yum complain about updates, as stuff is moving around +# plc.d/bootcd* +Conflicts: MyPLC <= 4.3 %prep %setup -q %build -pushd BootCD +[ -d bootcd ] || ln -s BootCD bootcd + +pushd bootcd -# Build the reference image -./prep.sh %{pldistro} %{nodefamily} +# Build the reference image - pass 3-fold version number to go in version.txt +./prep.sh %{pldistro} %{nodefamily} %{version} popd %install rm -rf $RPM_BUILD_ROOT -pushd BootCD +pushd bootcd # Install the reference image and build scripts install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name} @@ -69,30 +96,102 @@ tar cpf - \ configurations | \ tar -C $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -xpf - +for script in bootcd bootcd-kernel; do + install -D -m 755 plc.d/$script $RPM_BUILD_ROOT/etc/plc.d/$script +done + popd %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}/* -fi - %files %defattr(-,root,root,-) %{_datadir}/%{name} -%post -[ -f /etc/planetlab/nodefamily ] || { mkdir -p /etc/planetlab ; echo %{nodefamily} > /etc/planetlab/nodefamily ; } +%files -n bootcd-initscripts +%defattr(-,root,root,-) +/etc/plc.d %changelog +* Fri Apr 03 2015 Thierry Parmentelat - bootcd-5.2-5 +- changes for fedora 21 and its new release of syslinux + +* Fri Mar 21 2014 Thierry Parmentelat - bootcd-5.2-4 +- no change, only some internal comments were changed + +* Wed Jun 26 2013 Thierry Parmentelat - bootcd-5.2-3 +- attempt to make node take off more reliable with pl_wrapper + +* Wed Apr 24 2013 Thierry Parmentelat - bootcd-5.2-2 +- fix version number as it shows up in version.txt (was empty) + +* Thu Mar 07 2013 Thierry Parmentelat - bootcd-5.2-1 +- turn off systemd traces at boot-time + +* Tue Feb 26 2013 Thierry Parmentelat - bootcd-5.1-5 +- fix console on tty2: this broke the build on fedora14 +- even though f14 doesn't use systemd by defaults there is /etc/systemd in there + +* Fri Feb 22 2013 Thierry Parmentelat - bootcd-5.1-4 +- turn on getty/console on tty2 + +* Thu Feb 21 2013 Thierry Parmentelat - bootcd-5.1-3 +- reviewed for systemd & f18 + +* Mon May 07 2012 Thierry Parmentelat - bootcd-5.1-2 +- turn off selinux, turns out needed with some combinations like lxc/f14 + +* Wed Apr 11 2012 Thierry Parmentelat - bootcd-5.1-1 +- compatible with pre- and post- f16 +- add systemd friendlyness to bootcd +- also add biosdevname=0 tp kernel args so ethernet devices are still named in eth + +* Mon Nov 07 2011 Thierry Parmentelat - bootcd-5.0-11 +- add requires: to syslinux-perl on fedora14 + +* Mon Mar 21 2011 Thierry Parmentelat - bootcd-5.0-10 +- blacklisted mdules +- requires yum-utils for yumdownloader in bootcd-kernel + +* Mon Feb 21 2011 S.Çağlar Onur - bootcd-5.0-9 +- Handle /dev/rtc name change for newer kernels + +* Tue Jan 25 2011 S.Çağlar Onur - bootcd-5.0-8 +- Revert hacky solution for 2.6.32 based kernels as they are no longer required + +* Sun Jan 23 2011 Thierry Parmentelat - bootcd-5.0-7 +- changes for booting off fedora14 +- displays some sanity checks in case bm can's get downloaded +- virtio devices in /dev/vd* also considered +- start service rsyslog if found +- hack for kernel-firmware with 2.6.32 +- use $() instead of `` + +* Wed Dec 01 2010 Thierry Parmentelat - bootcd-5.0-6 +- use /usr/lib/syslinux/mkdiskimage or installed mkdiskimage + +* Wed Sep 01 2010 Thierry Parmentelat - bootcd-5.0-5 +- remove remainging reference to planet-lab.org + +* Mon Jul 05 2010 Baris Metin - BootCD-5.0-4 +- module name changes + +* Wed Jun 23 2010 Thierry Parmentelat - BootCD-5.0-3 +- nicer initscript now uses 'action' from /etc/init.d/functions + +* Tue Apr 20 2010 Talip Baris Metin - BootCD-5.0-2 +- obsolete old bootcd versions + +* Fri Jan 29 2010 Thierry Parmentelat - BootCD-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 +- nodefamily is 3-fold with pldistro-fcdistro-arch +- new module bootcd-inistscripts + +* Sat Jan 09 2010 Thierry Parmentelat - BootCD-4.2-17 +- support for fedora 12 + * Sun Dec 27 2009 Thierry Parmentelat - BootCD-4.2-16 - fix build on fedora12 @@ -101,7 +200,7 @@ fi - repeated in the bootmanager to handle all CDs without this operation * Mon Jun 29 2009 Marc Fiuczynski - BootCD-4.2-14 -- Daniel's update to generalize the kvariant support. +- Daniel''s update to generalize the kvariant support. * Wed Apr 08 2009 Thierry Parmentelat - BootCD-4.2-13 - robust to node config file specified with a relative path @@ -172,4 +271,4 @@ fi * Fri Sep 2 2005 Mark Huang - - Initial build. -%define module_current_branch 3.4 +%define module_current_branch 4.2