Update xorriso patch

This commit is contained in:
Lubomír Sedlář 2022-07-25 14:48:51 +02:00
parent 332f745caa
commit d870fb3532
2 changed files with 17 additions and 11 deletions

View File

@ -1,6 +1,6 @@
From 596d6298a1524f8b9779b1d12d6fde4cf5051178 Mon Sep 17 00:00:00 2001
From 27e39deafcec56947d46b023b3e9395d6042c479 Mon Sep 17 00:00:00 2001
From: Lubomír Sedlář <lsedlar@redhat.com>
Date: Jun 08 2022 11:03:39 +0000
Date: Jul 25 2022 12:42:02 +0000
Subject: Create DVDs with xorriso
@ -27,7 +27,7 @@ Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
diff --git a/pungi/createiso.py b/pungi/createiso.py
index 4e1a533..5c8fbca 100644
index 4e1a533..4d80678 100644
--- a/pungi/createiso.py
+++ b/pungi/createiso.py
@@ -15,6 +15,7 @@ CreateIsoOpts = namedtuple(
@ -46,7 +46,7 @@ index 4e1a533..5c8fbca 100644
],
)
CreateIsoOpts.__new__.__defaults__ = (None,) * len(CreateIsoOpts._fields)
@@ -116,6 +118,23 @@ def make_jigdo(f, opts):
@@ -116,6 +118,27 @@ def make_jigdo(f, opts):
emit(f, cmd)
@ -63,6 +63,10 @@ index 4e1a533..5c8fbca 100644
+ iso_path, fs_path = line.strip().split("=", 1)
+ emit(f, "-map %s %s" % (fs_path, iso_path))
+
+ if opts.arch == "ppc64le":
+ # This is needed for the image to be bootable.
+ emit(f, "-as mkisofs -U --")
+
+ emit(f, "-end")
+ return script
+
@ -70,23 +74,25 @@ index 4e1a533..5c8fbca 100644
def write_script(opts, f):
if bool(opts.jigdo_dir) != bool(opts.os_tree):
raise RuntimeError("jigdo_dir must be used together with os_tree")
@@ -123,7 +142,13 @@ def write_script(opts, f):
@@ -123,8 +146,14 @@ def write_script(opts, f):
emit(f, "#!/bin/bash")
emit(f, "set -ex")
emit(f, "cd %s" % opts.output_dir)
- make_image(f, opts)
- run_isohybrid(f, opts)
+
+ if opts.use_xorrisofs and opts.buildinstall_method:
+ script = write_xorriso_commands(opts)
+ emit(f, "xorriso -dialog on <%s" % script)
+ else:
+ make_image(f, opts)
+ run_isohybrid(f, opts)
+
run_isohybrid(f, opts)
implant_md5(f, opts)
make_manifest(f, opts)
if opts.jigdo_dir:
diff --git a/pungi/phases/createiso.py b/pungi/phases/createiso.py
index 340edc9..226620c 100644
index e237cf7..722cfb0 100644
--- a/pungi/phases/createiso.py
+++ b/pungi/phases/createiso.py
@@ -343,7 +343,10 @@ class CreateisoPhase(PhaseLoggerMixin, PhaseBase):

View File

@ -2,16 +2,13 @@
Name: pungi
Version: 4.3.5
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Distribution compose tool
License: GPLv2
URL: https://pagure.io/pungi
Source0: https://pagure.io/releases/%{name}/%{name}-%{version}.tar.bz2
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: python3-pytest
@ -142,6 +139,9 @@ rm %{buildroot}%{_bindir}/pungi
%{_bindir}/%{name}-wait-for-signed-ostree-handler
%changelog
* Mon Jul 25 2022 Lubomír Sedlář <lsedlar@redhat.com> - 4.3.5-7
- Update xorriso patch
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild