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

build: Drop specalized haiku-boot-cd-ppc target

Browse Source 
* Now generated via haiku-boot-cd when target ppc

Change-Id: I1d4e83c4d95ebc18b0dab28ffb2af03db5dc9d1d
This commit is contained in:
Alexander von Gluck IV 2018-07-09 09:44:43 -05:00
parent 4c43ed243f
commit 18e7b99797
4 changed files with 18 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jamfile
View File

@ -116,7 +116,6 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images NetBootArchive ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images FloppyBootImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootPPCImage ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuCD ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) images AnybootImage ] ;

10
build/jam/BuildSetup
View File

@ -56,16 +56,6 @@ HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME)
HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME)
= system ;
# boot CD for PPC image
HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME = haiku-boot-cd-ppc-container ;
HAIKU_CONTAINER_GRIST on $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME)
= CDBootPPCImage ;
# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME)
= HAIKU_CD_BOOT_PPC_IMAGE_INSTALL_TARGETS ;
HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_CD_BOOT_PPC_IMAGE_CONTAINER_NAME)
= system ;
# Haiku image/install defaults
HAIKU_DEFAULT_IMAGE_NAME = haiku.image ;
HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;

23
build/jam/images/CDBootImage
View File

@ -11,14 +11,27 @@ MakeLocate $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_OUTPUT_DIR) ;
# the pseudo target all archive contents is attached to
NotFile $(HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME) ;
# extra files to put on the boot iso
# common extra files to put on the boot iso
local extras = README.html ;
SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : $(extras) ;
if $(TARGET_ARCH) = ppc {
local elfloader = boot_loader_openfirmware ;
local coffloader = boot_loader_openfirmware_coff ;
# OpenFirmware / Mac boot support files:
# CHRP script
local chrpscript = ofboot.chrp ;
# 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 {
SEARCH on $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) : $(extras) ;
}
NotFile haiku-boot-cd ;
Depends haiku-boot-cd : $(HAIKU_CD_BOOT_IMAGE) ;

38
build/jam/images/CDBootPPCImage
View File

@ -1,38 +0,0 @@
# This file defines what ends up in the CD boot image and it executes the
# rules building the image.
#HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ;
#MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
# CD image target
HAIKU_CD_BOOT_PPC_IMAGE = haiku-boot-cd-ppc.iso ;
MakeLocate $(HAIKU_CD_BOOT_PPC_IMAGE) : $(HAIKU_OUTPUT_DIR) ;
# the pseudo target all archive contents is attached to
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 chrpscript = ofboot.chrp ;
# HFS creator and application type mapping for mkisofs
local hfsmaps = hfs.map ;
# extra files to put on the boot iso
local extras = README.html ;
SEARCH on $(chrpscript) $(hfsmaps) $(extras) = [ FDirName $(HAIKU_TOP) data boot_cd ] ;
BuildCDBootPPCImage $(HAIKU_CD_BOOT_PPC_IMAGE) : $(hfsmaps) : $(elfloader) : $(coffloader) : $(chrpscript) : $(extras) ;
NotFile haiku-boot-cd-ppc ;
Depends haiku-boot-cd-ppc : $(HAIKU_CD_BOOT_PPC_IMAGE) ;