X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootcd.spec;h=90db35af5d58ef2692bbcf78fd149938317712a0;hb=3a1395e98af9ff1604fb6ddb0f54c1dd2bba055e;hp=94dff221f25ded31fbf8101eb08c4c2ae3218e61;hpb=4d72530081a518a86db62737c80e90f54f86cadb;p=bootcd.git diff --git a/bootcd.spec b/bootcd.spec index 94dff22..90db35a 100644 --- a/bootcd.spec +++ b/bootcd.spec @@ -1,13 +1,9 @@ # -# $Id$ -# -%define url $URL$ - -%define nodefamily %{pldistro}-%{_arch} +%define nodefamily %{pldistro}-%{distroname}-%{_arch} %define name bootcd-%{nodefamily} -%define version 4.2 -%define taglevel 17 +%define version 5.1 +%define taglevel 4 # pldistro already in the rpm name #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -20,7 +16,7 @@ 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} @@ -34,9 +30,20 @@ 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} @@ -57,13 +64,15 @@ restarted. ### avoid having yum complain about updates, as stuff is moving around # plc.d/bootcd* -Conflicts: MyPLC <= 4.3-37 +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} @@ -73,7 +82,7 @@ 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} @@ -91,6 +100,7 @@ tar cpf - \ for script in bootcd bootcd-kernel; do install -D -m 755 plc.d/$script $RPM_BUILD_ROOT/etc/plc.d/$script done + popd %clean @@ -104,10 +114,63 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) /etc/plc.d -%post -[ -f /etc/planetlab/nodefamily ] || { mkdir -p /etc/planetlab ; echo %{nodefamily} > /etc/planetlab/nodefamily ; } - %changelog +* 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 @@ -190,4 +253,4 @@ rm -rf $RPM_BUILD_ROOT * Fri Sep 2 2005 Mark Huang - - Initial build. -%define module_current_branch 3.4 +%define module_current_branch 4.2