vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use genisoimage instead of mkisofs, add genisoimage package to travis

Browse source
This commit is contained in:
Jeremy Soller 2016-12-06 14:51:28 -07:00
parent 31d62f9272
commit 18262264ea
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -7,7 +7,7 @@ os:
- linux - linux
dist: trusty dist: trusty
before_install: 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; sudo modprobe fuse; sudo chmod 666 /dev/fuse; sudo chown root:$USER /etc/fuse.conf;
fi fi
- if [ `uname` = "Darwin" ]; then brew update; brew install nasm gcc49 pkg-config - if [ `uname` = "Darwin" ]; then brew update; brew install nasm gcc49 pkg-config

2
Makefile
View file

@ -230,7 +230,7 @@ build/livedisk.iso: build/livedisk.bin.gz
mkdir -p build/iso/ mkdir -p build/iso/
cp -RL isolinux build/iso/ cp -RL isolinux build/iso/
cp $< build/iso/livedisk.gz 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 \ -no-emul-boot -boot-load-size 4 -boot-info-table \
build/iso/ build/iso/
isohybrid $@ isohybrid $@