PR#7: Replace genisoimage with xorriso - rpms/edk2

rpms / edk2

#7 Replace genisoimage with xorriso

Merged 2 years ago by bonzini. Opened 2 years ago by jkucera.

rpms/ jkucera/edk2 use-xorriso into rawhide

Replace genisoimage with xorriso

Jiri Kucera • 2 years ago

50204b4

build-iso.sh

file modified

+4 -2

		`@@ -1,5 +1,7 @@`
		`#!/bin/sh`

		`+ set -ex`
		`+`
		`# args`
		`dir="$1"`

		`@@ -21,6 +23,6 @@`
		`$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"`

edk2.spec

file modified

+5 -2

		`@@ -46,7 +46,7 @@`
		`# 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: iasl`
		`BuildRequires: nasm`
		`BuildRequires: qemu-img`
		`- BuildRequires: genisoimage`
		`+ BuildRequires: xorriso`
		`BuildRequires: bc`
		`BuildRequires: sed`
		`BuildRequires: perl`
		`@@ -599,6 +599,9 @@`


		`%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`

jkucera commented 2 years ago

genisoimage from cdrkit has no upstream activity for years. Its alternative, xorriso from libisoburn, has the vivid upstream on the other hand. Please double check the mkisofs arguments if they are correct or something is not missing.