From 18262264eaf793ed2d06e2a04204ad9ee19b904b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 6 Dec 2016 14:51:28 -0700 Subject: [PATCH] Use genisoimage instead of mkisofs, add genisoimage package to travis --- .travis.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 87cfbf2..c65c64b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ os: - linux dist: trusty before_install: -- if [ `uname` = "Linux" ]; then sudo apt-get install -qq nasm pkg-config fuse libfuse-dev syslinux-utils; +- if [ `uname` = "Linux" ]; then sudo apt-get install -qq nasm pkg-config fuse libfuse-dev genisoimage syslinux-utils; sudo modprobe fuse; sudo chmod 666 /dev/fuse; sudo chown root:$USER /etc/fuse.conf; fi - if [ `uname` = "Darwin" ]; then brew update; brew install nasm gcc49 pkg-config diff --git a/Makefile b/Makefile index feb3edf..ef291a3 100644 --- a/Makefile +++ b/Makefile @@ -230,7 +230,7 @@ build/livedisk.iso: build/livedisk.bin.gz mkdir -p build/iso/ cp -RL isolinux build/iso/ cp $< build/iso/livedisk.gz - mkisofs -o $@ -b isolinux/isolinux.bin -c isolinux/boot.cat \ + genisoimage -o $@ -b isolinux/isolinux.bin -c isolinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ build/iso/ isohybrid $@