rpms
/
livecd-tools
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Converting version number to NVR 

- Removed patches (now included in v0.3.5)
This commit is contained in:
Brian C. Lane 2010-11-01 14:45:13 -07:00
parent 0c58711fcd
commit b6631d0591
10 changed files with 11 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
livecd-tools-033.tar.bz2
/livecd-tools-034.tar.bz2
/livecd-tools-0.3.5.tar.bz2

13
devloop.patch
View File

@ -1,13 +0,0 @@
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 00f201a..329ce4f 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -99,7 +99,7 @@ resetMBR() {
}
checkMBR() {
- if [[ "$DEV" =~ "/dev/loop*" ]]; then
+ if isdevloop "$DEV"; then
return 0
fi
getdisk $1

12
livecd-tools-034-newpath.patch
View File

@ -1,12 +0,0 @@
diff -up livecd-tools-034/imgcreate/live.py.newpath livecd-tools-034/imgcreate/live.py
--- livecd-tools-034/imgcreate/live.py.newpath 2010-09-14 16:04:49.205545002 -0400
+++ livecd-tools-034/imgcreate/live.py 2010-09-14 16:05:22.671544997 -0400
@@ -372,7 +372,7 @@ class x86LiveImageCreator(LiveImageCreat
def __copy_syslinux_background(self, isodest):
background_path = self._instroot + \
- "/usr/share/anaconda/syslinux-vesa-splash.jpg"
+ "/usr/share/anaconda/boot/syslinux-vesa-splash.jpg"
if not os.path.exists(background_path):
# fallback to F13 location

27
livecd-tools.spec
View File

@ -4,8 +4,9 @@
Summary: Tools for building live CDs
Name: livecd-tools
Version: 034
Release: 11%{?dist}
Version: 0.3.5
Release: 1%{?dist}
Epoch: 1
License: GPLv2
Group: System Environment/Base
URL: http://git.fedorahosted.org/git/livecd
@ -15,15 +16,8 @@ URL: http://git.fedorahosted.org/git/livecd
# make dist
# scp livecd*.tar.bz2 fedorahosted.org:livecd
Source0: http://fedorahosted.org/releases/l/i/livecd/%{name}-%{version}.tar.bz2
Patch0: vesa.patch
Patch1: regex.patch
Patch2: menulabel.patch
Patch3: devloop.patch
Patch4: livecd-tools-034-newpath.patch
Patch5: lzo.patch
Patch6: selinux.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-imgcreate = %{version}-%{release}
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
Requires: mkisofs
Requires: isomd5sum
Requires: parted
@ -66,13 +60,6 @@ like live image or appliances.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
make
@ -98,13 +85,17 @@ rm -rf $RPM_BUILD_ROOT
%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.

26
lzo.patch
View File

@ -1,26 +0,0 @@
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)

13
menulabel.patch
View File

@ -1,13 +0,0 @@
diff --git a/imgcreate/live.py b/imgcreate/live.py
index e4e0c2e..9153e10 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -519,7 +519,7 @@ menu hiddenrow 5
fslabel = self.fslabel,
isofstype = "auto",
liveargs = kern_opts,
- long = long,
+ long = long + " (Basic Video)",
short = "linux" + index,
basicvideo = basic,
xdriver = xdriver,

35
regex.patch
View File

@ -1,35 +0,0 @@
diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh
index 6023509..00f201a 100755
--- a/tools/livecd-iso-to-disk.sh
+++ b/tools/livecd-iso-to-disk.sh
@@ -70,7 +70,7 @@ getdisk() {
}
resetMBR() {
- if [[ "$DEV" =~ "/dev/loop*" ]]; then
+ if isdevloop "$DEV"; then
return
fi
getdisk $1
@@ -129,7 +129,7 @@ checkPartActive() {
if [ "$dev" = "$device" ]; then
return
fi
- if [[ "$dev" =~ "/dev/loop*" ]]; then
+ if isdevloop "$DEV"; then
return
fi
@@ -189,7 +189,11 @@ createMSDOSLayout() {
partinfo=$(LC_ALL=C /sbin/parted --script -m $device "unit b print" |grep ^$device:)
size=$(echo $partinfo |cut -d : -f 2 |sed -e 's/B$//')
/sbin/parted --script $device unit b mkpart primary fat32 17408 $(($size - 17408)) set 1 boot on
- USBDEV=${device}1
+ if ! isdevloop "$DEV"; then
+ USBDEV=${device}1
+ else
+ USBDEV=${device}
+ fi
# Sometimes automount can be _really_ annoying.
echo "Waiting for devices to settle..."
/sbin/udevadm settle

13
selinux.patch
View File

@ -1,13 +0,0 @@
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index aa2cff0..9a2145a 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -420,7 +420,7 @@ class SelinuxConfig(KickstartConfig):
if not os.path.exists(self.path("/sbin/setfiles")):
return
- self.call(["/sbin/setfiles", "/etc/selinux/targeted/contexts/files/file_contexts", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/"])
+ self.call(["/sbin/setfiles", "-e", "/proc", "-e", "/sys", "-e", "/dev", "-e", "/selinux", "/etc/selinux/targeted/contexts/files/file_contexts", "/"])
def apply(self, ksselinux):
if os.path.exists(self.path("/usr/sbin/lokkit")):

2
sources
View File

@ -1 +1 @@
601fe671670f7dcb68faebf443c05cba livecd-tools-034.tar.bz2
b1acf6baf5ed6f25eda2aedef52bfc99 livecd-tools-0.3.5.tar.bz2

66
vesa.patch
View File

@ -1,66 +0,0 @@
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 1e0f117..e4e0c2e 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -452,24 +452,12 @@ menu hiddenrow 5
template = """label %(short)s
menu label %(long)s
kernel vmlinuz%(index)s
- append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s
-
-
- label %(short)s
- menu label %(long)s %(basicvideo)s
- kernel vmlinuz%(index)s
append initrd=initrd%(index)s.img root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s
"""
else:
template = """label %(short)s
menu label %(long)s
kernel mboot.c32
- append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(extra)s --- initrd%(index)s.img
-
-
- label %(short)s
- menu label %(long)s %(basicvideo)s
- kernel mboot.c32
append xen%(index)s.gz --- vmlinuz%(index)s root=%(rootlabel)s rootfstype=%(isofstype)s %(liveargs)s %(xdriver)s %(extra)s --- initrd%(index)s.img
"""
return template % args
@@ -504,7 +492,7 @@ menu hiddenrow 5
# Basic video driver
basic = "system with basic video driver"
- xdriver = "xdriver=vesa"
+ xdriver = "xdriver=vesa nomodeset"
# tell dracut not to ask for LUKS passwords or activate mdraid sets
@@ -519,14 +507,25 @@ menu hiddenrow 5
liveargs = kern_opts,
long = long,
short = "linux" + index,
- basicvideo = basic,
- xdriver = xdriver,
+ basicvideo = "",
+ xdriver = "",
extra = "",
index = index)
if default:
cfg += "menu default\n"
+ cfg += self.__get_image_stanza(is_xen, isDracut,
+ fslabel = self.fslabel,
+ isofstype = "auto",
+ liveargs = kern_opts,
+ long = long,
+ short = "linux" + index,
+ basicvideo = basic,
+ xdriver = xdriver,
+ extra = "",
+ index = index)
+
if checkisomd5:
cfg += self.__get_image_stanza(is_xen, isDracut,
fslabel = self.fslabel,