Backport 033-3 to F12 so that F14 repos can be built on F12 systems.

#2781)

.cvsignore

@@ -1 +0,0 @@
-livecd-tools-028.tar.bz2

.gitignore

@@ -0,0 +1 @@
+livecd-tools-031.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: livecd-tools
-# $Id$
-NAME := livecd-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

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

livecd-tools.spec

@@ -4,16 +4,23 @@
 
 Summary: Tools for building live CDs
 Name: livecd-tools
-Version: 028
-Release: 1%{?dist}
+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,6 +90,43 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/imgcreate/*.pyc
 
 %changelog
+* Tue Jul 30 2010 Bruno Wolff III <bruno@wolff.to> - 033-3
+- The previous update got replaced by the python update; another bump is needed.
+
+* Tue Jul 27 2010 Bruno Wolff III <bruno@wolff.to> - 033-2
+- Replace 'zlib' with 'gzip' to fix thinko about the compressor name.
+
+* Tue Jul 27 2010 Bruno Wolff III <bruno@wolff.to> - 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 <dmalcolm@redhat.com> - 032-5
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Sat Jun 19 2010 Bruno Wolff III <bruno@wolff.to> - 032-4
+- liveimage-mount is new to 023
+
+* Sat Jun 19 2010 Bruno Wolff III <bruno@wolff.to> - 032-3
+- Change the version in the Makefile
+
+* Sat Jun 19 2010 Bruno Wolff III <bruno@wolff.to> - 032-2
+- Fix tar prefix and document how to make it
+
+* Sat Jun 19 2010 Bruno Wolff III <bruno@wolff.to> - 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 <wtogami@redhat.com> - 031-1
+- livecd-iso-to-disk capable of installing installer DVD to USB
+
+* Mon Oct 19 2009 Warren Togami <wtogami@redhat.com> - 030-1
+- Tell dracut not to ask for LUKS passwords or activate mdraid sets
+- Silence the /etc/modprobe.conf deprecation warning
+
 * Wed Sep 16 2009 Warren Togami <wtogami@redhat.com> - 028-1
 - Fix LiveUSB with live images
 - Fix display of free space during livecd-iso-to-disk error (farrell)

sources

@@ -1 +1 @@
-bc6acb74d1cd29a1e33faa1d3c40121e  livecd-tools-028.tar.bz2
+c97450474ed17f1e068aaaaf863ddee7  livecd-tools-033.tar.bz2