From 76128147754006a140610972c6b6f04ae6c69c83 Mon Sep 17 00:00:00 2001 From: Alex Burmashev Date: Thu, 3 Jul 2014 13:33:36 +0400 Subject: [PATCH] added one more hack --- livecd-tools-21.1.hack2.patch | 12 ++++++++++++ livecd-tools.spec | 4 +++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 livecd-tools-21.1.hack2.patch diff --git a/livecd-tools-21.1.hack2.patch b/livecd-tools-21.1.hack2.patch new file mode 100644 index 0000000..be75b29 --- /dev/null +++ b/livecd-tools-21.1.hack2.patch @@ -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 13:31:20.000000000 +0400 ++++ livecd-tools-21.1/imgcreate/live.py 2014-07-03 13:32:47.241941724 +0400 +@@ -726,7 +726,7 @@ + if not self._efiarch: + # for most things, we want them named boot$efiarch + efiarch = {"i386": "IA32", "x86_64": "X64"} +- self._efiarch = efiarch[rpmUtils.arch.getBaseArch()] ++ self._efiarch = efiarch[getBaseArch()] + return self._efiarch + + def __copy_efi_files(self, isodir): diff --git a/livecd-tools.spec b/livecd-tools.spec index 08e3247..c374fd7 100644 --- a/livecd-tools.spec +++ b/livecd-tools.spec @@ -5,7 +5,7 @@ Summary: Tools for building live CDs Name: livecd-tools Version: 21.1 -Release: 4 +Release: 5 Epoch: 1 License: GPLv2 Group: System/Base @@ -17,6 +17,7 @@ Patch0: livecd-tools-21.1.urpmi.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python-imgcreate = %{epoch}:%{version}-%{release} @@ -69,6 +70,7 @@ like live image or appliances. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make