added a hack #3

This commit is contained in:
Alex Burmashev 2014-07-03 14:40:45 +04:00
parent 7612814775
commit 671207b0af
3 changed files with 17 additions and 3 deletions

View file

@ -0,0 +1,12 @@
diff -Nur livecd-tools-21.1.old/imgcreate/live.py livecd-tools-21.1/imgcreate/live.py
--- livecd-tools-21.1.old/imgcreate/live.py 2014-07-03 14:38:07.000000000 +0400
+++ livecd-tools-21.1/imgcreate/live.py 2014-07-03 14:39:14.107060531 +0400
@@ -739,7 +739,7 @@
"""
fail = False
missing = []
- files = [("/boot/efi/EFI/*/grub2-efi/shim.efi", "/EFI/BOOT/BOOT%s.efi" % (self.efiarch,)),
+ files = [("/boot/efi/EFI/*/shim.efi", "/EFI/BOOT/BOOT%s.efi" % (self.efiarch,)),
("/boot/efi/EFI/*/grub2-efi/grubcd.efi", "/EFI/BOOT/grubx64.efi"),
("/boot/grub2/themes/rosa/*", "/EFI/BOOT/themes/rosa/"),
("/boot/grub2/fonts/unicode.pf2", "/EFI/BOOT/fonts/"),

View file

@ -185,10 +185,10 @@ diff -Nur livecd-tools-21.1.old/imgcreate/fs.py livecd-tools-21.1/imgcreate/fs.p
# Allow gzip to work for older versions of mksquashfs
if not compress_type or compress_type == "gzip":
- args = ["/sbin/mksquashfs", in_img, out_img]
+ args = ["/usr/sbin/mksquashfs", in_img, out_img]
+ args = ["/usr/bin/mksquashfs", in_img, out_img]
else:
- args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type]
+ args = ["/usr/sbin/mksquashfs", in_img, out_img, "-comp", compress_type]
+ args = ["/usr/bin/mksquashfs", in_img, out_img, "-comp", compress_type]
if not sys.stdout.isatty():
args.append("-no-progress")

View file

@ -5,7 +5,7 @@
Summary: Tools for building live CDs
Name: livecd-tools
Version: 21.1
Release: 5
Release: 6
Epoch: 1
License: GPLv2
Group: System/Base
@ -18,6 +18,7 @@ Patch1: livecd-tools-21.1.split.install.patch
Patch2: livecd-tools-21.1.efi.fixes.patch
Patch3: livecd-tools-21.1.hack.patch
Patch4: livecd-tools-21.1.hack2.patch
Patch5: livecd-tools-21.1.hack3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
@ -71,6 +72,7 @@ like live image or appliances.
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
make