68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From 2216ab2e328457ef172d6bfa534272edf2f81a3a Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Tue, 30 Mar 2021 12:41:58 +0100
|
|
Subject: [PATCH 2/5] tests: Prefer xorriso over genisoimage to generate
|
|
test.iso
|
|
|
|
This Debian page explains the upstream situation:
|
|
https://wiki.debian.org/genisoimage
|
|
|
|
On Fedora, xorriso provides a compatibility program called "mkisofs".
|
|
However this is not present in Debian. Hence the choice to look for
|
|
the program called "xorrisofs".
|
|
---
|
|
docs/guestfs-building.pod | 4 ++--
|
|
m4/guestfs-progs.m4 | 6 +++---
|
|
test-data/Makefile.am | 2 +-
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod
|
|
index 8fb2361b2..4d0e943cb 100644
|
|
--- a/docs/guestfs-building.pod
|
|
+++ b/docs/guestfs-building.pod
|
|
@@ -152,9 +152,9 @@ I<Required>.
|
|
|
|
I<Required>.
|
|
|
|
-=item genisoimage
|
|
+=item xorriso, genisoimage or mkisofs
|
|
|
|
-I<Required>.
|
|
+One of these is I<Required>.
|
|
|
|
=item libxml2
|
|
|
|
diff --git a/m4/guestfs-progs.m4 b/m4/guestfs-progs.m4
|
|
index 4819df627..cd8662e86 100644
|
|
--- a/m4/guestfs-progs.m4
|
|
+++ b/m4/guestfs-progs.m4
|
|
@@ -49,10 +49,10 @@ AC_CHECK_PROG([GPERF],[gperf],[gperf],[no])
|
|
test "x$GPERF" = "xno" &&
|
|
AC_MSG_ERROR([gperf must be installed])
|
|
|
|
-dnl Check for genisoimage/mkisofs
|
|
-AC_PATH_PROGS([GENISOIMAGE],[genisoimage mkisofs],[no],
|
|
+dnl Check for xorriso/genisoimage/mkisofs.
|
|
+AC_PATH_PROGS([MKISOFS],[xorrisofs genisoimage mkisofs],[no],
|
|
[$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin])
|
|
-test "x$GENISOIMAGE" = "xno" && AC_MSG_ERROR([genisoimage must be installed])
|
|
+test "x$MKISOFS" = "xno" && AC_MSG_ERROR([xorriso or genisoimage or mkisofs must be installed])
|
|
|
|
dnl Check for optional xmllint.
|
|
AC_CHECK_PROG([XMLLINT],[xmllint],[xmllint],[no])
|
|
diff --git a/test-data/Makefile.am b/test-data/Makefile.am
|
|
index 8a832c94c..b603311a1 100644
|
|
--- a/test-data/Makefile.am
|
|
+++ b/test-data/Makefile.am
|
|
@@ -98,6 +98,6 @@ test.iso: $(images_files)
|
|
cp $(image_files) d/
|
|
mkdir -p d/directory
|
|
cd d && ln -sf /10klines abssymlink
|
|
- cd d && $(GENISOIMAGE) -J -r -o ../$@-t .
|
|
+ cd d && $(MKISOFS) -J -r -o ../$@-t .
|
|
rm -rf d
|
|
mv $@-t $@
|
|
--
|
|
2.29.0.rc2
|
|
|