hrev52409 adds 2 changesets to branch 'master'
old head: 33c475ecba202fed1c5627fe2f0bd7f71b0deab2
new head: 59bba8b9ecb8e9276bc1f6e71f839b1fe5a3a464
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=59bba8b9ecb8+%5E33c475ecba20
----------------------------------------------------------------------------
2ff03651b7d6: efi: Fix missing gnuefi dependency
Change-Id: Iff3b64e781ebee192b769193808f3ec12af1d1fa
59bba8b9ecb8: build: Make EFI opt-out vs opt-in
Change-Id: I94a5692b2e39e45ff843182f43fa757a0549583c
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 6 deletions(-)
build/jam/images/AnybootImage | 11 +++++------
src/system/boot/platform/efi/Jamfile | 2 ++
############################################################################
Commit: 2ff03651b7d6ff02c368f328c30bf4375bc736d0
URL: https://git.haiku-os.org/haiku/commit/?id=2ff03651b7d6
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Oct 18 02:21:13 2018 UTC
efi: Fix missing gnuefi dependency
Change-Id: Iff3b64e781ebee192b769193808f3ec12af1d1fa
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/efi/Jamfile
b/src/system/boot/platform/efi/Jamfile
index a602de5f5c..f676f889fd 100644
--- a/src/system/boot/platform/efi/Jamfile
+++ b/src/system/boot/platform/efi/Jamfile
@@ -61,5 +61,7 @@ for platform in [ MultiBootSubDirSetup efi ] {
= [ BuildFeatureAttribute gnuefi : libdir : path ] ;
Depends [ FGristFiles $(efi_glue_src) ]
: [ BuildFeatureAttribute gnuefi : libdir ] ;
+ Depends [ FGristFiles $(platform_src) ]
+ : [ BuildFeatureAttribute gnuefi : headers ] ;
}
}
############################################################################
Revision: hrev52409
Commit: 59bba8b9ecb8e9276bc1f6e71f839b1fe5a3a464
URL: https://git.haiku-os.org/haiku/commit/?id=59bba8b9ecb8
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Thu Oct 18 02:21:47 2018 UTC
build: Make EFI opt-out vs opt-in
Change-Id: I94a5692b2e39e45ff843182f43fa757a0549583c
----------------------------------------------------------------------------
diff --git a/build/jam/images/AnybootImage b/build/jam/images/AnybootImage
index c7a4cf753b..ebb3c4aef6 100644
--- a/build/jam/images/AnybootImage
+++ b/build/jam/images/AnybootImage
@@ -41,18 +41,17 @@ BuildMBR $(baseMBR) : $(mbrSource) ;
MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ;
MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ;
-if $(HAIKU_ANYBOOT_UEFI) = 1 {
- Echo "Anyboot is MBR/UEFI hybrid" ;
+if $(HAIKU_ANYBOOT_LEGACY) = 1 {
+ Echo "HAIKU_ANYBOOT_LEGACY defined so anyboot is MBR only" ;
+ BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE)
+ : $(HAIKU_IMAGE_NAME) ;
+} else {
local efiLoader = haiku_loader.efi ;
local efiPartition = esp.image ;
MakeLocate $(efiPartition) ;
BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR) : $(efiPartition) :
$(HAIKU_CD_BOOT_IMAGE)
: $(HAIKU_IMAGE_NAME) ;
-} else {
- Echo "Anyboot is MBR only" ;
- BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR) : $(HAIKU_CD_BOOT_IMAGE)
- : $(HAIKU_IMAGE_NAME) ;
}
# TODO: this one seems to cause the build to fail each other run (caching?)
