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#4416
skalk · Feb 10, 2022 · c224092 · c224092
1 parent 89b5aa3
commit c224092
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 14 deletions.
diff --git 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/...linux/recipes/src/usb_host_drv/content.mk → ...ecipes/src/legacy_usb_host_drv/content.mk b/...linux/recipes/src/usb_host_drv/content.mk → ...ecipes/src/legacy_usb_host_drv/content.mk
diff --git a/...s/dde_linux/recipes/src/usb_host_drv/hash → ...inux/recipes/src/legacy_usb_host_drv/hash b/...s/dde_linux/recipes/src/usb_host_drv/hash → ...inux/recipes/src/legacy_usb_host_drv/hash
diff --git a/..._linux/recipes/src/usb_host_drv/used_apis → ...recipes/src/legacy_usb_host_drv/used_apis b/..._linux/recipes/src/usb_host_drv/used_apis → ...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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -133,7 +133,7 @@
 	</start>
 
 	<start name="usb_drv" caps="200">
-		<binary name="x86_pc_usb_host_drv"/>
+		<binary name="legacy_pc_usb_host_drv"/>
 		<resource name="RAM" quantum="16M"/>
 		<provides> <service name="Usb"/> </provides>
 		<route>

diff --git 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 {
 	</start>
 
 	<start name="usb_drv" priority="0" caps="200">
-		<binary name="x86_pc_usb_host_drv"/>
+		<binary name="legacy_pc_usb_host_drv"/>
 		<resource name="RAM" quantum="16M"/>
 		<!-- <resource name="CPU" quantum="10"/> -->
 		<provides><service name="Usb"/></provides>

diff --git 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
@@ -107,7 +107,7 @@
 	</start>
 
 	<start name="usb_drv" caps="150">
-		<binary name="x86_pc_usb_host_drv"/>
+		<binary name="legacy_pc_usb_host_drv"/>
 		<resource name="RAM" quantum="16M"/>
 		<provides> <service name="Usb"/> </provides>
 		<config uhci="yes" ohci="yes" ehci="yes" xhci="yes">

diff --git 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 {
 	</start>
 
 	<start name="usb_drv" caps="200">
-		<binary name="x86_pc_usb_host_drv"/>
+		<binary name="legacy_pc_usb_host_drv"/>
 		<resource name="RAM" quantum="20M"/>
 		<provides> <service name="Usb"/> </provides>
 		<route>