[haiku-commits] Change in haiku[master]: build/jam/ppc: Fix PowerPC boot after hrev53614

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 12 Feb 2020 16:27:51 +0000

From Alex von Gluck IV <kallisti5@xxxxxxxxxxx>:

Alex von Gluck IV has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/2241 ;)


Change subject: build/jam/ppc: Fix PowerPC boot after hrev53614
......................................................................

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
---
M build/jam/ImageRules
1 file changed, 7 insertions(+), 4 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/41/2241/1

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index da37f50..0d208a2 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1618,10 +1618,13 @@
        # 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
 }


--
To view, visit https://review.haiku-os.org/c/haiku/+/2241
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Id71b97796f5004f6ddf6244644c51a5787f9bf8e
Gerrit-Change-Number: 2241
Gerrit-PatchSet: 1
Gerrit-Owner: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: build/jam/ppc: Fix PowerPC boot after hrev53614 - Gerrit