[haiku-commits] haiku: hrev52609 - build/jam/packages

  • From: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 29 Nov 2018 14:44:03 -0500 (EST)

hrev52609 adds 1 changeset to branch 'master'
old head: 6d2736585e8e6a9f5c201899d1009b045221e5ce
new head: 92bb7e91ed4e4538a82190d313bb980262cc7057
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=92bb7e91ed4e+%5E6d2736585e8e

----------------------------------------------------------------------------

92bb7e91ed4e: Revert "haiku_loader.hpkg: Add each compiled boot target"
  
  This reverts commit 349326db275da7f7f507540ccecb2780ac655fe9.
  
  Makes the system unbootable on my gcc2 BIOS machine.

                             [ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52609
Commit:      92bb7e91ed4e4538a82190d313bb980262cc7057
URL:         https://git.haiku-os.org/haiku/commit/?id=92bb7e91ed4e
Author:      Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date:        Thu Nov 29 19:20:52 2018 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 7 deletions(-)
build/jam/packages/HaikuLoader | 11 ++++-------

----------------------------------------------------------------------------

diff --git a/build/jam/packages/HaikuLoader b/build/jam/packages/HaikuLoader
index 4a35c9a59b..5f048b0a80 100644
--- a/build/jam/packages/HaikuLoader
+++ b/build/jam/packages/HaikuLoader
@@ -1,13 +1,10 @@
 local haikuLoaderPackage = haiku_loader.hpkg ;
 HaikuPackage $(haikuLoaderPackage) ;
 
-# Add compiled boot loaders for architecture
-# NOTE: bios_ia32 *MUST* be first on x86 in the hpkg for the MBR loader.
-# It currently is based on name (b before e)
-local bootTarget ;
-for bootTarget in $(HAIKU_BOOT_TARGETS) {
-       AddFilesToPackage : haiku_loader.$(bootTarget) ;
-}
+
+# boot loader
+AddFilesToPackage : haiku_loader.$(HAIKU_KERNEL_PLATFORM) ;
+
 
 # Force no compression, so the stage one loader can directly execute the boot
 # loader.


Other related posts: