Replace genisoimage with xorriso

genisoimage from cdrkit has no upstream activity for years.
Its alternative, xorriso from libisoburn, has vivid upstream.
This commit is contained in:
Jiri Kucera 2021-06-14 21:51:32 +02:00
parent e8ccc21099
commit 50204b404d
2 changed files with 9 additions and 4 deletions

View File

@ -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"

View File

@ -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