From 9592f81749b4771f9ebb71189bf94676df294332 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Tue, 14 Apr 2009 18:01:20 +0000 Subject: [PATCH] =?UTF-8?q?-=20Don't=20prompt=20about=20overwriting=20when?= =?UTF-8?q?=20making=20usb=20stick=20(#491234)=20-=20Fix=20up=20livecd-iso?= =?UTF-8?q?-to-pxeboot=20for=20new=20syslinux=20paths=20-=20Fix=20--xo=20v?= =?UTF-8?q?ariable=20expansion=20(Alexander=20Bostr=C3=B6m)=20-=20Name=20o?= =?UTF-8?q?f=20EFI=20partitions=20doesn't=20matter=20for=20mactel=20mode?= =?UTF-8?q?=20(Jim=20Radford)=20-=20Fix=20unterminated=20sed=20command=20(?= =?UTF-8?q?#492376)=20-=20Handle=20kernel/squashfs=20mismatch=20when=20mak?= =?UTF-8?q?ing=20usb=20stick=20in=20--xo=20mode=20(Alexander=20Bostr=C3=B6?= =?UTF-8?q?m)=20-=20Support=20all=20of=20the=20options=20for=20the=20'fire?= =?UTF-8?q?wall'=20kickstart=20directive=20-=20Deal=20with=20syslinux=20co?= =?UTF-8?q?m32=20api=20incompat=20when=20making=20usb=20sticks=20(#492370)?= =?UTF-8?q?=20-=20Add=20options=20to=20force=20fetching=20of=20repomd.xml?= =?UTF-8?q?=20every=20run=20(jkeating)=20-=20Quiet=20restorecon=20(Marc=20?= =?UTF-8?q?Herbert)=20-=20Fix=20traceback=20with=20syslinux=20disabled=20(?= =?UTF-8?q?#495269)=20-=20Split=20python-imgcreate=20module=20into=20a=20s?= =?UTF-8?q?ubpackage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 2 +- livecd-tools.spec | 57 +++++++++++++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 45 insertions(+), 16 deletions(-) diff --git a/.cvsignore b/.cvsignore index 451d698..e400fcc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -livecd-tools-022.tar.bz2 +livecd-tools-023.tar.bz2 diff --git a/livecd-tools.spec b/livecd-tools.spec index 1d1217b..811f6e0 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,26 +4,16 @@ Summary: Tools for building live CD's Name: livecd-tools -Version: 022 +Version: 023 Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: util-linux -Requires: coreutils -Requires: e2fsprogs -Requires: yum >= 3.2.18 +Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs -Requires: squashfs-tools -Requires: pykickstart >= 0.96 -Requires: dosfstools >= 2.11-8 Requires: isomd5sum -Requires: rhpl -Requires: python-urlgrabber -Requires: libselinux-python -Requires: dbus-python %ifarch %{ix86} x86_64 Requires: syslinux %endif @@ -39,6 +29,26 @@ Tools for generating live CD's on Fedora based systems including derived distributions such as RHEL, CentOS and others. See http://fedoraproject.org/wiki/FedoraLiveCD for more details. +%package -n python-imgcreate +Summary: Python modules for building system images +Group: System Environment/Base +Requires: util-linux +Requires: coreutils +Requires: e2fsprogs +Requires: yum >= 3.2.18 +Requires: squashfs-tools +Requires: pykickstart >= 0.96 +Requires: dosfstools >= 2.11-8 +Requires: rhpl +Requires: python-urlgrabber +Requires: libselinux-python +Requires: dbus-python + +%description -n python-imgcreate +Python modules that can be used for building images for things +like live image or appliances. + + %prep %setup -q @@ -54,19 +64,38 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc AUTHORS COPYING README HACKING API +%doc AUTHORS COPYING README HACKING %doc config/livecd-fedora-minimal.ks %{_mandir}/man*/* %{_bindir}/livecd-creator %{_bindir}/livecd-iso-to-disk %{_bindir}/livecd-iso-to-pxeboot %{_bindir}/image-creator + +%files -n python-imgcreate +%defattr(-,root,root,-) +%doc API %dir %{python_sitelib}/imgcreate %{python_sitelib}/imgcreate/*.py %{python_sitelib}/imgcreate/*.pyo %{python_sitelib}/imgcreate/*.pyc %changelog +* Tue Apr 14 2009 Jeremy Katz - 023-1 +- Don't prompt about overwriting when making usb stick (#491234) +- Fix up livecd-iso-to-pxeboot for new syslinux paths +- Fix --xo variable expansion (Alexander Boström) +- Name of EFI partitions doesn't matter for mactel mode (Jim Radford) +- Fix unterminated sed command (#492376) +- Handle kernel/squashfs mismatch when making usb stick in + --xo mode (Alexander Boström) +- Support all of the options for the 'firewall' kickstart directive +- Deal with syslinux com32 api incompat when making usb sticks (#492370) +- Add options to force fetching of repomd.xml every run (jkeating) +- Quiet restorecon (Marc Herbert) +- Fix traceback with syslinux disabled (#495269) +- Split python-imgcreate module into a subpackage + * Mon Mar 9 2009 Jeremy Katz - 022-1 - Fixes for hybird GPT/MBR usb sticks (Stewart Adam) - Support setting SELinux booleans (Dan Walsh) @@ -116,7 +145,7 @@ rm -rf $RPM_BUILD_ROOT - Fix up boot from SD - Fix extracting boot parameters for pxe (apevec) - Make rpm macro information persist into the image (bkearney) -- Support %packages --instLangs (bkearney) +- Support %%packages --instLangs (bkearney) * Thu Aug 28 2008 Jeremy Katz - 018-1 - Use logging API for debugging messages (dhuff) diff --git a/sources b/sources index 9ce2a2a..dff924c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a4dca80700cb74f902ac07de6d25356 livecd-tools-022.tar.bz2 +27cc1df7be92b47c02e4537666ca6dc4 livecd-tools-023.tar.bz2