From 08378dd148b6e009349d805fa6e1eb01ca6b5d21 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Tue, 15 Nov 2022 15:54:02 +0100 Subject: [PATCH] libports: remove platform_drv.inc from run-scripts Ref genodelabs/genode#4671 --- repos/libports/run/libc_with_libc.run | 24 ++------- repos/libports/run/mupdf.run | 15 ++---- repos/libports/run/oss.run | 73 +++++++++++++++++++-------- repos/libports/run/webcam.inc | 73 +++++++++++++++++++-------- 4 files changed, 111 insertions(+), 74 deletions(-) diff --git a/repos/libports/run/libc_with_libc.run b/repos/libports/run/libc_with_libc.run index 27439ee4e6..eb2ce9d91b 100644 --- a/repos/libports/run/libc_with_libc.run +++ b/repos/libports/run/libc_with_libc.run @@ -1,15 +1,8 @@ -set build_components { - core init timer test/libc_with_libc -} - -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components +build { core init timer test/libc_with_libc } create_boot_directory -set config { +install_config { @@ -28,11 +21,8 @@ set config { - } + -append_platform_drv_config - -append config { @@ -42,18 +32,12 @@ append config { } -install_config $config - -set boot_modules { +build_boot_image { core init timer ld.lib.so libc.lib.so vfs.lib.so test-libc_with_libc } -append_platform_drv_boot_modules - -build_boot_image $boot_modules - append qemu_args " -nographic " run_genode_until ".*finished with_libc tests.*\n" 10 diff --git a/repos/libports/run/mupdf.run b/repos/libports/run/mupdf.run index 32be5c1764..0dd70e06b9 100644 --- a/repos/libports/run/mupdf.run +++ b/repos/libports/run/mupdf.run @@ -1,11 +1,6 @@ -set build_components { app/pdf_view } - -source ${genode_dir}/repos/base/run/platform_drv.inc - -build $build_components +build { app/pdf_view } create_boot_directory - import_from_depot \ [depot_user]/pkg/[drivers_interactive_pkg] \ [depot_user]/pkg/motif_wm \ @@ -13,7 +8,7 @@ import_from_depot \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ -set config { +install_config { @@ -96,8 +91,6 @@ set config { } -install_config $config - # # Download test PDF file # @@ -118,7 +111,7 @@ set fd [open [run_dir]/genode/focus w] puts $fd " focus\"/>" close $fd -append boot_modules { +build_boot_image { libc.lib.so vfs.lib.so libm.lib.so openjpeg.lib.so freetype.lib.so libpng.lib.so zlib.lib.so jbig2dec.lib.so mupdf.lib.so jpeg.lib.so @@ -126,8 +119,6 @@ append boot_modules { test.pdf } -build_boot_image $boot_modules - append qemu_args " -m 800" run_genode_until forever diff --git a/repos/libports/run/oss.run b/repos/libports/run/oss.run index c6c070d4e7..a1ef5faeda 100644 --- a/repos/libports/run/oss.run +++ b/repos/libports/run/oss.run @@ -1,3 +1,5 @@ +assert_spec x86 + if {[have_board linux]} { puts "Run script does not support Linux." exit 0 @@ -8,20 +10,19 @@ if {[have_include "power_on/qemu"]} { exit 0 } -set build_components { +build { core init timer + drivers/acpi drivers/audio + drivers/platform + app/pci_decode + server/report_rom lib/vfs_oss test/oss } -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components - -build $build_components - create_boot_directory -append config { +install_config { @@ -37,17 +38,55 @@ append config { + -} -append_platform_drv_config + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -append config { - + @@ -61,6 +100,7 @@ append config { + @@ -81,18 +121,11 @@ append config { } -install_config $config - -set boot_modules { +build_boot_image { core init timer test-oss ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so vfs_oss.lib.so + pci_audio_drv platform_drv pci_decode acpi_drv report_rom } -append boot_modules [audio_drv_binary] - -append_platform_drv_boot_modules - -build_boot_image $boot_modules - run_genode_until forever diff --git a/repos/libports/run/webcam.inc b/repos/libports/run/webcam.inc index bd74817677..70dcd36f1f 100644 --- a/repos/libports/run/webcam.inc +++ b/repos/libports/run/webcam.inc @@ -1,7 +1,5 @@ assert_spec x86 -set build_components { } - # fuji4 proc libuvc_vendor_id {} { return "0x04f2" } proc libuvc_product_id {} { return "0xb564" } @@ -19,26 +17,23 @@ proc libuvc_product_id {} { return "0xb564" } #proc libuvc_product_id {} { return "0x58db" } - create_boot_directory import_from_depot [depot_user]/src/[base_src] \ + [depot_user]/pkg/usb_webcam \ + [depot_user]/src/acpi_drv \ + [depot_user]/src/dynamic_rom \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/dynamic_rom \ - [depot_user]/src/rom_reporter \ - [depot_user]/src/report_rom \ [depot_user]/src/pc_usb_host_drv \ - [depot_user]/src/vesa_drv \ - [depot_user]/pkg/usb_webcam + [depot_user]/src/pci_decode \ + [depot_user]/src/platform_drv \ + [depot_user]/src/report_rom \ + [depot_user]/src/rom_reporter \ + [depot_user]/src/vesa_drv import_from_depot $test_imports -source ${genode_dir}/repos/base/run/platform_drv.inc -append_platform_drv_build_components -build $build_components - - append config { @@ -56,11 +51,7 @@ append config { -} -append_platform_drv_config - -append config { @@ -69,6 +60,48 @@ append config { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -180,11 +213,7 @@ append config { install_config $config -append_platform_drv_boot_modules - -append boot_modules { } - -build_boot_image $boot_modules +build_boot_image { } append qemu_args { -usb -device usb-host,vendorid=[libuvc_vendor_id],productid=[libuvc_product_id] }