[haiku-commits] haiku: hrev45741 - data/boot_cd build/jam

From: kallisti5@xxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 5 Jun 2013 10:25:41 +0200 (CEST)
hrev45741 adds 1 changeset to branch 'master'
old head: 1072a5e7774b71f87b7d364ba9d1dfff9eb98ae6
new head: 67b2c0fee38f3c657ff7fa81fdb5ef27235e30c2
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=67b2c0f+%5E1072a5e

----------------------------------------------------------------------------

67b2c0f: PowerPC: Transition back to CHRP script.
  
  * After examining MacOS toolbox roms, I think i've got
    this nailed down. The MacOS Toolbox rom contains chrp
    code at the top and binary code at the bottom.
  * The Raw format for the chrp seemed to cause issues with the
    OpenFirmware boot process on some systems.  NetBSD uses a '-'
    file type.
  * The format of the chrp seems a lot more sensitive across machines
    than described. Ensure our returns and spaces are even.
  * Booting with the 'c' key is still working on my older OpenFirmware
    machine with the chrp script. The bitmap logo is a half black, half
    white box.
  * I removed the &device; alias for now for troubleshooing. It also may
    of been causing compatibility issues. More testing is needed.

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev45741
Commit:      67b2c0fee38f3c657ff7fa81fdb5ef27235e30c2
URL:         http://cgit.haiku-os.org/haiku/commit/?id=67b2c0f
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Wed Jun  5 08:24:42 2013 UTC

----------------------------------------------------------------------------

3 files changed, 25 insertions(+), 15 deletions(-)
build/jam/ImageRules     | 13 ++++++-------
data/boot_cd/hfs.map     |  6 +++---
data/boot_cd/ofboot.chrp | 21 ++++++++++++++++-----

----------------------------------------------------------------------------

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index e1a395f..dea629b 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1480,21 +1480,20 @@ actions BuildCDBootPPCImage1 bind MAPS
        mkdir -p $(HAIKU_OUTPUT_DIR)/cd/boot
        # CHRP Boot script
        cp $(>[3]) $(HAIKU_OUTPUT_DIR)/cd/ppc/bootinfo.txt
-       # Haiku Bootloaders (Old World Mac + PReP partition)
-       cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.xcf
-       # Haiku Bootloader (New World)
-       cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.elf
-       cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/boot/bootloader.b
+       cp $(>[3]) $(HAIKU_OUTPUT_DIR)/cd/boot/boot.chrp
+       # Haiku Bootloaders
+       cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/boot/haikuloader.xcf
+       cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/boot/haikuloader.elf
        # Extras (readme files, etc)
        cp $(>[4]) $(HAIKU_OUTPUT_DIR)/cd/
 
        mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
                -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -prep-boot \
-               ofwboot.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd \
+               boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd \
        || \
        genisoimage -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg \
                -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/boot -prep-boot \
-               ofwboot.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
+               boot/haikuloader.xcf -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
        $(RM) -R $(HAIKU_OUTPUT_DIR)/cd
 }
 
diff --git a/data/boot_cd/hfs.map b/data/boot_cd/hfs.map
index 6d6305c..826a2d2 100644
--- a/data/boot_cd/hfs.map
+++ b/data/boot_cd/hfs.map
@@ -2,9 +2,9 @@
 # from treating everything like a text file (ugly!)
 #
 # EXTN                   XLate   CREATOR TYPE    Comment
-.b                       Raw     'UNIX'  'tbxi'  "Macintosh Toolbox ROM file"
-.chrp                    Raw     'chrp'  'tbxi'  "Macintosh CHRP script"
-.elf                     Raw     'UNIX'  'boot'  "Bootstrap"
+.chrp                    -       'chrp'  'tbxi'  "Macintosh Toolbox ROM file"
+.elf                     Raw     'UNIX'  'boot'  "ELF Binary"
+.xcf                     Raw     'UNIX'  'boot'  "XCOFF Binary"
 .htm                     Ascii   'MOSS'  'TEXT'  "HTML File"
 .html                    Ascii   'MOSS'  'TEXT'  "HTML File"
 .txt                     Ascii   'ttxt'  'TEXT'  "Text File"
diff --git a/data/boot_cd/ofboot.chrp b/data/boot_cd/ofboot.chrp
index ec0f4be..81ed840 100644
--- a/data/boot_cd/ofboot.chrp
+++ b/data/boot_cd/ofboot.chrp
@@ -1,8 +1,16 @@
-<chrp-boot> <description>Haiku</description>
-<os-name>Haiku</os-name> 
-<boot-script>boot &device;:\\bootloader.b</boot-script>
+<chrp-boot>
+<compatible>
+MacRISC
+</compatible>
+<description>
+Haiku for PowerPC
+</description>
+<boot-script>
+boot cd:,\\haikuloader.elf
+</boot-script>
 <icon size=64,64 color-space=3,3,2>
-<bitmap> FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
+<bitmap>
+FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
 FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF
@@ -166,4 +174,7 @@ FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00 00 00 00 00 00 
00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-00 00 00 00 00 00 </bitmap> </icon> </chrp-boot>
+00 00 00 00 00 00
+</bitmap>
+</icon>
+</chrp-boot>
[haiku-commits] haiku: hrev45741 - data/boot_cd build/jam

Other related posts:
