Don't try and run isohybrid when using xorriso

This commit is contained in:
Adam Williamson 2022-06-16 12:07:31 -07:00
parent 000f087b44
commit 7055cefd7c
2 changed files with 37 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 6890d56b3f7b55d646fe4aba44df127988808064 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 16 Jun 2022 12:00:39 -0700
Subject: [PATCH] createiso: don't run isohybrid if we're using xorriso
isohybrid is part of syslinux and won't be available on this
path. We'll assume that on this path, lorax already made the
image hybrid and using xorriso will maintain that.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
pungi/createiso.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pungi/createiso.py b/pungi/createiso.py
index 4e1a5336..bc5e19f5 100644
--- a/pungi/createiso.py
+++ b/pungi/createiso.py
@@ -94,7 +94,7 @@ def run_isohybrid(f, opts):
be booted when written to USB disk. This is done by running isohybrid on
the image.
"""
- if opts.buildinstall_method and opts.arch in ["x86_64", "i386"]:
+ if opts.buildinstall_method and opts.arch in ["x86_64", "i386"] and not opts.use_xorrisofs:
cmd = iso.get_isohybrid_cmd(opts.iso_name, opts.arch)
emit(f, cmd)
--
2.36.1

View File

@ -2,13 +2,16 @@
Name: pungi Name: pungi
Version: 4.3.5 Version: 4.3.5
Release: 3%{?dist} Release: 4%{?dist}
Summary: Distribution compose tool Summary: Distribution compose tool
License: GPLv2 License: GPLv2
URL: https://pagure.io/pungi URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2 Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
Patch0: https://pagure.io/pungi/pull-request/1613.patch Patch0: https://pagure.io/pungi/pull-request/1613.patch
# Extends 1613 to disable isohybrid step when using xorriso, see
# https://pagure.io/pungi/pull-request/1613#comment-172752
Patch1: 0001-createiso-don-t-run-isohybrid-if-we-re-using-xorriso.patch
BuildRequires: make BuildRequires: make
BuildRequires: python3-pytest BuildRequires: python3-pytest
@ -139,6 +142,9 @@ rm %{buildroot}%{_bindir}/pungi
%{_bindir}/%{name}-wait-for-signed-ostree-handler %{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog %changelog
* Thu Jun 16 2022 Adam Williamson <awilliam@redhat.com> - 4.3.5-4
- Don't try and run isohybrid when using xorriso
* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 4.3.5-3 * Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 4.3.5-3
- Rebuilt for Python 3.11 - Rebuilt for Python 3.11