almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Respect --nomacboot flag when calling isohybrid

Browse Source 
Fixes: https://pagure.io/pungi/issue/1222
Merges: https://pagure.io/pungi/pull-request/1223
Signed-off-by: Daris A Nevil <dnevil@intrusion.com>
This commit is contained in:
Daris A Nevil 2019-06-25 22:34:04 +00:00 committed by Lubomír Sedlář
parent 32a6415e58
commit 920eceaa5a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pungi/gather.py
View File

@ -298,6 +298,7 @@ class Pungi(PungiBase):
self.is_sources = not self.config.getboolean("pungi", "nosource") self.is_sources = not self.config.getboolean("pungi", "nosource")
self.is_debuginfo = not self.config.getboolean("pungi", "nodebuginfo") self.is_debuginfo = not self.config.getboolean("pungi", "nodebuginfo")
self.is_resolve_deps = self.config.getboolean("pungi", "resolve_deps") self.is_resolve_deps = self.config.getboolean("pungi", "resolve_deps")
self.is_nomacboot = self.config.getboolean("pungi", "nomacboot")
self.fulltree_excludes = set(self.ksparser.handler.fulltree_excludes) self.fulltree_excludes = set(self.ksparser.handler.fulltree_excludes)
@ -1552,7 +1553,7 @@ class Pungi(PungiBase):
cmd.extend(["--buildarch", "ppc64le"]) cmd.extend(["--buildarch", "ppc64le"])
# Only supported mac hardware is x86 make sure we only enable mac support on arches that need it # Only supported mac hardware is x86 make sure we only enable mac support on arches that need it
if self.tree_arch in ['x86_64'] and not self.config.getboolean('pungi','nomacboot'): if self.tree_arch in ['x86_64'] and not self.is_nomacboot:
cmd.append("--macboot") cmd.append("--macboot")
else: else:
cmd.append("--nomacboot") cmd.append("--nomacboot")
@ -1830,7 +1831,7 @@ class Pungi(PungiBase):
if self.tree_arch == 'x86_64': if self.tree_arch == 'x86_64':
extraargs.extend(efibootargs) extraargs.extend(efibootargs)
isohybrid.append('-u') isohybrid.append('-u')
if os.path.exists(os.path.join(self.topdir, 'images', 'macboot.img')): if (not self.is_nomacboot) and os.path.exists(os.path.join(self.topdir, 'images', 'macboot.img')):
extraargs.extend(macbootargs) extraargs.extend(macbootargs)
isohybrid.append('-m') isohybrid.append('-m')
elif self.tree_arch == 'ia64': elif self.tree_arch == 'ia64':