From 65f52a5f56e08fe5b1db75626c42e79da9bfa3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 20 May 2021 16:50:08 +0200 Subject: [PATCH] build: remove the firewire support from the default image decommissioning. Change-Id: Ie7ccba705f7282193120241479d2ae83bd271b2c Reviewed-on: https://review.haiku-os.org/c/haiku/+/3956 Reviewed-by: Adrien Destugues Reviewed-by: Fredrik Holmqvist Tested-by: Commit checker robot --- build/jam/images/definitions/minimum | 1 - build/jam/images/definitions/regular | 3 +-- build/jam/packages/Haiku | 2 +- build/jam/packages/HaikuBootstrap | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum index 4852de4fbe..52d78a3a0d 100644 --- a/build/jam/images/definitions/minimum +++ b/build/jam/images/definitions/minimum @@ -213,7 +213,6 @@ SYSTEM_ADD_ONS_DRIVERS_SENSOR = [ FFilterByBuildFeatures SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures acpi@x86,x86_64 agp_gart@x86,x86_64 ata config_manager - firewire@x86 i2c@x86,x86_64 isa@x86,x86_64 mmc scsi diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular index c82beb79ca..d0fa45f35e 100644 --- a/build/jam/images/definitions/regular +++ b/build/jam/images/definitions/regular @@ -7,7 +7,7 @@ SYSTEM_BIN += [ FFilterByBuildFeatures cddb_lookup clipboard CortexAddOnHost dpms - FirstBootPrompt fwcontrol@x86 + FirstBootPrompt i2c@x86,x86_64 installsound mail mail2mbox mbox2mail media_client mkdos mount_nfs play recover screenshot setcontrollook setdecor spamdbm @@ -141,7 +141,6 @@ SYSTEM_ADD_ONS_MEDIA += [ FFilterByBuildFeatures cortex_logging_consumer.media_addon dvb.media_addon@x86 equalizer.media_addon - firewire_dv.media_addon@x86 hmulti_audio.media_addon #legacy.media_addon mixer.media_addon diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index 9c33980677..d5a3542d20 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -76,7 +76,7 @@ AddDriversToPackage audio hmulti : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ; AddDriversToPackage audio old : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ; AddDriversToPackage bluetooth h2 : $(SYSTEM_ADD_ONS_DRIVERS_BT_H2) ; AddDriversToPackage midi : $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ; -AddDriversToPackage bus : usb_raw fw_raw@x86 ; +AddDriversToPackage bus : usb_raw ; AddDriversToPackage disk floppy : pc_floppy@x86 ; AddDriversToPackage disk usb : usb_disk ; AddDriversToPackage disk virtual : nbd ; diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap index 44cf71ed00..19bde79c9f 100644 --- a/build/jam/packages/HaikuBootstrap +++ b/build/jam/packages/HaikuBootstrap @@ -68,7 +68,7 @@ AddDriversToPackage : console dprintf null random tty AddDriversToPackage audio hmulti : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ; AddDriversToPackage audio old : $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ; AddDriversToPackage midi : $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ; -AddDriversToPackage bus : usb_raw fw_raw@x86 ; +AddDriversToPackage bus : usb_raw ; AddDriversToPackage disk floppy : pc_floppy@x86 ; AddDriversToPackage disk usb : usb_disk ; AddDriversToPackage disk virtual : nbd ;