X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootcd.spec;h=01b27532395a847fe5d3745e40b694b0d361ac4b;hb=ec353aa956753b4af681b6313ffa7da516401085;hp=10222aff1ad8ac9efc321a66bb4bd60290b11192;hpb=8552d2bfe6e0dbf74cf035692543e8b4234000f9;p=bootcd.git diff --git a/bootcd.spec b/bootcd.spec index 10222af..01b2753 100644 --- a/bootcd.spec +++ b/bootcd.spec @@ -1,13 +1,9 @@ # -# $Id$ -# -%define url $URL$ - %define nodefamily %{pldistro}-%{distroname}-%{_arch} %define name bootcd-%{nodefamily} -%define version 5.0 -%define taglevel 5 +%define version 5.1 +%define taglevel 1 # 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,6 +30,13 @@ 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 @@ -97,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 @@ -111,6 +115,35 @@ rm -rf $RPM_BUILD_ROOT /etc/plc.d %changelog +* 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