i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix floppy/CD build, though it's untested; not sure it still works with the device manager changes...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26019 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2008-06-19 12:39:41 +00:00
parent 2f031c27c5
commit 2ccfe98f46
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FloppyBootImage
+11 -7
View File
@@ -31,7 +31,7 @@ BOOT_ADD_ONS_NET =
} }
BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi
config_manager agp_gart config_manager agp_gart usb
; ;
BEOS_ADD_ONS_FILE_SYSTEMS = bfs ; BEOS_ADD_ONS_FILE_SYSTEMS = bfs ;
#cdda fat googlefs iso9660 nfs ; #cdda fat googlefs iso9660 nfs ;
@@ -43,23 +43,26 @@ AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers
AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart
: $(X86_ONLY)<agp_gart>intel ; : $(X86_ONLY)<agp_gart>intel ;
AddFilesToFloppyBootArchive beos system add-ons kernel busses ide AddFilesToFloppyBootArchive beos system add-ons kernel busses ide
: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ; : ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ;
AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ; AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ;
AddFilesToFloppyBootArchive beos system add-ons kernel file_systems AddFilesToFloppyBootArchive beos system add-ons kernel file_systems
: $(BEOS_ADD_ONS_FILE_SYSTEMS) ; : $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToFloppyBootArchive beos system add-ons kernel generic AddFilesToFloppyBootArchive beos system add-ons kernel generic
: block_io fast_log ide_adapter locked_pool scsi_periph ; : block_io ide_adapter locked_pool scsi_periph ;
AddFilesToFloppyBootArchive beos system add-ons kernel partitioning_systems AddFilesToFloppyBootArchive beos system add-ons kernel partitioning_systems
: intel session ; : intel session ;
AddFilesToFloppyBootArchive beos system add-ons kernel interrupt_controllers AddFilesToFloppyBootArchive beos system add-ons kernel interrupt_controllers
: $(PPC_ONLY)openpic ; : $(PPC_ONLY)openpic ;
AddFilesToFloppyBootArchive beos system add-ons kernel busses usb
: <usb>uhci <usb>ohci <usb>ehci ;
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 {
AddFilesToFloppyBootArchive beos system add-ons kernel cpu : generic_x86 ; AddFilesToFloppyBootArchive beos system add-ons kernel cpu : generic_x86 ;
} }
# drivers # drivers
AddDriversToFloppyBootArchive disk scsi : scsi_cd scsi_dsk ; AddDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk usb_disk ;
AddDriversToFloppyBootArchive disk usb : usb_disk ;
if $(NET_BOOT) = 1 { if $(NET_BOOT) = 1 {
#AddDriversToFloppyBootArchive disk virtual : nbd ; #AddDriversToFloppyBootArchive disk virtual : nbd ;
AddDriversToFloppyBootArchive disk virtual : remote_disk ; AddDriversToFloppyBootArchive disk virtual : remote_disk ;
@@ -95,10 +98,11 @@ AddFilesToFloppyBootArchive beos system add-ons kernel network protocols
AddBootModuleSymlinksToFloppyBootArchive AddBootModuleSymlinksToFloppyBootArchive
$(BEOS_ADD_ONS_BUS_MANAGERS) $(BEOS_ADD_ONS_BUS_MANAGERS)
$(PPC_ONLY)openpic $(PPC_ONLY)openpic
block_io fast_log ide_adapter locked_pool scsi_periph block_io ide_adapter locked_pool scsi_periph
$(X86_ONLY)generic_x86 $(X86_ONLY)generic_x86
ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211
scsi_cd scsi_dsk <usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk
intel session intel session
$(BEOS_ADD_ONS_FILE_SYSTEMS) $(BEOS_ADD_ONS_FILE_SYSTEMS)
$(BOOT_ADD_ONS_NET) $(BOOT_ADD_ONS_NET)