From 50204b404d983ca902c8261fd09821501bbe03f9 Mon Sep 17 00:00:00 2001
From: Jiri Kucera <jkucera@redhat.com>
Date: Jun 14 2021 19:51:32 +0000
Subject: Replace genisoimage with xorriso


genisoimage from cdrkit has no upstream activity for years.
Its alternative, xorriso from libisoburn, has vivid upstream.

---

diff --git a/build-iso.sh b/build-iso.sh
index 413c119..1313d5e 100644
--- a/build-iso.sh
+++ b/build-iso.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -ex
+
 # args
 dir="$1"
 
@@ -21,6 +23,6 @@ qemu-img convert --image-opts \
 	$vfat
 
 # build ISO with FAT image file as El Torito EFI boot image
-genisoimage -input-charset ASCII -J -rational-rock \
-	-efi-boot "${vfat##*/}" -no-emul-boot -o "$iso" -- "$vfat"
+mkisofs -input-charset ASCII -J -rational-rock \
+	-e "${vfat##*/}" -no-emul-boot -o "$iso" "$vfat"
 rm -rf "$root/" "$vfat"
diff --git a/edk2.spec b/edk2.spec
index 3efbe04..ca76a8e 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -46,7 +46,7 @@ Name:           edk2
 # to use YYYMMDD to avoid needing to bump package epoch
 # due to previous 'git' Version:
 Version:        %{edk2_stable_date}01stable
-Release:        4%{dist}
+Release:        5%{dist}
 Summary:        EFI Development Kit II
 
 License:        BSD-2-Clause-Patent
@@ -118,7 +118,7 @@ BuildRequires:  gcc-x86_64-linux-gnu
 BuildRequires:  iasl
 BuildRequires:  nasm
 BuildRequires:  qemu-img
-BuildRequires:  genisoimage
+BuildRequires:  xorriso
 BuildRequires:  bc
 BuildRequires:  sed
 BuildRequires:  perl
@@ -599,6 +599,9 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_
 
 
 %changelog
+* Mon Jun 14 2021 Jiri Kucera <jkucera@redhat.com> - 20200801stable-5
+- Replace genisoimage with xorriso
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20200801stable-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild