[haiku-commits] haiku: hrev51543 - src/system/boot/loader

  • From: waddlesplash@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 13 Nov 2017 21:20:08 +0100 (CET)

hrev51543 adds 1 changeset to branch 'master'
old head: ec0a48e837ea566f3c52ff2ce957a990063d5da3
new head: 304f594da1ddb60ca968928006ff548047bf7295
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=304f594da1dd+%5Eec0a48e837ea

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

304f594da1dd: De-wire net_stack_cleanup from boot/loader/main.cpp
  
  This reverts commit 2960780faa7e9c2e5e7a80cb8925be5ee59ae5ef.
  Sorry for the noise; I thought I'd run a compile but apparently it was
  only a partial one.
  
  It seems that the netboot core is linked into the main bootloader
  no matter the build configuration, which means that since this one
  function was called, the linker tried to resolve all the other symbols
  from that static library. Which of course failed.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

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

Revision:    hrev51543
Commit:      304f594da1ddb60ca968928006ff548047bf7295
URL:         http://cgit.haiku-os.org/haiku/commit/?id=304f594da1dd
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Mon Nov 13 20:17:45 2017 UTC

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

1 file changed, 2 deletions(-)
src/system/boot/loader/main.cpp | 2 --

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

diff --git a/src/system/boot/loader/main.cpp b/src/system/boot/loader/main.cpp
index c7ae998..bb7a063 100644
--- a/src/system/boot/loader/main.cpp
+++ b/src/system/boot/loader/main.cpp
@@ -14,7 +14,6 @@
 #include <boot/heap.h>
 #include <boot/PathBlacklist.h>
 #include <boot/stdio.h>
-#include <boot/net/NetStack.h>
 
 #include "file_systems/packagefs/packagefs.h"
 
@@ -146,7 +145,6 @@ main(stage2_args *args)
                        gKernelArgs.boot_volume = buffer;
                        gKernelArgs.boot_volume_size = 
gBootVolume.ContentSize();
 
-                       net_stack_cleanup();
                        // ToDo: cleanup, heap_release() etc.
                        heap_print_statistics();
                        platform_start_kernel();


Other related posts:

  • » [haiku-commits] haiku: hrev51543 - src/system/boot/loader - waddlesplash