aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2016-03-14 14:30:39 +0200
committerWill Deacon <will.deacon@arm.com>2016-03-16 14:54:23 +0000
commit7dda8cca6df01763f720e8f1c239b27a6443073d (patch)
tree8d1cb889415e7767d336a6e03d74abb411f5eea3
parentf73b9606f5902df73f2f29dfe1b652d04ee39fab (diff)
downloadkvmtool-7dda8cca6df01763f720e8f1c239b27a6443073d.tar.gz
kvmtool/tests: fix iso build on debian
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@linaro.org> Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r--tests/boot/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/boot/Makefile b/tests/boot/Makefile
index 40cba684..2b950d2e 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