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

Even when making temporary hacks, please still follow

Browse Source 
the coding style! :-)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30513 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-04-30 15:45:19 +00:00
parent bb048d75be
commit 1ce7a6b540
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HaikuImage
+7 -5
View File
@@ -150,8 +150,8 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
$(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm $(X86_ONLY)attansic_l2 $(X86_ONLY)ar81xx usb_ecm
; ;
#SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ; #SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa $(IDE_ONLY)ide $(ATA_ONLY)ata scsi SYSTEM_ADD_ONS_BUS_MANAGERS = $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
config_manager agp_gart usb firewire $(X86_ONLY)acpi $(IDE_ONLY)ide scsi config_manager agp_gart usb firewire $(X86_ONLY)acpi
; ;
SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
write_overlay $(GPL_ONLY)ntfs $(GPL_ONLY)reiserfs ; write_overlay $(GPL_ONLY)ntfs $(GPL_ONLY)reiserfs ;
@@ -181,7 +181,8 @@ AddFilesToHaikuImage system add-ons kernel debugger
AddFilesToHaikuImage system add-ons kernel file_systems AddFilesToHaikuImage system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToHaikuImage system add-ons kernel generic AddFilesToHaikuImage system add-ons kernel generic
: dpc $(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool mpu401 scsi_periph ; : $(ATA_ONLY)ata_adapter dpc $(IDE_ONLY)ide_adapter locked_pool mpu401
scsi_periph ;
AddFilesToHaikuImage system add-ons kernel partitioning_systems AddFilesToHaikuImage system add-ons kernel partitioning_systems
: intel session ; : intel session ;
AddFilesToHaikuImage system add-ons kernel interrupt_controllers AddFilesToHaikuImage system add-ons kernel interrupt_controllers
@@ -424,9 +425,10 @@ AddFilesToHaikuImage system : haiku_loader ;
# boot module links # boot module links
AddBootModuleSymlinksToHaikuImage AddBootModuleSymlinksToHaikuImage
$(X86_ONLY)acpi pci $(X86_ONLY)isa config_manager $(IDE_ONLY)ide $(ATA_ONLY)ata scsi usb $(X86_ONLY)acpi $(ATA_ONLY)ata pci $(X86_ONLY)isa config_manager
$(IDE_ONLY)ide scsi usb
$(PPC_ONLY)openpic $(PPC_ONLY)openpic
$(IDE_ONLY)ide_adapter $(ATA_ONLY)ata_adapter locked_pool scsi_periph $(ATA_ONLY)ata_adapter $(IDE_ONLY)ide_adapter locked_pool scsi_periph
ahci generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa ahci generic_ide_pci it8211 legacy_sata silicon_image_3112 $(X86_ONLY)ide_isa
<usb>uhci <usb>ohci <usb>ehci <usb>uhci <usb>ohci <usb>ehci
scsi_cd scsi_disk usb_disk scsi_cd scsi_disk usb_disk