Merged master
This sets the stage so that we can just do fast-forward merges from master in the future, keeping all branches in sync.
This commit is contained in:
Brian C. Lane
commit
f39573f3ca
|
|
@ -1 +1,3 @@
|
|||
livecd-tools-031.tar.bz2
|
||||
livecd-tools-033.tar.bz2
|
||||
/livecd-tools-034.tar.bz2
|
||||
/livecd-tools-0.3.5.tar.bz2
|
||||
|
|
|
|||
58
gzip.patch
58
gzip.patch
|
|
@ -1,58 +0,0 @@
|
|||
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
|
||||
|
|
@ -4,8 +4,9 @@
|
|||
|
||||
Summary: Tools for building live CDs
|
||||
Name: livecd-tools
|
||||
Version: 033
|
||||
Release: 3%{?dist}
|
||||
Version: 0.3.5
|
||||
Release: 1%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: http://git.fedorahosted.org/git/livecd
|
||||
|
|
@ -13,16 +14,17 @@ URL: http://git.fedorahosted.org/git/livecd
|
|||
# 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
|
||||
# scp livecd*.tar.bz2 fedorahosted.org:livecd
|
||||
Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||
Requires: python-imgcreate = %{version}-%{release}
|
||||
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
|
||||
Requires: mkisofs
|
||||
Requires: isomd5sum
|
||||
Requires: parted
|
||||
Requires: pyparted
|
||||
%ifarch %{ix86} x86_64
|
||||
Requires: syslinux
|
||||
Requires: /sbin/extlinux
|
||||
%endif
|
||||
%ifarch ppc
|
||||
Requires: yaboot
|
||||
|
|
@ -58,7 +60,6 @@ like live image or appliances.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
make
|
||||
|
|
@ -80,16 +81,70 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_bindir}/livecd-iso-to-pxeboot
|
||||
%{_bindir}/image-creator
|
||||
%{_bindir}/liveimage-mount
|
||||
%{_bindir}/mkbiarch
|
||||
|
||||
%files -n python-imgcreate
|
||||
%defattr(-,root,root,-)
|
||||
%doc API
|
||||
%doc API COPYING
|
||||
%dir %{python_sitelib}/imgcreate
|
||||
%{python_sitelib}/imgcreate/*.py
|
||||
%{python_sitelib}/imgcreate/*.pyo
|
||||
%{python_sitelib}/imgcreate/*.pyc
|
||||
|
||||
%changelog
|
||||
* Mon Nov 01 2010 Brian C. Lane <bcl@redhat.com> - 0.3.5-1
|
||||
- Converting version number to NVR
|
||||
- Removed patches (now included in v0.3.5)
|
||||
|
||||
* Sun Sep 26 2010 Bruno Wolff III <bruno@wolff.to> - 034-11
|
||||
- Fix live image relabel when compose host has selinux disabled.
|
||||
|
||||
* Tue Sep 21 2010 Bruno Wolff III <bruno@wolff.to> - 034-10
|
||||
- Document the lzo compressor.
|
||||
|
||||
* Thu Sep 16 2010 Bruno Wolff III <bruno@wolff.to> - 034-9
|
||||
- Change requires to /sbin/extlinux since that will work with old and new
|
||||
versions of syslinux.
|
||||
|
||||
* Thu Sep 16 2010 Bruno Wolff III <bruno@wolff.to> - 034-8
|
||||
- extlinux is now in a subpackage that is required by livecd-iso-to-disk
|
||||
|
||||
* Tue Sep 14 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 034-7
|
||||
- fix background image copying to use new-new logo path
|
||||
|
||||
* Tue Sep 14 2010 Bruno Wolff III <bruno@wolff.to> - 034-6
|
||||
- One /dev/loop* change had been missed. Backport patch.
|
||||
|
||||
* Mon Sep 13 2010 Bruno Wolff III <bruno@wolff.to> - 034-5
|
||||
- Backport basic video menu label fix
|
||||
|
||||
* Mon Sep 13 2010 Bruno Wolff III <bruno@wolff.to> - 034-4
|
||||
- Backport missing parts of the regex fix patch
|
||||
|
||||
* Mon Sep 13 2010 Bruno Wolff III <bruno@wolff.to> - 034-3
|
||||
- Backported fix for vesa boot menu item
|
||||
|
||||
* Sun Sep 12 2010 Bruno Wolff III <bruno@wolff.to> - 034-2
|
||||
- mkbiarch needs pyparted
|
||||
|
||||
* Sat Sep 11 2010 Bruno Wolff III <bruno@wolff.to> - 034-1
|
||||
- A new experimental script for creating live images.
|
||||
- Handle partition devices that have a separator character in them.
|
||||
- Initial checkin of a new expermiental tool for live backup images.
|
||||
- Allow use of stage2 for repos to help with netinst ISOs.
|
||||
- Fix issue with using netinst ISOs.
|
||||
- Add support for ext4 now that syslinux supports it.
|
||||
- Fix for enumerating loop devices using bash 4.1.7.
|
||||
- Change --skipcopy to not overwrite other large areas.
|
||||
- Add basic video driver option to syslinux/isolinux.
|
||||
- Don't create sparse files one byte too large.
|
||||
- Display progress information when copying image to USB devices.
|
||||
- Set default boot language for USB images to the current locale.
|
||||
- Use grep instead of depreceated egrep.
|
||||
- Set up locale or there can be problems handling nonascii strings.
|
||||
- Try normal umount before falling back to lazy umount.
|
||||
- Allow creation of SELinux enabled LiveCD from an SELinux disabled system.
|
||||
|
||||
* 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.
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue