pungi: Don't include EFI options if EFI image not generated

This commit is contained in:
Marek Marczykowski-Górecki 2013-12-08 19:16:05 +01:00
parent 23f94f0a16
commit eb2625db0b
2 changed files with 14 additions and 0 deletions

12
pungi/disable-efi.patch Normal file
View File

@ -0,0 +1,12 @@
--- pungi-2.13/src/pypungi/__init__.py.orig 2013-12-07 23:25:33.790299986 +0100
+++ pungi-2.13/src/pypungi/__init__.py 2013-12-07 23:27:06.347452833 +0100
@@ -1143,7 +1143,8 @@
if self.config.get('pungi', 'arch') == 'i386' or self.config.get('pungi', 'arch') == 'x86_64':
extraargs.extend(x86bootargs)
- if self.config.get('pungi', 'arch') == 'x86_64':
+ if self.config.get('pungi', 'arch') == 'x86_64' and \
+ os.path.exists(os.path.join(self.topdir, 'images', 'efiboot.img')):
extraargs.extend(efibootargs)
isohybrid.append('-u')
if os.path.exists(os.path.join(self.topdir, 'images', 'macboot.img')):

View File

@ -14,6 +14,7 @@ License: GPLv2
URL: https://fedorahosted.org/pungi
Source0: https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
Patch0: support-verify-downloaded-packages.patch
Patch1: disable-efi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: anaconda >= 14.3, yum => 3.2.19, repoview, createrepo >= 0.4.11
Requires: lorax
@ -29,6 +30,7 @@ A tool to create anaconda based installation trees/isos of a set of rpms.
%setup -q
%patch0 -p1
%patch1 -p1
%build
%{__python} setup.py build