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

Add COFF loader to ppc ISO.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28612 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2008-11-11 19:22:16 +00:00
parent 11a47de374
commit 47577f1cba
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/CDBootPPCImage
+13 -8
View File
@@ -11,20 +11,25 @@ MakeLocate $(HAIKU_CD_BOOT_PPC_IMAGE) : $(HAIKU_OUTPUT_DIR) ;
# the pseudo target all archive contents is attached to # the pseudo target all archive contents is attached to
NotFile $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME) ; NotFile $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME) ;
local elfloader = boot_loader_openfirmware ;
local coffloader = boot_loader_openfirmware_coff ;
# OpenFirmware / Mac boot support files:
# CHRP script
local chrpboot = ofboot.b ;
# HFS creator and application type mapping for mkisofs
local hfsmaps = hfs.map ;
# extra files to put on the boot iso # 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 ] ;
local chrpboot = ofboot.b ; SEARCH on $(chrpboot) $(hfsmaps) $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
SEARCH on $(chrpboot) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
local hfsmaps = hfs.map ;
SEARCH on $(hfsmaps) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
BuildCDBootPPCImage $(HAIKU_CD_BOOT_PPC_IMAGE) : $(hfsmaps) : $(elfloader) : $(coffloader) : $(chrpboot) : $(extras) ;
BuildCDBootPPCImage $(HAIKU_CD_BOOT_PPC_IMAGE) : $(hfsmaps) : boot_loader_openfirmware : $(chrpboot) : $(extras) ;
NotFile haiku-boot-cd-ppc ; NotFile haiku-boot-cd-ppc ;
build/jam/ImageRules
+7 -5
View File
@@ -1068,15 +1068,16 @@ actions BuildCDBootImage1
#pragma mark - CD Boot PPC Image rules #pragma mark - CD Boot PPC Image rules
rule BuildCDBootPPCImage image : hfsmaps : bootloader : chrpscript : extrafiles rule BuildCDBootPPCImage image : hfsmaps : elfloader : coffloader : chrpscript : extrafiles
{ {
Depends $(image) : $(bootloader) ; Depends $(image) : $(elfloader) ;
Depends $(image) : $(coffloader) ;
Depends $(image) : $(chrpscript) ; Depends $(image) : $(chrpscript) ;
Depends $(image) : $(extrafiles) ; Depends $(image) : $(extrafiles) ;
Depends $(image) : $(hfsmaps) ; Depends $(image) : $(hfsmaps) ;
MAPS on $(image) = $(hfsmaps) ; MAPS on $(image) = $(hfsmaps) ;
BuildCDBootPPCImage1 $(image) : $(bootloader) $(chrpscript) $(extrafiles) ; BuildCDBootPPCImage1 $(image) : $(elfloaders) $(coffloader) $(chrpscript) $(extrafiles) ;
} }
actions BuildCDBootPPCImage1 bind MAPS actions BuildCDBootPPCImage1 bind MAPS
@@ -1084,8 +1085,9 @@ actions BuildCDBootPPCImage1 bind MAPS
$(RM) $(<) $(RM) $(<)
mkdir -p $(HAIKU_OUTPUT_DIR)/cd/ppc mkdir -p $(HAIKU_OUTPUT_DIR)/cd/ppc
cp $(>) $(HAIKU_OUTPUT_DIR)/cd/ppc/ cp $(>) $(HAIKU_OUTPUT_DIR)/cd/ppc/
cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/ppc/bootinfo.txt cp $(>[3]) $(HAIKU_OUTPUT_DIR)/cd/ppc/bootinfo.txt
cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.elf cp $(>[1]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.elf
cp $(>[2]) $(HAIKU_OUTPUT_DIR)/cd/ofwboot.xcf
#mkisofs -r -U -chrp-boot -V bootimg -o $(<) $(>[1]) $(>[2-]) #mkisofs -r -U -chrp-boot -V bootimg -o $(<) $(>[1]) $(>[2-])
#mkisofs -hfs -r -U -chrp-boot -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -prep-boot $(>[1]:D=) -o $(<) $(>[1]) $(>[2-]) #mkisofs -hfs -r -U -chrp-boot -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -prep-boot $(>[1]:D=) -o $(<) $(>[1]) $(>[2-])
#mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -r -o $(<) $(>[1]) $(>[2-]) $(HAIKU_OUTPUT_DIR)/cd #mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -r -o $(<) $(>[1]) $(>[2-]) $(HAIKU_OUTPUT_DIR)/cd
@@ -1093,7 +1095,7 @@ actions BuildCDBootPPCImage1 bind MAPS
#mkisofs -r -U -V bootimg -prep-boot $(>[1]:D=) -o $(<) $(>[1]) $(>[2-]) #mkisofs -r -U -V bootimg -prep-boot $(>[1]:D=) -o $(<) $(>[1]) $(>[2-])
# $(HAIKU_OUTPUT_DIR)/cd # $(HAIKU_OUTPUT_DIR)/cd
# -hfs -hfs-bless . # -hfs -hfs-bless .
mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot ppc/$(>[1]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd mkisofs -v -hfs -part -map $(MAPS) -no-desktop -hfs-volid bootimg -V bootimg -hfs-bless $(HAIKU_OUTPUT_DIR)/cd/ppc -prep-boot ppc/$(>[2]:D=) -r -o $(<) $(HAIKU_OUTPUT_DIR)/cd
#$(RM) -R $(HAIKU_OUTPUT_DIR)/cd #$(RM) -R $(HAIKU_OUTPUT_DIR)/cd
} }