From e78f5dd3835ca95663763b1b0934817c1ce819e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 3 Apr 2009 09:42:58 +0000 Subject: [PATCH] * Updated to the relocated/renamed beos/system directory. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29880 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FloppyBootImage | 71 +++++++++++++++++++------------------- build/jam/NetBootArchive | 72 +++++++++++++++++++-------------------- 2 files changed, 72 insertions(+), 71 deletions(-) diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage index 392e9b427d..8137e07a31 100644 --- a/build/jam/FloppyBootImage +++ b/build/jam/FloppyBootImage @@ -18,48 +18,48 @@ local NET_BOOT = 0 ; local BOOT_ADD_ONS_NET ; if $(NET_BOOT) = 1 { -BOOT_ADD_ONS_NET = +BOOT_ADD_ONS_NET = # nbd # remote_disk -# $(BEOS_ADD_ONS_DRIVERS_NET) +# $(SYSTEM_ADD_ONS_DRIVERS_NET) # stack socket -# $(BEOS_NETWORK_DEVICES) -# $(BEOS_NETWORK_DATALINK_PROTOCOLS) -# $(BEOS_NETWORK_PPP) -# $(BEOS_NETWORK_PROTOCOLS) +# $(SYSTEM_NETWORK_DEVICES) +# $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) +# $(SYSTEM_NETWORK_PPP) +# $(SYSTEM_NETWORK_PROTOCOLS) ; } -BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi +SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi config_manager agp_gart usb ; -BEOS_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; +SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs iso9660 attribute_overlay write_overlay ; #cdda fat googlefs nfs ; # modules -AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers - : $(BEOS_ADD_ONS_BUS_MANAGERS) ; -AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart +AddFilesToFloppyBootArchive system add-ons kernel bus_managers + : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; +AddFilesToFloppyBootArchive system add-ons kernel busses agp_gart : $(X86_ONLY)intel ; -AddFilesToFloppyBootArchive beos system add-ons kernel busses ide +AddFilesToFloppyBootArchive system add-ons kernel busses ide : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ; -AddFilesToFloppyBootArchive beos system add-ons kernel busses scsi +AddFilesToFloppyBootArchive 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) ; -AddFilesToFloppyBootArchive beos system add-ons kernel generic +AddFilesToFloppyBootArchive system add-ons kernel console : vga_text ; +AddFilesToFloppyBootArchive system add-ons kernel file_systems + : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; +AddFilesToFloppyBootArchive system add-ons kernel generic : ide_adapter locked_pool scsi_periph ; -AddFilesToFloppyBootArchive beos system add-ons kernel partitioning_systems +AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems : intel session ; -AddFilesToFloppyBootArchive beos system add-ons kernel interrupt_controllers +AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers : $(PPC_ONLY)openpic ; -AddFilesToFloppyBootArchive beos system add-ons kernel busses usb +AddFilesToFloppyBootArchive system add-ons kernel busses usb : uhci ohci ehci ; if $(TARGET_ARCH) = x86 { - AddFilesToFloppyBootArchive beos system add-ons kernel cpu : generic_x86 ; + AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ; } # drivers @@ -68,11 +68,11 @@ AddDriversToFloppyBootArchive disk usb : usb_disk ; if $(NET_BOOT) = 1 { #AddDriversToFloppyBootArchive disk virtual : nbd ; AddDriversToFloppyBootArchive disk virtual : remote_disk ; -AddDriversToFloppyBootArchive net : $(BEOS_ADD_ONS_DRIVERS_NET) ; +AddDriversToFloppyBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ; } # kernel -AddFilesToFloppyBootArchive beos system : kernel_$(TARGET_ARCH) ; +AddFilesToFloppyBootArchive system : kernel_$(TARGET_ARCH) ; # scripts and data files @@ -84,21 +84,21 @@ AddFilesToFloppyBootArchive home config settings kernel drivers if $(NET_BOOT) = 1 { # add-ons -AddFilesToFloppyBootArchive beos system add-ons kernel network +AddFilesToFloppyBootArchive system add-ons kernel network : stack socket ; -AddFilesToFloppyBootArchive beos system add-ons kernel network devices - : $(BEOS_NETWORK_DEVICES) ; -AddFilesToFloppyBootArchive beos system add-ons kernel network datalink_protocols - : $(BEOS_NETWORK_DATALINK_PROTOCOLS) ; -AddFilesToFloppyBootArchive beos system add-ons kernel network ppp - : $(BEOS_NETWORK_PPP) ; -AddFilesToFloppyBootArchive beos system add-ons kernel network protocols - : $(BEOS_NETWORK_PROTOCOLS) ; +AddFilesToFloppyBootArchive system add-ons kernel network devices + : $(SYSTEM_NETWORK_DEVICES) ; +AddFilesToFloppyBootArchive system add-ons kernel network datalink_protocols + : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ; +AddFilesToFloppyBootArchive system add-ons kernel network ppp + : $(SYSTEM_NETWORK_PPP) ; +AddFilesToFloppyBootArchive system add-ons kernel network protocols + : $(SYSTEM_NETWORK_PROTOCOLS) ; } # boot module links AddBootModuleSymlinksToFloppyBootArchive - $(BEOS_ADD_ONS_BUS_MANAGERS) + $(SYSTEM_ADD_ONS_BUS_MANAGERS) $(PPC_ONLY)openpic ide_adapter locked_pool scsi_periph $(X86_ONLY)generic_x86 @@ -106,7 +106,7 @@ AddBootModuleSymlinksToFloppyBootArchive uhci ohci ehci scsi_cd scsi_disk usb_disk intel session - $(BEOS_ADD_ONS_FILE_SYSTEMS) + $(SYSTEM_ADD_ONS_FILE_SYSTEMS) $(BOOT_ADD_ONS_NET) ; @@ -161,7 +161,8 @@ Depends haiku-floppyboot-archive : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ; HAIKU_BOOT_FLOPPY = haiku-boot-floppy.image ; MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ; -BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : zbeos : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ; +BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : haiku_loader + : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ; # remove the archive RmTemps $(HAIKU_BOOT_FLOPPY) : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ; diff --git a/build/jam/NetBootArchive b/build/jam/NetBootArchive index 13169fb025..1a6b6b02ce 100644 --- a/build/jam/NetBootArchive +++ b/build/jam/NetBootArchive @@ -14,54 +14,54 @@ if $(INCLUDE_GPL_ADDONS) = 1 { GPL_ONLY = "" ; } -BEOS_NETWORK_DEVICES = ethernet loopback ; -BEOS_NETWORK_DATALINK_PROTOCOLS = ethernet_frame arp loopback_frame +SYSTEM_NETWORK_DEVICES = ethernet loopback ; +SYSTEM_NETWORK_DATALINK_PROTOCOLS = ethernet_frame arp loopback_frame ipv4_datagram ; -BEOS_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ; +SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp ; -BEOS_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com etherpci $(X86_ONLY)ipro1000 +SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com etherpci $(X86_ONLY)ipro1000 $(X86_ONLY)ipro100 $(X86_ONLY)rtl8139 rtl8169 sis900 $(X86_ONLY)marvell_yukon $(X86_ONLY)via_rhine wb840 vlance $(GPL_ONLY)bcm440x $(GPL_ONLY)bcm570x ; -BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi +SYSTEM_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)isa ide scsi config_manager agp_gart ; -BEOS_ADD_ONS_FILE_SYSTEMS = bfs fat iso9660 ; +SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs fat iso9660 ; #cdda googlefs nfs $(GPL_ONLY)ntfs ; # modules -AddFilesToNetBootArchive beos system add-ons kernel bus_managers - : $(BEOS_ADD_ONS_BUS_MANAGERS) ; -AddFilesToNetBootArchive beos system add-ons kernel busses agp_gart +AddFilesToNetBootArchive system add-ons kernel bus_managers + : $(SYSTEM_ADD_ONS_BUS_MANAGERS) ; +AddFilesToNetBootArchive system add-ons kernel busses agp_gart : $(X86_ONLY)intel ; -AddFilesToNetBootArchive beos system add-ons kernel busses ide +AddFilesToNetBootArchive system add-ons kernel busses ide : generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ; -AddFilesToNetBootArchive beos system add-ons kernel busses scsi +AddFilesToNetBootArchive 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) ; -AddFilesToNetBootArchive beos system add-ons kernel generic +AddFilesToNetBootArchive system add-ons kernel console : vga_text ; +AddFilesToNetBootArchive system add-ons kernel file_systems + : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; +AddFilesToNetBootArchive system add-ons kernel generic : ide_adapter locked_pool scsi_periph ; -AddFilesToNetBootArchive beos system add-ons kernel partitioning_systems +AddFilesToNetBootArchive system add-ons kernel partitioning_systems : intel session ; -AddFilesToNetBootArchive beos system add-ons kernel interrupt_controllers +AddFilesToNetBootArchive system add-ons kernel interrupt_controllers : $(PPC_ONLY)openpic ; if $(TARGET_ARCH) = x86 { - AddFilesToNetBootArchive beos system add-ons kernel cpu : generic_x86 ; + AddFilesToNetBootArchive system add-ons kernel cpu : generic_x86 ; } # drivers AddNewDriversToNetBootArchive disk scsi : scsi_cd scsi_disk ; #AddDriversToNetBootArchive disk virtual : nbd ; AddDriversToNetBootArchive disk virtual : remote_disk ; -AddDriversToNetBootArchive net : $(BEOS_ADD_ONS_DRIVERS_NET) ; +AddDriversToNetBootArchive net : $(SYSTEM_ADD_ONS_DRIVERS_NET) ; # kernel -AddFilesToNetBootArchive beos system : kernel_$(TARGET_ARCH) ; +AddFilesToNetBootArchive system : kernel_$(TARGET_ARCH) ; # scripts and data files @@ -72,34 +72,34 @@ AddFilesToNetBootArchive home config settings kernel drivers : $(driverSettingsFiles) ; # add-ons -AddFilesToNetBootArchive beos system add-ons kernel network +AddFilesToNetBootArchive system add-ons kernel network : stack ; -AddFilesToNetBootArchive beos system add-ons kernel network devices - : $(BEOS_NETWORK_DEVICES) ; -AddFilesToNetBootArchive beos system add-ons kernel network datalink_protocols - : $(BEOS_NETWORK_DATALINK_PROTOCOLS) ; -AddFilesToNetBootArchive beos system add-ons kernel network ppp - : $(BEOS_NETWORK_PPP) ; -AddFilesToNetBootArchive beos system add-ons kernel network protocols - : $(BEOS_NETWORK_PROTOCOLS) ; +AddFilesToNetBootArchive system add-ons kernel network devices + : $(SYSTEM_NETWORK_DEVICES) ; +AddFilesToNetBootArchive system add-ons kernel network datalink_protocols + : $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) ; +AddFilesToNetBootArchive system add-ons kernel network ppp + : $(SYSTEM_NETWORK_PPP) ; +AddFilesToNetBootArchive system add-ons kernel network protocols + : $(SYSTEM_NETWORK_PROTOCOLS) ; # boot module links AddBootModuleSymlinksToNetBootArchive - $(BEOS_ADD_ONS_BUS_MANAGERS) + $(SYSTEM_ADD_ONS_BUS_MANAGERS) ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 - $(BEOS_ADD_ONS_FILE_SYSTEMS) + $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ide_adapter locked_pool scsi_periph intel session $(PPC_ONLY)openpic $(X86_ONLY)generic_x86 # nbd remote_disk - $(BEOS_ADD_ONS_DRIVERS_NET) + $(SYSTEM_ADD_ONS_DRIVERS_NET) stack - $(BEOS_NETWORK_DEVICES) - $(BEOS_NETWORK_DATALINK_PROTOCOLS) - $(BEOS_NETWORK_PPP) - $(BEOS_NETWORK_PROTOCOLS) + $(SYSTEM_NETWORK_DEVICES) + $(SYSTEM_NETWORK_DATALINK_PROTOCOLS) + $(SYSTEM_NETWORK_PPP) + $(SYSTEM_NETWORK_PROTOCOLS) ;