From 100e91926caf03afee1030bcd0d6f6e4f2db1d01 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 28 Feb 2010 18:54:16 +0000 Subject: [PATCH] Adding buildsystem support for the "anyboot" images. They can be built using the haiku-anyboot-image pseudo target. As I'm not too much at home with Jam I'd appreciate any input. Especially for the TODO where removing the MBR using RmTemps seems to cause a failure to get it built again every other time. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35668 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- Jamfile | 1 + build/jam/AnybootImage | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 build/jam/AnybootImage diff --git a/Jamfile b/Jamfile index 128cf2f5d6..c9487b239b 100644 --- a/Jamfile +++ b/Jamfile @@ -191,6 +191,7 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) FloppyBootImage ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootImage ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootPPCImage ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuCD ] ; +include [ FDirName $(HAIKU_BUILD_RULES_DIR) AnybootImage ] ; # Check whether all requested optional packages do actually exist. local package ; diff --git a/build/jam/AnybootImage b/build/jam/AnybootImage new file mode 100644 index 0000000000..d25f3ce0d7 --- /dev/null +++ b/build/jam/AnybootImage @@ -0,0 +1,45 @@ +rule BuildAnybootMBR binary : source { + MBR_SOURCE on $(binary) = $(source) ; + + BuildAnybootMBR1 $(binary) ; +} + +actions BuildAnybootMBR1 { + $(RM) $(1) + $(TARGET_CC) $(MBR_SOURCE) -o $(1) -nostdlib -Xlinker --oformat=binary -Xlinker -S -Xlinker -N -Xlinker "-e start" -Xlinker "-Ttext=0x600" +} + +local baseMBR = base_mbr.bin ; +local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.S ] ; + +BuildAnybootMBR $(baseMBR) : $(mbrSource) ; + +MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ; + + +rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile { + local anyboot = anyboot ; + + Depends $(anybootImage) : $(anyboot) ; + Depends $(anybootImage) : $(isoPart) ; + Depends $(anybootImage) : $(mbrPart) ; + Depends $(anybootImage) : $(imageFile) ; + + BuildAnybootImage1 $(anybootImage) : $(anyboot) $(isoPart) $(mbrPart) $(imageFile) ; +} + +actions BuildAnybootImage1 { + $(2[1]) $(1) $(2[2]) $(2[3]) $(2[4]) +} + +HAIKU_ANYBOOT_IMAGE = haiku-anyboot.image ; +MakeLocate $(HAIKU_ANYBOOT_IMAGE) : $(HAIKU_OUTPUT_DIR) ; + +BuildAnybootImage $(HAIKU_ANYBOOT_IMAGE) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE) + : $(HAIKU_IMAGE_NAME) ; + +# TODO: this one seems to cause the build to fail each other run (caching?) +#RmTemps $(HAIKU_ANYBOOT_IMAGE) : $(baseMBR) ; + +NotFile haiku-anyboot-image ; +Depends haiku-anyboot-image : $(HAIKU_ANYBOOT_IMAGE) ;