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

dist-git conversion
Fix typo that causes a failure to update the common directory. (releng
2010-08-17 22:47:44 -05:00 · 2010-07-29 02:28:42 +00:00 · 2009-11-26 01:57:25 +00:00 · 2009-11-08 21:07:48 +00:00 · 2009-11-03 18:37:07 +00:00 · 2009-10-20 02:27:53 +00:00
4 changed files with 115 additions and 953 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,20 +1 @@
-/livecd-tools-21.0.tar.bz2
-/livecd-tools-21.1.tar.bz2
-/livecd-tools-21.2.tar.bz2
-/livecd-tools-21.3.tar.bz2
-/livecd-tools-21.4.tar.bz2
-/livecd-tools-23.0.tar.bz2
-/livecd-tools-23.1.tar.gz
-/livecd-tools-23.2.tar.gz
-/livecd-tools-23.3.tar.gz
-/livecd-tools-23.4.tar.gz
-/livecd-tools-24.0.tar.gz
-/livecd-tools-24.1.tar.gz
-/livecd-tools-24.2.tar.gz
-/livecd-tools-24.3.tar.gz
-/livecd-tools-24.4.tar.gz
-/livecd-tools-25.0.tar.gz
-/livecd-tools-26.0.tar.gz
-/livecd-tools-26.1.tar.gz
-/livecd-tools-27.0.tar.gz
-/livecd-tools-27.1.tar.gz
+livecd-tools-031.tar.bz2
--- a/gzip.patch
+++ 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
--- a/livecd-tools.spec
+++ b/livecd-tools.spec
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (livecd-tools-27.1.tar.gz) = f5a744248d04b89e930e35fd52917412c6e97a800c4da6f9064a74a1bd7fd37bcc64eb38c222018d7e4fcb0686ede79ac4f3db5ea2b70fb7d062e79b441a2bd1
+c97450474ed17f1e068aaaaf863ddee7  livecd-tools-033.tar.bz2
Author	SHA1	Message	Date
Bruno Wolff III	65594863dd	Backport 033-3 to F12 so that F14 repos can be built on F12 systems.	2010-08-17 22:47:44 -05:00
Fedora Release Engineering	105563ce84	dist-git conversion	2010-07-29 02:28:42 +00:00
Bill Nottingham	57d08617ec	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:57:25 +00:00
Jesse Keating	2a90473e01	- Patch to disable iswmd on live images for F12 (533739)	2009-11-08 21:07:48 +00:00
Warren Togami	bec3f0e420	livecd-iso-to-disk capable of installing installer DVD to USB	2009-11-03 18:37:07 +00:00
Warren Togami	73a30b9fd1	make it actually work	2009-10-20 02:27:53 +00:00
Warren Togami	8e2aad7b90	bump	2009-10-19 19:33:26 +00:00
Warren Togami	cc973c670e	bump	2009-10-19 19:26:00 +00:00
Warren Togami	fec9a4b60a	- Tell dracut not to ask for LUKS passwords or activate mdraid sets - Silence the /etc/modprobe.conf deprecation warning	2009-10-19 19:24:53 +00:00
Jesse Keating	b5609cdf46	Initialize branch F-12 for livecd-tools	2009-09-29 05:25:13 +00:00