From 00bfba9251a9e1fd71d041e79d9458f733148091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georges=20Dup=C3=A9ron?= Date: Mon, 27 Aug 2018 08:42:50 +0200 Subject: [PATCH] macos: mkisofs includes the path to its input as extra unwanted directories in the iso --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 862974d..3ac6d2d 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ ${bld}/os.iso: ${bld}/iso_files/os.zip ${bld}/iso_files/boot/iso_boot.sys ${bld} ! test -d ${bld}/iso_files.tmp cp -a -T -- ${bld}/iso_files ${bld}/iso_files.tmp find ${bld}/iso_files.tmp -depth -exec touch -t ${commit_timestamp} '{}' ';' - faketime -f ${commit_faketime} mkisofs \ + (cd ./${bld}/iso_files.tmp/ && faketime -f ${commit_faketime} mkisofs \ --input-charset utf-8 \ -rock \ -joliet \ @@ -215,8 +215,8 @@ ${bld}/os.iso: ${bld}/iso_files/os.zip ${bld}/iso_files/boot/iso_boot.sys ${bld} -no-emul-boot \ -boot-load-size 4 \ -pad \ - -output $@ \ - ./${bld}/iso_files.tmp/ + -output ../os.iso \ + .) rm -- ${bld}/iso_files.tmp/os.zip \ ${bld}/iso_files.tmp/boot/iso_boot.sys rmdir ${bld}/iso_files.tmp/boot/