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

EFI: Fix some mis-located files

Browse Source 
These were output to the root of the generated directory. There should
be nothing there except the final Haiku image.

Fixes #16750.

Change-Id: I132de939c70197c3f7cc306ac371965a0b7f38b3
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5346
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
PulkoMandy 2022-05-29 10:48:05 +02:00 committed by waddlesplash
parent d5f2742d1f
commit 54036160f5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/images/AnybootImage
View File

@ -50,7 +50,7 @@ for platform in [ MultiBootSubDirSetup ] {
if $(TARGET_BOOT_PLATFORM) = efi {
local efiLoader = haiku_loader.efi ;
local efiPartition = esp.image ;
MakeLocate $(efiPartition) ;
MakeLocateDebug $(efiPartition) : system boot ;
BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR)
: $(efiPartition) : $(HAIKU_CD_BOOT_IMAGE)

2
build/jam/images/CDBootImage
View File

@ -35,7 +35,7 @@ if $(TARGET_ARCH) = ppc {
if $(TARGET_BOOT_PLATFORM) = efi {
local efiLoader = haiku_loader.efi ;
local efiPartition = esp.image ;
MakeLocate $(efiPartition) : $(HAIKU_OUTPUT_DIR) ;
MakeLocateDebug $(efiPartition) : system boot ;
BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY)

2
src/system/boot/Jamfile
View File

@ -348,7 +348,7 @@ for platform in [ MultiBootSubDirSetup ] {
# efi loader needs to be shared.
if $(TARGET_BOOT_PLATFORM) = efi {
ldflags += -shared ;
ldflags += -Map=$(HAIKU_OUTPUT_DIR)/efi.map ;
ldflags += -Map=$(TARGET_DEBUG_$(DEBUG)_LOCATE_TARGET)/efi.map ;
}
if $(TARGET_BOOT_PLATFORM) = riscv {