From 987f40eb8f95cb358a1c732ee8dc459c49fdff90 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 12 Feb 2020 10:24:50 -0600 Subject: [PATCH] build/jam/ppc: Fix PowerPC boot after hrev53614 * "xorriso doesn't support much of the mkisofs options" * Dropping the hfs map made our bootloader no-longer get mapped as :tbxi which means qemu + Apple devices refused to boot it. * Switch to genisoimage which can generate the correct image. (xorriso -as genisoimage doesn't work either) Change-Id: Id71b97796f5004f6ddf6244644c51a5787f9bf8e Reviewed-on: https://review.haiku-os.org/c/haiku/+/2241 Reviewed-by: Alex von Gluck IV --- build/jam/ImageRules | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index da37f50763..0d208a2652 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -1618,10 +1618,13 @@ actions BuildCDBootPPCImage1 bind MAPS # Extras (readme files, etc) cp $(>[4]) $(HAIKU_OUTPUT_DIR)/cd/ - xorriso -as mkisofs -v -hfsplus \ - -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot \ - -prep-boot-part $(HAIKU_OUTPUT_DIR)/cd/boot/haikuloader.xcf \ - -r -J -o $(<) $(HAIKU_OUTPUT_DIR)/cd + # Xorriso doesn't have map and some other required tools + # to make bootable PowerPC images + genisoimage -v -hfsplus -map $(MAPS) \ + -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -part -no-desktop \ + -hfs-parms MAX_XTCSIZE=2656248 -hfs-volid Haiku \ + --chrp-boot -r -J -o $(<) $(HAIKU_OUTPUT_DIR)/cd + $(RM) -r $(HAIKU_OUTPUT_DIR)/cd }