[PATCH] kvmtool/tests: fix iso build on debian

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Riku Voipio <riku.voipio@xxxxxxxxxx>

Debian and some other distro's don't provide mkisofs due to
licensing concerns. xorrisofs from package xorriso provides
a command-line compatible command in this case. Update the
makefile of tests to pick xorrisofs if mkisofs is not available.

Signed-off-by: Riku Voipio <riku.voipio@xxxxxxxxxx>
---
 tests/boot/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/boot/Makefile b/tests/boot/Makefile
index 40cba68..2b950d2 100644
--- a/tests/boot/Makefile
+++ b/tests/boot/Makefile
@@ -1,12 +1,20 @@
 NAME	:= init
 
 OBJ	:= $(NAME).o
+MKISOFS := $(shell which mkisofs)
+ifndef MKISOFS
+MKISOFS := $(shell which xorrisofs)
+endif
 
 all: $(.o)
 	rm -rf rootfs
 	mkdir rootfs
 	gcc -static init.c -o rootfs/init
-	mkisofs rootfs > boot_test.iso
+ifdef MKISOFS
+	$(MKISOFS) rootfs -o boot_test.iso
+else
+	$(error "mkisofs or xorriso needed to build boot_test.iso")
+endif
 
 clean:
 	rm -rf rootfs boot_test.iso
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux