From 4bc885a2db7c4dbe65face16a4f1c9cd4e651306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 14 Nov 2008 20:34:52 +0000 Subject: [PATCH] Hopefully fixed floppy and netboot images, please test. It's getting annoying having to maintain so many identical driver lists... maybe those should be factored out in some way... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28654 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FloppyBootImage | 6 ++++-- build/jam/NetBootArchive | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage index 85cc847800..edd65e5eef 100644 --- a/build/jam/FloppyBootImage +++ b/build/jam/FloppyBootImage @@ -43,7 +43,9 @@ AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart : $(X86_ONLY)intel ; AddFilesToFloppyBootArchive beos system add-ons kernel busses ide - : ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ; + : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ; +AddFilesToFloppyBootArchive beos system add-ons kernel busses scsi + : ahci ; AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ; AddFilesToFloppyBootArchive beos system add-ons kernel file_systems : $(BEOS_ADD_ONS_FILE_SYSTEMS) ; @@ -61,7 +63,7 @@ if $(TARGET_ARCH) = x86 { } # drivers -AddDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; +AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; AddDriversToFloppyBootArchive disk usb : usb_disk ; if $(NET_BOOT) = 1 { #AddDriversToFloppyBootArchive disk virtual : nbd ; diff --git a/build/jam/NetBootArchive b/build/jam/NetBootArchive index d7f9f66aef..13169fb025 100644 --- a/build/jam/NetBootArchive +++ b/build/jam/NetBootArchive @@ -37,7 +37,9 @@ AddFilesToNetBootArchive beos system add-ons kernel bus_managers AddFilesToNetBootArchive beos system add-ons kernel busses agp_gart : $(X86_ONLY)intel ; AddFilesToNetBootArchive beos system add-ons kernel busses ide - : ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ; + : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ; +AddFilesToNetBootArchive beos system add-ons kernel busses scsi + : ahci ; AddFilesToNetBootArchive beos system add-ons kernel console : vga_text ; AddFilesToNetBootArchive beos system add-ons kernel file_systems : $(BEOS_ADD_ONS_FILE_SYSTEMS) ; @@ -53,7 +55,7 @@ if $(TARGET_ARCH) = x86 { } # drivers -AddDriversToNetBootArchive disk scsi : scsi_cd scsi_disk ; +AddNewDriversToNetBootArchive disk scsi : scsi_cd scsi_disk ; #AddDriversToNetBootArchive disk virtual : nbd ; AddDriversToNetBootArchive disk virtual : remote_disk ; AddDriversToNetBootArchive net : $(BEOS_ADD_ONS_DRIVERS_NET) ;