From dd10e5d977fb19e6f842fa6f31e7ce925c129d02 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Tue, 15 Mar 2022 08:04:49 +0100 Subject: [PATCH] intel_fb: move to legacy_intel_fb Move the depot recipe and consistently name the old drivers with a legacy_ prefix as done with the old usb_host driver. Issue #4450 --- .../src/{intel_fb_drv => legacy_intel_fb_drv}/content.mk | 0 .../recipes/src/{intel_fb_drv => legacy_intel_fb_drv}/hash | 0 .../src/{intel_fb_drv => legacy_intel_fb_drv}/used_apis | 0 repos/dde_linux/run/intel_fb.run | 3 ++- repos/dde_linux/src/drivers/framebuffer/intel/target.mk | 2 +- repos/gems/recipes/pkg/drivers_managed-pc/archives | 2 +- repos/gems/src/app/driver_manager/main.cc | 2 +- 7 files changed, 5 insertions(+), 4 deletions(-) rename repos/dde_linux/recipes/src/{intel_fb_drv => legacy_intel_fb_drv}/content.mk (100%) rename repos/dde_linux/recipes/src/{intel_fb_drv => legacy_intel_fb_drv}/hash (100%) rename repos/dde_linux/recipes/src/{intel_fb_drv => legacy_intel_fb_drv}/used_apis (100%) diff --git a/repos/dde_linux/recipes/src/intel_fb_drv/content.mk b/repos/dde_linux/recipes/src/legacy_intel_fb_drv/content.mk similarity index 100% rename from repos/dde_linux/recipes/src/intel_fb_drv/content.mk rename to repos/dde_linux/recipes/src/legacy_intel_fb_drv/content.mk diff --git a/repos/dde_linux/recipes/src/intel_fb_drv/hash b/repos/dde_linux/recipes/src/legacy_intel_fb_drv/hash similarity index 100% rename from repos/dde_linux/recipes/src/intel_fb_drv/hash rename to repos/dde_linux/recipes/src/legacy_intel_fb_drv/hash diff --git a/repos/dde_linux/recipes/src/intel_fb_drv/used_apis b/repos/dde_linux/recipes/src/legacy_intel_fb_drv/used_apis similarity index 100% rename from repos/dde_linux/recipes/src/intel_fb_drv/used_apis rename to repos/dde_linux/recipes/src/legacy_intel_fb_drv/used_apis diff --git a/repos/dde_linux/run/intel_fb.run b/repos/dde_linux/run/intel_fb.run index 71c675c88c..5fd4361da6 100644 --- a/repos/dde_linux/run/intel_fb.run +++ b/repos/dde_linux/run/intel_fb.run @@ -127,6 +127,7 @@ append config { + @@ -165,7 +166,7 @@ install_config $config # generic modules set boot_modules { - core ld.lib.so init timer intel_fb_drv intel_fb_controller + core ld.lib.so init timer legacy_intel_fb_drv intel_fb_controller test-framebuffer report_rom fs_rom vfs vfs.lib.so vfs_import.lib.so top } diff --git a/repos/dde_linux/src/drivers/framebuffer/intel/target.mk b/repos/dde_linux/src/drivers/framebuffer/intel/target.mk index 331efc3145..2bdab9fbf0 100644 --- a/repos/dde_linux/src/drivers/framebuffer/intel/target.mk +++ b/repos/dde_linux/src/drivers/framebuffer/intel/target.mk @@ -1,6 +1,6 @@ REQUIRES = x86 -TARGET = intel_fb_drv +TARGET = legacy_intel_fb_drv LIBS = base intel_fb_drv intel_fb_include lx_kit_setjmp blit SRC_CC = main.cc lx_emul.cc SRC_C = dummies.c i915_params.c lx_emul_c.c diff --git a/repos/gems/recipes/pkg/drivers_managed-pc/archives b/repos/gems/recipes/pkg/drivers_managed-pc/archives index 266f021c23..12776a0544 100644 --- a/repos/gems/recipes/pkg/drivers_managed-pc/archives +++ b/repos/gems/recipes/pkg/drivers_managed-pc/archives @@ -5,7 +5,7 @@ _/src/pc_usb_host_drv _/src/usb_hid_drv _/src/usb_block_drv _/src/vesa_drv -_/src/intel_fb_drv +_/src/legacy_intel_fb_drv _/src/intel_gpu_drv _/src/boot_fb_drv _/src/ahci_drv diff --git a/repos/gems/src/app/driver_manager/main.cc b/repos/gems/src/app/driver_manager/main.cc index 6faa99c64f..131a465f6a 100644 --- a/repos/gems/src/app/driver_manager/main.cc +++ b/repos/gems/src/app/driver_manager/main.cc @@ -164,7 +164,7 @@ struct Driver_manager::Intel_fb_driver : Device_driver intel_gpu_driver.generate_start_node(xml); xml.node("start", [&] () { - _gen_common_start_node_content(xml, "intel_fb_drv", "intel_fb_drv", + _gen_common_start_node_content(xml, "intel_fb_drv", "legacy_intel_fb_drv", Ram_quota{42*1024*1024}, Cap_quota{800}, Priority{0}, version); xml.node("heartbeat", [&] () { });