From a30d07f80a48b77c1ef4e1dd2b94bfa9320565dd Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Mon, 25 Feb 2019 19:56:07 -0500 Subject: [PATCH] build: Remove ATA build feature references. The ATA build feature itself was mistakenly removed in the previous commit, as it should have been removed along with these. Sorry about that. --- build/jam/images/FloppyBootImage | 6 +++--- build/jam/images/NetBootArchive | 6 +++--- build/jam/images/definitions/minimum | 2 +- build/jam/packages/Haiku | 4 ++-- build/jam/packages/HaikuBootstrap | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/jam/images/FloppyBootImage b/build/jam/images/FloppyBootImage index f95b9c6a25..eb1215587a 100644 --- a/build/jam/images/FloppyBootImage +++ b/build/jam/images/FloppyBootImage @@ -26,7 +26,7 @@ if $(NET_BOOT) = 1 { } SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures - acpi@x86,x86_64 ata@ata config_manager dpc pci + acpi@x86,x86_64 ata config_manager dpc pci isa@x86,x86_64 scsi $(USB_ONLY)usb fdt@arm ] ; SYSTEM_ADD_ONS_FILE_SYSTEMS = @@ -47,7 +47,7 @@ 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 - : ata_adapter@ata locked_pool scsi_periph ; + : ata_adapter locked_pool scsi_periph ; AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems : intel session ; AddFilesToFloppyBootArchive system add-ons kernel interrupt_controllers @@ -107,7 +107,7 @@ if $(NET_BOOT) = 1 { AddBootModuleSymlinksToFloppyBootArchive [ FFilterByBuildFeatures $(SYSTEM_ADD_ONS_BUS_MANAGERS) openpic@ppc - ata_adapter@ata locked_pool scsi_periph + ata_adapter locked_pool scsi_periph generic_x86@x86 ahci generic_ide_pci ide_isa@x86 silicon_image_3112 legacy_sata it8211 diff --git a/build/jam/images/NetBootArchive b/build/jam/images/NetBootArchive index a5903de72c..651d33cfc7 100644 --- a/build/jam/images/NetBootArchive +++ b/build/jam/images/NetBootArchive @@ -19,7 +19,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures etherpci pegasus usb_ecm wb840 ] ; SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures - pci isa@x86 ata@ata + pci isa@x86 ata scsi config_manager agp_gart ] ; SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs packagefs ; @@ -39,7 +39,7 @@ AddFilesToNetBootArchive system add-ons kernel console AddFilesToNetBootArchive system add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; AddFilesToNetBootArchive system add-ons kernel generic - : ata_adapter@ata locked_pool scsi_periph ; + : ata_adapter locked_pool scsi_periph ; AddFilesToNetBootArchive system add-ons kernel partitioning_systems : intel session ; AddFilesToNetBootArchive system add-ons kernel interrupt_controllers @@ -87,7 +87,7 @@ AddBootModuleSymlinksToNetBootArchive $(SYSTEM_ADD_ONS_BUS_MANAGERS) ahci generic_ide_pci ide_isa@x86 silicon_image_3112 $(SYSTEM_ADD_ONS_FILE_SYSTEMS) - ata_adapter@ata locked_pool scsi_periph + ata_adapter locked_pool scsi_periph intel session openpic@ppc generic_x86@x86 diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index aba8175a21..ae59b5edd6 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -205,7 +205,7 @@ SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures ] ; SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures - acpi@x86,x86_64 agp_gart@x86,x86_64 ata@ata + acpi@x86,x86_64 agp_gart@x86,x86_64 ata config_manager firewire@x86 scsi isa@x86,x86_64 diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index 8f000bf9d9..67d8904b66 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -45,7 +45,7 @@ AddFilesToPackage add-ons kernel debugger run_on_exit ; AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; AddFilesToPackage add-ons kernel generic - : ata_adapter@ata bios@x86,x86_64 dpc + : ata_adapter bios@x86,x86_64 dpc locked_pool mpu401 scsi_periph tty ; AddFilesToPackage add-ons kernel partitioning_systems : amiga_rdb@m68k apple@ppc efi_gpt intel session ; @@ -183,7 +183,7 @@ AddFilesToPackage data KeyboardLayouts ThinkPad # boot module links AddBootModuleSymlinksToPackage - acpi@x86,x86_64 ahci ata@ata ata_adapter@ata + acpi@x86,x86_64 ahci ata ata_adapter bfs config_manager dpc diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap index 0127e52485..a2a9860139 100644 --- a/build/jam/packages/HaikuBootstrap +++ b/build/jam/packages/HaikuBootstrap @@ -43,7 +43,7 @@ AddFilesToPackage add-ons kernel debugger run_on_exit ; AddFilesToPackage add-ons kernel file_systems : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; AddFilesToPackage add-ons kernel generic - : ata_adapter@ata bios@x86,x86_64 dpc + : ata_adapter bios@x86,x86_64 dpc locked_pool mpu401 scsi_periph tty ; AddFilesToPackage add-ons kernel partitioning_systems : amiga_rdb@m68k apple@ppc efi_gpt intel session ; @@ -162,10 +162,10 @@ AddFilesToPackage data KeyboardLayouts ThinkPad # boot module links AddBootModuleSymlinksToPackage - acpi@x86,x86_64 ata@ata pci isa@x86,x86_64 config_manager dpc + acpi@x86,x86_64 ata pci isa@x86,x86_64 config_manager dpc scsi usb openpic@ppc - ata_adapter@ata locked_pool scsi_periph + ata_adapter locked_pool scsi_periph ahci generic_ide_pci it8211 legacy_sata silicon_image_3112 highpoint_ide_pci ide_isa@x86