Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues 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 <no-reply+buildbot@haiku-os.org>
Reviewed-by: Jessica Hamilton <jessica.l.hamilton@gmail.com>
This commit is contained in:
Alexander von Gluck IV 2021-11-01 19:23:23 -05:00 committed by Alex von Gluck IV
parent af222f6e31
commit 38eb9fb0eb
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/jam/ImageRules
View File

@ -1649,6 +1649,7 @@ rule BuildCDBootPPCImage image : hfsmaps : elfloader : coffloader : chrpscript
actions BuildCDBootPPCImage1 bind MAPS
{
$(RM) $(<)
mkdir -p $(HAIKU_OUTPUT_DIR)/cd/ppc
mkdir -p $(HAIKU_OUTPUT_DIR)/cd/boot
# CHRP Boot script
@ -1662,9 +1663,10 @@ actions BuildCDBootPPCImage1 bind MAPS
# Xorriso doesn't have map and some other required tools
# 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-parms MAX_XTCSIZE=2656248 -hfs-volid Haiku \
--prep-boot boot/haikuloader.elf \
--chrp-boot -r -J -o $(<) $(HAIKU_OUTPUT_DIR)/cd
$(RM) -r $(HAIKU_OUTPUT_DIR)/cd

5
build/jam/images/CDBootImage
View File

@ -13,7 +13,7 @@ NotFile $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME) ;
# common extra files to put on the boot iso
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 {
local elfloader = boot_loader_openfirmware ;
@ -25,9 +25,6 @@ if $(TARGET_ARCH) = ppc {
# HFS creator and application type mapping for mkisofs
local hfsmaps = hfs.map ;
SEARCH on $(chrpscript) $(hfsmaps) $(extras)
= [ FDirName $(HAIKU_TOP) data boot_cd ] ;
BuildCDBootPPCImage $(HAIKU_CD_BOOT_IMAGE) : $(hfsmaps)
: $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ;
} else {

0
data/boot_cd/README.html → data/boot/extras/README.html
View File

0
data/boot_cd/hfs.map → data/boot/openfirmware/hfs.map
View File

12
data/boot_cd/ofboot.chrp → data/boot/openfirmware/ofboot.chrp
View File

@ -6,6 +6,18 @@ MacRISC MacRISC3 MacRISC4
Haiku for PowerPC
</description>
<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-script>
<icon size=64,64 color-space=3,3,2>