i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

boot/ppc: Cleanup paths, use hfs vs hfsplus

Browse Source 
* Move assets to new boot directory
* -hfsplus not valid anymore on cdrtools 3.02
* Throw down some forth I saw in an *old* fedora 12
  chrp script.  If we ever target ppc64 it might be
  handy someday. The text output also lets you know
  the cd booted successfully.

Change-Id: I169d887fe8373de1719b98305d01b714f6f6bcbe
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4681
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: Jessica Hamilton <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2021-11-03 13:58:48 +00:00
committed by Alex von Gluck IV
parent af222f6e31
commit 38eb9fb0eb
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+3 -1
View File
@@ -1649,6 +1649,7 @@ rule BuildCDBootPPCImage image : hfsmaps : elfloader : coffloader : chrpscript
actions BuildCDBootPPCImage1 bind MAPS actions BuildCDBootPPCImage1 bind MAPS
{ {
$(RM) $(<) $(RM) $(<)
mkdir -p $(HAIKU_OUTPUT_DIR)/cd/ppc mkdir -p $(HAIKU_OUTPUT_DIR)/cd/ppc
mkdir -p $(HAIKU_OUTPUT_DIR)/cd/boot mkdir -p $(HAIKU_OUTPUT_DIR)/cd/boot
# CHRP Boot script # CHRP Boot script
@@ -1662,9 +1663,10 @@ actions BuildCDBootPPCImage1 bind MAPS
# Xorriso doesn't have map and some other required tools # Xorriso doesn't have map and some other required tools
# to make bootable PowerPC images # to make bootable PowerPC images
genisoimage -v -hfsplus -map $(MAPS) \ genisoimage -v -hfs -map $(MAPS) \
-hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -part -no-desktop \ -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -part -no-desktop \
-hfs-parms MAX_XTCSIZE=2656248 -hfs-volid Haiku \ -hfs-parms MAX_XTCSIZE=2656248 -hfs-volid Haiku \
--prep-boot boot/haikuloader.elf \
--chrp-boot -r -J -o $(<) $(HAIKU_OUTPUT_DIR)/cd --chrp-boot -r -J -o $(<) $(HAIKU_OUTPUT_DIR)/cd
$(RM) -r $(HAIKU_OUTPUT_DIR)/cd $(RM) -r $(HAIKU_OUTPUT_DIR)/cd
build/jam/images/CDBootImage
+1 -4
View File
@@ -13,7 +13,7 @@ NotFile $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME) ;
# common extra files to put on the boot iso # common extra files to put on the boot iso
local extras = README.html ; local extras = README.html ;
SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ; SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot extras ] ;
if $(TARGET_ARCH) = ppc { if $(TARGET_ARCH) = ppc {
local elfloader = boot_loader_openfirmware ; local elfloader = boot_loader_openfirmware ;
@@ -25,9 +25,6 @@ if $(TARGET_ARCH) = ppc {
# HFS creator and application type mapping for mkisofs # HFS creator and application type mapping for mkisofs
local hfsmaps = hfs.map ; local hfsmaps = hfs.map ;
SEARCH on $(chrpscript) $(hfsmaps) $(extras)
= [ FDirName $(HAIKU_TOP) data boot_cd ] ;
BuildCDBootPPCImage $(HAIKU_CD_BOOT_IMAGE) : $(hfsmaps) BuildCDBootPPCImage $(HAIKU_CD_BOOT_IMAGE) : $(hfsmaps)
: $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ; : $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ;
} else { } else {
data/boot_cd/README.html → data/boot/extras/README.html
View File
data/boot_cd/hfs.map → data/boot/openfirmware/hfs.map
View File
data/boot_cd/ofboot.chrp → data/boot/openfirmware/ofboot.chrp
+12
View File
@@ -6,6 +6,18 @@ MacRISC MacRISC3 MacRISC4
Haiku for PowerPC Haiku for PowerPC
</description> </description>
<boot-script> <boot-script>
" screen" output
load-base release-load-area
" /cpus/@0" find-package if
" 64-bit" rot get-package-property 0= if
2drop
." Booting Haiku for PowerPC (64-bit)..."
" boot cd:,\\haikuloader.elf" eval
else
." Booting Haiku for PowerPC (32-bit)..."
" boot cd:,\\haikuloader.elf" eval
then
then
boot cd:,\\haikuloader.elf boot cd:,\\haikuloader.elf
</boot-script> </boot-script>
<icon size=64,64 color-space=3,3,2> <icon size=64,64 color-space=3,3,2>