From 8dcb4cb9f5df5ed1e743337b8641059c392daf70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sun, 2 Mar 2008 03:23:51 +0000 Subject: [PATCH] Make network support disabled by default for boot floppy, it's not needed and doesn't fit 1.44M. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24199 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FloppyBootImage | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage index 69ad81aa29..34dea38758 100644 --- a/build/jam/FloppyBootImage +++ b/build/jam/FloppyBootImage @@ -14,6 +14,22 @@ if $(INCLUDE_GPL_ADDONS) = 1 { GPL_ONLY = "" ; } +local NET_BOOT = 0 ; + +local BOOT_ADD_ONS_NET ; +if $(NET_BOOT) = 1 { +BOOT_ADD_ONS_NET = +# nbd +# remote_disk +# $(BEOS_ADD_ONS_DRIVERS_NET) +# stack socket +# $(BEOS_NETWORK_DEVICES) +# $(BEOS_NETWORK_DATALINK_PROTOCOLS) +# $(BEOS_NETWORK_PPP) +# $(BEOS_NETWORK_PROTOCOLS) +; +} + BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi config_manager agp_gart ; @@ -44,9 +60,11 @@ if $(TARGET_ARCH) = x86 { # drivers AddDriversToFloppyBootArchive disk scsi : scsi_cd scsi_dsk ; +if $(NET_BOOT) = 1 { #AddDriversToFloppyBootArchive disk virtual : nbd ; AddDriversToFloppyBootArchive disk virtual : remote_disk ; AddDriversToFloppyBootArchive net : $(BEOS_ADD_ONS_DRIVERS_NET) ; +} # kernel AddFilesToFloppyBootArchive beos system : kernel_$(TARGET_ARCH) ; @@ -59,6 +77,7 @@ SEARCH on $(driverSettingsFiles) AddFilesToFloppyBootArchive home config settings kernel drivers : $(driverSettingsFiles) ; +if $(NET_BOOT) = 1 { # add-ons AddFilesToFloppyBootArchive beos system add-ons kernel network : stack socket ; @@ -70,6 +89,7 @@ AddFilesToFloppyBootArchive beos system add-ons kernel network ppp : $(BEOS_NETWORK_PPP) ; AddFilesToFloppyBootArchive beos system add-ons kernel network protocols : $(BEOS_NETWORK_PROTOCOLS) ; +} # boot module links AddBootModuleSymlinksToFloppyBootArchive @@ -80,14 +100,7 @@ AddBootModuleSymlinksToFloppyBootArchive intel session $(PPC_ONLY)openpic $(X86_ONLY)generic_x86 -# nbd - remote_disk - $(BEOS_ADD_ONS_DRIVERS_NET) - stack socket - $(BEOS_NETWORK_DEVICES) - $(BEOS_NETWORK_DATALINK_PROTOCOLS) - $(BEOS_NETWORK_PPP) - $(BEOS_NETWORK_PROTOCOLS) + $(BOOT_ADD_ONS_NET) ;