dde_linux: use [build_artifacts] in run scripts

Issue #4860
This commit is contained in:
Norman Feske 2023-11-24 12:48:02 +01:00 committed by Christian Helmuth
parent 67741655d1
commit ee8c76b42e
13 changed files with 18 additions and 56 deletions

View File

@ -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 "

View File

@ -396,7 +396,7 @@ install_config {
</config>
}
build_boot_image { ping }
build_boot_image [build_artifacts]
append done_string ".*router.config: change"
append done_string ".*router.config: sleep 3001 milliseconds"

View File

@ -178,7 +178,7 @@ puts $fd {
</config>}
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"

View File

@ -131,7 +131,7 @@ puts $fd {
</config>}
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"

View File

@ -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)" }

View File

@ -84,7 +84,7 @@ puts $fd {
</config>}
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"

View File

@ -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 {
<config verbose="yes">
<parent-provides>
<service name="CPU"/>
@ -119,18 +118,9 @@ append config {
</route>
</start>
</config>
}
</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"

View File

@ -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 }
}

View File

@ -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 }

View File

@ -288,6 +288,6 @@ EpA5DBBklj8UE2CdONvN
build { app/wireguard }
build_boot_image { wireguard }
build_boot_image [build_artifacts]
run_genode_until forever

View File

@ -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

View File

@ -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.*"

View File

@ -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 {