diff --git a/gzip.patch b/gzip.patch new file mode 100644 index 0000000..6d1762f --- /dev/null +++ b/gzip.patch @@ -0,0 +1,58 @@ +diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod +index 880ae19..e80a119 100644 +--- a/docs/livecd-creator.pod ++++ b/docs/livecd-creator.pod +@@ -42,8 +42,8 @@ Defines the file system label. The default is based on the configuration name. + + =item --compression-type=COMPRESSOR + +-Specify a compressor recognized by mksquashfs. The default is zlib. lzma +-currently requires a custom kernel to produce a functional image. If zlib ++Specify a compressor recognized by mksquashfs. The default is gzip. lzma ++currently requires a custom kernel to produce a functional image. If gzip + is used, the -comp option is not passed to mksquashfs to allow the use of + older versions of mksquashfs. + +diff --git a/imgcreate/fs.py b/imgcreate/fs.py +index c5cd18b..554d1b9 100644 +--- a/imgcreate/fs.py ++++ b/imgcreate/fs.py +@@ -41,8 +41,8 @@ def makedirs(dirname): + raise + + def mksquashfs(in_img, out_img, compress_type): +-# Allow zlib to work for older versions of mksquashfs +- if compress_type == "zlib": ++# Allow gzip to work for older versions of mksquashfs ++ if compress_type == "gzip": + args = ["/sbin/mksquashfs", in_img, out_img] + else: + args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type] +diff --git a/imgcreate/live.py b/imgcreate/live.py +index 36fef63..f349a1f 100644 +--- a/imgcreate/live.py ++++ b/imgcreate/live.py +@@ -46,7 +46,7 @@ class LiveImageCreatorBase(LoopImageCreator): + """ + LoopImageCreator.__init__(self, *args) + +- self.compress_type = "zlib" ++ self.compress_type = "gzip" + """mksquashfs compressor to use.""" + + self.skip_compression = False +diff --git a/tools/livecd-creator b/tools/livecd-creator +index 79fc944..d1727c5 100755 +--- a/tools/livecd-creator ++++ b/tools/livecd-creator +@@ -42,8 +42,8 @@ def parse_options(args): + imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label", + help="File system label (default based on config name)") + imgopt.add_option("", "--compression-type", type="string", dest="compress_type", +- help="Compression type recognized by mksquashfs (default zlib, lzma needs custom kernel)", +- default="zlib") ++ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)", ++ default="gzip") + parser.add_option_group(imgopt) + + # options related to the config of your system diff --git a/livecd-tools.spec b/livecd-tools.spec index 954ef42..39956cd 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -4,16 +4,23 @@ Summary: Tools for building live CDs Name: livecd-tools -Version: 031 -Release: 1%{?dist}.1 +Version: 033 +Release: 3%{?dist} License: GPLv2 Group: System Environment/Base URL: http://git.fedorahosted.org/git/livecd +# To make source tar ball: +# git clone git://git.fedorahosted.org/livecd +# cd livecd +# make dist Source0: %{name}-%{version}.tar.bz2 +# Temporary patch until next livecd-tools rollup +Patch0: gzip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs Requires: isomd5sum +Requires: parted %ifarch %{ix86} x86_64 Requires: syslinux %endif @@ -51,6 +58,7 @@ like live image or appliances. %prep %setup -q +%patch0 -p1 %build make @@ -71,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/livecd-iso-to-disk %{_bindir}/livecd-iso-to-pxeboot %{_bindir}/image-creator +%{_bindir}/liveimage-mount %files -n python-imgcreate %defattr(-,root,root,-) @@ -81,8 +90,35 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/imgcreate/*.pyc %changelog -* Fri May 07 2010 Jesse Keating - 031-1.1 -- Rebuild +* Tue Jul 30 2010 Bruno Wolff III - 033-3 +- The previous update got replaced by the python update; another bump is needed. + +* Tue Jul 27 2010 Bruno Wolff III - 033-2 +- Replace 'zlib' with 'gzip' to fix thinko about the compressor name. + +* Tue Jul 27 2010 Bruno Wolff III - 033-1 +- Fix for vesa splash file change for bz 617115. +- Use lazy umounts as a work around for bz 617844. +- Better handling of Environment exceptions for bz 551932. + +* Wed Jul 21 2010 David Malcolm - 032-5 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Sat Jun 19 2010 Bruno Wolff III - 032-4 +- liveimage-mount is new to 023 + +* Sat Jun 19 2010 Bruno Wolff III - 032-3 +- Change the version in the Makefile + +* Sat Jun 19 2010 Bruno Wolff III - 032-2 +- Fix tar prefix and document how to make it + +* Sat Jun 19 2010 Bruno Wolff III - 032-1 +- Added support for specifying compressors +- Add Requires for parted - Bug 605639 +- Add rd_NO_DM dracut cmdline options - Bug 589783 +- See http://git.fedorahosted.org/git/?p=livecd;a=shortlog for a list of + upstream commits since 031 was tagged. * Tue Nov 03 2009 Warren Togami - 031-1 - livecd-iso-to-disk capable of installing installer DVD to USB diff --git a/sources b/sources index f810b48..2f94d10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09527ef6a628b12dae2c7c16812560fd livecd-tools-031.tar.bz2 +c97450474ed17f1e068aaaaf863ddee7 livecd-tools-033.tar.bz2