From 3966d6f16fe8d05a71bada6b458b361b6b07f770 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Thu, 10 Feb 2022 21:19:54 +0100 Subject: [PATCH] usb_host_drv: move it to legacy_usb_host_drv To make room for the re-newed usb_host_drv basing on Linux 5.14 and the re-newed lx_kit/lx_emul we have to move the depot recipe and consistently name the old drivers with a legacy_ prefix. Ref genodelabs/genode#4416 --- repos/base/run/platform_drv.inc | 6 +++--- .../src/{usb_host_drv => legacy_usb_host_drv}/content.mk | 0 .../recipes/src/{usb_host_drv => legacy_usb_host_drv}/hash | 0 .../src/{usb_host_drv => legacy_usb_host_drv}/used_apis | 0 .../src/drivers/usb_host/spec/imx6q_sabrelite/target.mk | 2 +- repos/dde_linux/src/drivers/usb_host/spec/rpi/target.mk | 2 +- repos/dde_linux/src/drivers/usb_host/spec/x86/target.inc | 2 +- repos/gems/recipes/pkg/drivers_managed-pc/archives | 2 +- repos/gems/sculpt/drivers/pc | 2 +- repos/libports/run/webcam.run | 4 ++-- repos/os/recipes/pkg/drivers_interactive-pc/archives | 2 +- repos/os/recipes/raw/drivers_interactive-pc/drivers.config | 2 +- repos/ports/run/virtualbox_auto.inc | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) rename repos/dde_linux/recipes/src/{usb_host_drv => legacy_usb_host_drv}/content.mk (100%) rename repos/dde_linux/recipes/src/{usb_host_drv => legacy_usb_host_drv}/hash (100%) rename repos/dde_linux/recipes/src/{usb_host_drv => legacy_usb_host_drv}/used_apis (100%) diff --git a/repos/base/run/platform_drv.inc b/repos/base/run/platform_drv.inc index 56055252bf..459e1282ad 100644 --- a/repos/base/run/platform_drv.inc +++ b/repos/base/run/platform_drv.inc @@ -7,9 +7,9 @@ proc have_platform_drv {} { # Return name of the USB driver binary # proc usb_host_drv_binary { } { - if {[have_board rpi]} { return rpi_usb_host_drv } - if {[have_board imx6q_sabrelite]} { return imx6q_sabrelite_usb_host_drv } - if {[have_board pc]} { return x86_pc_usb_host_drv } + if {[have_board rpi]} { return legacy_rpi_usb_host_drv } + if {[have_board imx6q_sabrelite]} { return legacy_imx6q_sabrelite_usb_host_drv } + if {[have_board pc]} { return legacy_pc_usb_host_drv } return no_usb_drv_available } diff --git a/repos/dde_linux/recipes/src/usb_host_drv/content.mk b/repos/dde_linux/recipes/src/legacy_usb_host_drv/content.mk similarity index 100% rename from repos/dde_linux/recipes/src/usb_host_drv/content.mk rename to repos/dde_linux/recipes/src/legacy_usb_host_drv/content.mk diff --git a/repos/dde_linux/recipes/src/usb_host_drv/hash b/repos/dde_linux/recipes/src/legacy_usb_host_drv/hash similarity index 100% rename from repos/dde_linux/recipes/src/usb_host_drv/hash rename to repos/dde_linux/recipes/src/legacy_usb_host_drv/hash diff --git a/repos/dde_linux/recipes/src/usb_host_drv/used_apis b/repos/dde_linux/recipes/src/legacy_usb_host_drv/used_apis similarity index 100% rename from repos/dde_linux/recipes/src/usb_host_drv/used_apis rename to repos/dde_linux/recipes/src/legacy_usb_host_drv/used_apis diff --git a/repos/dde_linux/src/drivers/usb_host/spec/imx6q_sabrelite/target.mk b/repos/dde_linux/src/drivers/usb_host/spec/imx6q_sabrelite/target.mk index 025daae8ca..0b5b93ab5d 100644 --- a/repos/dde_linux/src/drivers/usb_host/spec/imx6q_sabrelite/target.mk +++ b/repos/dde_linux/src/drivers/usb_host/spec/imx6q_sabrelite/target.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/src/drivers/usb_host/target.inc -TARGET = imx6q_sabrelite_usb_host_drv +TARGET = legacy_imx6q_sabrelite_usb_host_drv REQUIRES = arm_v7 SRC_C += usb/chipidea/ci_hdrc_imx.c diff --git a/repos/dde_linux/src/drivers/usb_host/spec/rpi/target.mk b/repos/dde_linux/src/drivers/usb_host/spec/rpi/target.mk index e39ab7221d..d9a56852f2 100644 --- a/repos/dde_linux/src/drivers/usb_host/spec/rpi/target.mk +++ b/repos/dde_linux/src/drivers/usb_host/spec/rpi/target.mk @@ -1,6 +1,6 @@ include $(REP_DIR)/src/drivers/usb_host/target.inc -TARGET = rpi_usb_host_drv +TARGET = legacy_rpi_usb_host_drv REQUIRES = arm_v6 INC_DIR += $(REP_DIR)/src/drivers/usb_host/spec/arm diff --git a/repos/dde_linux/src/drivers/usb_host/spec/x86/target.inc b/repos/dde_linux/src/drivers/usb_host/spec/x86/target.inc index 730ff404f3..5b43fc0d6c 100644 --- a/repos/dde_linux/src/drivers/usb_host/spec/x86/target.inc +++ b/repos/dde_linux/src/drivers/usb_host/spec/x86/target.inc @@ -1,6 +1,6 @@ include $(REP_DIR)/src/drivers/usb_host/target.inc -TARGET = x86_pc_usb_host_drv +TARGET = legacy_pc_usb_host_drv INC_DIR += $(REP_DIR)/src_drivers/usb_host/spec/x86 INC_DIR += $(REP_DIR)/src/include/spec/x86 diff --git a/repos/gems/recipes/pkg/drivers_managed-pc/archives b/repos/gems/recipes/pkg/drivers_managed-pc/archives index f0a93b0bb5..a8588b0421 100644 --- a/repos/gems/recipes/pkg/drivers_managed-pc/archives +++ b/repos/gems/recipes/pkg/drivers_managed-pc/archives @@ -1,7 +1,7 @@ _/src/platform_drv _/src/acpi_drv _/src/ps2_drv -_/src/usb_host_drv +_/src/legacy_usb_host_drv _/src/usb_hid_drv _/src/usb_block_drv _/src/vesa_drv diff --git a/repos/gems/sculpt/drivers/pc b/repos/gems/sculpt/drivers/pc index 0978f60972..ea773f3c02 100644 --- a/repos/gems/sculpt/drivers/pc +++ b/repos/gems/sculpt/drivers/pc @@ -133,7 +133,7 @@ - + diff --git a/repos/libports/run/webcam.run b/repos/libports/run/webcam.run index b96cfe4521..7786b419ac 100644 --- a/repos/libports/run/webcam.run +++ b/repos/libports/run/webcam.run @@ -25,7 +25,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/nitpicker \ [depot_user]/src/dynamic_rom \ [depot_user]/src/rom_reporter \ - [depot_user]/src/usb_host_drv \ + [depot_user]/src/legacy_usb_host_drv \ [depot_user]/src/vesa_drv \ [depot_user]/src/test-capture \ [depot_user]/pkg/usb_webcam @@ -66,7 +66,7 @@ append config { - + diff --git a/repos/os/recipes/pkg/drivers_interactive-pc/archives b/repos/os/recipes/pkg/drivers_interactive-pc/archives index b896b1f466..b53cf5ff1d 100644 --- a/repos/os/recipes/pkg/drivers_interactive-pc/archives +++ b/repos/os/recipes/pkg/drivers_interactive-pc/archives @@ -1,7 +1,7 @@ _/src/platform_drv _/src/acpi_drv _/src/ps2_drv -_/src/usb_host_drv +_/src/legacy_usb_host_drv _/src/usb_hid_drv _/src/vesa_drv _/src/report_rom diff --git a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config index 735ad9a88e..453dbb8d42 100644 --- a/repos/os/recipes/raw/drivers_interactive-pc/drivers.config +++ b/repos/os/recipes/raw/drivers_interactive-pc/drivers.config @@ -107,7 +107,7 @@ - + diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 806829c20f..837be1950f 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -39,7 +39,7 @@ if {$use_vms > 1} { } if {$use_usb} { - import_from_depot [depot_user]/src/usb_host_drv \ + import_from_depot [depot_user]/src/legacy_usb_host_drv \ [depot_user]/src/usb_hid_drv } @@ -350,7 +350,7 @@ append_if [expr $use_usb] config { - +