diff --git a/repos/dde_linux/run/driver_time.run b/repos/dde_linux/run/driver_time.run index 323fae8eb0..3b62c60d4e 100644 --- a/repos/dde_linux/run/driver_time.run +++ b/repos/dde_linux/run/driver_time.run @@ -1,7 +1,3 @@ -# -# Build -# - if {[expr ![have_spec arm_64] && ![have_spec x86_64]]} { puts "Run script is not supported on this platform." exit 0 @@ -9,13 +5,10 @@ if {[expr ![have_spec arm_64] && ![have_spec x86_64]]} { set use_top 0 -set build_components { - core init timer - test/driver_time -} - +set build_components { core init timer lib/ld test/driver_time } append_if $use_top build_components { app/top } + build $build_components create_boot_directory @@ -58,18 +51,7 @@ append config { install_config $config -# -# Boot modules -# - -# generic modules -set boot_modules { - core ld.lib.so init timer - test-driver_time -} - -append_if $use_top boot_modules { top } -build_boot_image $boot_modules +build_boot_image [build_artifacts] append qemu_args "-nographic " diff --git a/repos/dde_linux/run/nic_router_uplinks.run b/repos/dde_linux/run/nic_router_uplinks.run index 4451687f87..154749bbcd 100644 --- a/repos/dde_linux/run/nic_router_uplinks.run +++ b/repos/dde_linux/run/nic_router_uplinks.run @@ -396,7 +396,7 @@ install_config { } -build_boot_image { ping } +build_boot_image [build_artifacts] append done_string ".*router.config: change" append done_string ".*router.config: sleep 3001 milliseconds" diff --git a/repos/dde_linux/run/usb_hid_raw.run b/repos/dde_linux/run/usb_hid_raw.run index 9f7da587ef..d010438db2 100644 --- a/repos/dde_linux/run/usb_hid_raw.run +++ b/repos/dde_linux/run/usb_hid_raw.run @@ -178,7 +178,7 @@ puts $fd { } close $fd -build_boot_image { event_dump } +build_boot_image [build_artifacts] append qemu_args " -device nec-usb-xhci,id=xhci" append qemu_args " -device usb-kbd,bus=xhci.0" diff --git a/repos/dde_linux/run/usb_hid_reconnect.run b/repos/dde_linux/run/usb_hid_reconnect.run index d1721822eb..c61113451d 100644 --- a/repos/dde_linux/run/usb_hid_reconnect.run +++ b/repos/dde_linux/run/usb_hid_reconnect.run @@ -131,7 +131,7 @@ puts $fd { } close $fd -build_boot_image { event_dump } +build_boot_image [build_artifacts] append qemu_args " -device nec-usb-xhci,id=xhci -device usb-kbd,bus=xhci.0 -nographic" diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 1b5cd03df3..7595e566a2 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -119,7 +119,7 @@ set fd [open [run_dir]/genode/usb_host_drv.config w] puts $fd $config close $fd -build_boot_image { test-lwip_httpsrv } +build_boot_image [build_artifacts] proc usb_bus {} { return "$::env(BUS)" } diff --git a/repos/dde_linux/run/usb_terminal.run b/repos/dde_linux/run/usb_terminal.run index 67f0ad4d70..8e9d079a15 100644 --- a/repos/dde_linux/run/usb_terminal.run +++ b/repos/dde_linux/run/usb_terminal.run @@ -84,7 +84,7 @@ puts $fd { } close $fd -build_boot_image { usb_terminal } +build_boot_image [build_artifacts] append qemu_args " -chardev socket,path=$usb_raw_device,id=ser " append qemu_args " -device nec-usb-xhci,id=xhci -device usb-serial,bus=xhci.0,chardev=ser -nographic" diff --git a/repos/dde_linux/run/vfs_cfg.run b/repos/dde_linux/run/vfs_cfg.run index 657dbd7aca..61a37e8730 100644 --- a/repos/dde_linux/run/vfs_cfg.run +++ b/repos/dde_linux/run/vfs_cfg.run @@ -3,19 +3,18 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} { exit 0 } -set build_components { - core init timer +build { + core lib/ld init timer lib/vfs lib/vfs_lxip server/vfs server/dynamic_rom server/nic_router app/ping } -build $build_components create_boot_directory -append config { +install_config { @@ -119,18 +118,9 @@ append config { - -} + } -install_config $config - -append boot_modules { - core init timer vfs dynamic_rom - ld.lib.so vfs.lib.so vfs_lxip.lib.so lxip.lib.so - nic_router ping -} - -build_boot_image $boot_modules +build_boot_image [build_artifacts] append done_string ".*\"ping_.\" exited with exit value 0.*\n" append done_string ".*\"ping_.\" exited with exit value 0.*\n" diff --git a/repos/dde_linux/run/vfs_lxip.inc b/repos/dde_linux/run/vfs_lxip.inc index 0febe00025..44e6cce76d 100644 --- a/repos/dde_linux/run/vfs_lxip.inc +++ b/repos/dde_linux/run/vfs_lxip.inc @@ -4,8 +4,3 @@ proc append_socket_fs_build_components { } { } proc socket_fs_plugin {} { return lxip } - -proc append_socket_fs_boot_modules {} { - global boot_modules - append boot_modules { lxip.lib.so vfs_lxip.lib.so } -} diff --git a/repos/dde_linux/run/wg_fetchurl.run b/repos/dde_linux/run/wg_fetchurl.run index 9fc5b9fd22..69c95c5130 100644 --- a/repos/dde_linux/run/wg_fetchurl.run +++ b/repos/dde_linux/run/wg_fetchurl.run @@ -370,17 +370,12 @@ append config { install_config $config append targets { - core init timer server/nic_router server/report_rom + core init timer lib/ld server/nic_router server/report_rom lib/curl app/fetchurl } -append boot_modules { - core init timer nic_router fetchurl report_rom curl.lib.so - ld.lib.so } - if $linux { append targets { server/lx_fs } - append boot_modules { lx_fs } # create the lx_fs root of fetchurl where it will store the downloaded file proc lx_fs_root {} { return [run_dir]/genode } diff --git a/repos/dde_linux/run/wg_lighttpd.run b/repos/dde_linux/run/wg_lighttpd.run index 4310f4a88b..8463e47cd3 100644 --- a/repos/dde_linux/run/wg_lighttpd.run +++ b/repos/dde_linux/run/wg_lighttpd.run @@ -288,6 +288,6 @@ EpA5DBBklj8UE2CdONvN build { app/wireguard } -build_boot_image { wireguard } +build_boot_image [build_artifacts] run_genode_until forever diff --git a/repos/dde_linux/run/wg_ping_inwards.run b/repos/dde_linux/run/wg_ping_inwards.run index 71674f2185..a51ba99074 100644 --- a/repos/dde_linux/run/wg_ping_inwards.run +++ b/repos/dde_linux/run/wg_ping_inwards.run @@ -137,7 +137,7 @@ install_config { build { app/wireguard } -build_boot_image { wireguard } +build_boot_image [build_artifacts] run_genode_until "uplink\] dynamic IP config: interface 10.0.2.3" 10 diff --git a/repos/dde_linux/run/wg_ping_outwards.run b/repos/dde_linux/run/wg_ping_outwards.run index adcc5f305c..4eb32e29f9 100644 --- a/repos/dde_linux/run/wg_ping_outwards.run +++ b/repos/dde_linux/run/wg_ping_outwards.run @@ -163,7 +163,7 @@ install_config { build { app/wireguard app/ping } -build_boot_image { wireguard ping } +build_boot_image [build_artifacts] append wait_for_string "64 bytes from 10.0.9.1.*" append wait_for_string "64 bytes from 10.0.9.1.*" diff --git a/repos/dde_linux/run/wg_reconfig.run b/repos/dde_linux/run/wg_reconfig.run index 8c3b41a493..173f0ee70d 100644 --- a/repos/dde_linux/run/wg_reconfig.run +++ b/repos/dde_linux/run/wg_reconfig.run @@ -558,7 +558,7 @@ EpA5DBBklj8UE2CdONvN install_config $config append targets { - core init timer server/nic_router app/wireguard server/report_rom app/ping + core init timer lib/ld server/nic_router app/wireguard server/report_rom app/ping app/fetchurl server/dynamic_rom } append boot_modules {