diff --git a/livecd-tools.spec b/livecd-tools.spec index ce5764c..b5b8080 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -20,6 +20,7 @@ Patch1: regex.patch Patch2: menulabel.patch Patch3: devloop.patch Patch4: livecd-tools-034-newpath.patch +Patch5: lzo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{version}-%{release} Requires: mkisofs @@ -69,6 +70,7 @@ like live image or appliances. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build make diff --git a/lzo.patch b/lzo.patch new file mode 100644 index 0000000..78c2077 --- /dev/null +++ b/lzo.patch @@ -0,0 +1,26 @@ +diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod +index e80a119..2c78892 100644 +--- a/docs/livecd-creator.pod ++++ b/docs/livecd-creator.pod +@@ -43,7 +43,7 @@ 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 gzip. lzma +-currently requires a custom kernel to produce a functional image. If gzip ++currently requires a custom kernel to produce a functional image. lzo works with 2.6.36+ kernels, but will generally take up more space than using gzip. If gzip + is used, the -comp option is not passed to mksquashfs to allow the use of + older versions of mksquashfs. + +diff --git a/tools/livecd-creator b/tools/livecd-creator +index d1727c5..d352d74 100755 +--- a/tools/livecd-creator ++++ b/tools/livecd-creator +@@ -42,7 +42,7 @@ 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 gzip, lzma needs custom kernel)", ++ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel, lzo needs a 2.6.36+ kernel)", + default="gzip") + parser.add_option_group(imgopt) +