ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libports: use [build_artifacts] in run scripts

Browse Source 
...except for the run scripts related to Qt and the NIC router.

Issue #4860
This commit is contained in:
Norman Feske 2023-09-12 16:21:03 +02:00 committed by Christian Helmuth
parent e8059ccba5
commit 3ebb715c5c
30 changed files with 94 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
repos/libports/run/acpi_suspend.run
View File

@ -89,9 +89,8 @@ proc gpu_config { } {
</start>}
}
set build_components {
core timer init
build {
core timer init lib/ld
server/report_rom
server/dynamic_rom
server/rom_filter
@ -107,8 +106,6 @@ set build_components {
test/suspend
}
build $build_components
create_boot_directory
set config ""
@ -330,16 +327,7 @@ install_config $config
# non PCI devices for platform_drv, e.g. ps2/pit
file copy [select_from_repositories board/[board]/devices] [run_dir]/genode/devices
set boot_modules {
core ld.lib.so init timer
report_rom dynamic_rom rom_filter
acpi_drv pc_platform_drv pci_decode
pc_intel_fb_drv test-framebuffer vesa_fb_drv intel_gpu_drv boot_fb_drv
acpica
test-suspend
}
build_boot_image $boot_modules
build_boot_image [build_artifacts]
# qemu machine model q35 and multiple CPUs don't work with NOVA kernel
#

8
repos/libports/run/extract.run
View File

@ -42,13 +42,9 @@ install_config {
exec tar cJf [run_dir]/genode/test.tar.xz -C [genode_dir] tool/depot
exec xz < [genode_dir]/LICENSE > [run_dir]/genode/LICENSE.xz
build { app/extract }
build { app/extract lib/libc lib/vfs lib/libarchive lib/liblzma lib/zlib }
build_boot_image {
extract
libc.lib.so vfs.lib.so
libarchive.lib.so liblzma.lib.so zlib.lib.so
}
build_boot_image [build_artifacts]
append qemu_args " -nographic "

16
repos/libports/run/fatfs_blkio.run
View File

@ -1,9 +1,3 @@
#
# \brief Test of FatFS block-io implementation
# \author Emery Hemingway
# \date 2017-07-31
#
if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
puts "Test only runs in Qemu or Linux.\n";
exit 0
@ -16,7 +10,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/vfs_block \
[depot_user]/src/vfs_import
build { test/fatfs_block_io }
build { test/fatfs_block_io lib/libc lib/vfs }
install_config {
<config>
@ -67,13 +61,7 @@ set cmd "dd if=/dev/zero of=$disk_image bs=512 count=4096"
puts "creating disk image: $cmd"
catch { exec sh -c $cmd }
build_boot_image {
libc.lib.so vfs.lib.so
libm.lib.so
vfs_import.lib.so
test-fatfs_block_io
test.hda
}
build_boot_image [list {*}[build_artifacts] test.hda]
append qemu_args " -nographic "

2
repos/libports/run/fetchurl.inc
View File

@ -148,7 +148,7 @@ install_config {
}
#build { }
build_boot_image { }
build_boot_image [build_artifacts]
append qemu_args " -nographic "
append_qemu_nic_args

41
repos/libports/run/fs_rom_update_fat.run
View File

@ -1,10 +1,8 @@
#
# Build
#
set build_components {
core init timer
build {
core init timer lib/ld
app/rom_logger
app/rom_to_file
lib/vfs
lib/vfs_fatfs
lib/vfs_import
server/dynamic_rom
@ -13,18 +11,13 @@ set build_components {
server/vfs
}
build $build_components
create_boot_directory
set mkfs_cmd [installed_command mkfs.vfat]
catch { exec $mkfs_cmd -C bin/fat.img -n "ROM_UPDATE" 64 }
#
# Generate config
#
append config {
install_config {
<config>
<parent-provides>
<service name="CPU"/>
@ -121,31 +114,9 @@ append config {
</start>
</config>}
install_config $config
build_boot_image [list {*}[build_artifacts] fat.img]
#
# Boot modules
#
# generic modules
set boot_modules {
core ld.lib.so init
dynamic_rom
fat.img
fs_rom
vfs_block
rom_logger
rom_to_file
timer
vfs
vfs.lib.so
vfs_fatfs.lib.so
vfs_import.lib.so
}
build_boot_image $boot_modules
append qemu_args " -nographic"
append qemu_args " -nographic "
run_genode_until {.*<config iteration="4" />.*} 60

4
repos/libports/run/ieee754.run
View File

@ -7,7 +7,7 @@ if {[have_board rpi]} {
exit 0
}
build "core init test/ieee754"
build { core init lib/ld test/ieee754 lib/posix lib/libc lib/vfs }
create_boot_directory
install_config {
@ -58,7 +58,7 @@ install_config {
</config>
}
build_boot_image "core ld.lib.so init test-ieee754 posix.lib.so libc.lib.so libm.lib.so vfs.lib.so"
build_boot_image [build_artifacts]
append qemu_args "-nographic "

7
repos/libports/run/libc.run
View File

@ -1,4 +1,4 @@
build "core init timer test/libc"
build { core init timer lib/ld lib/libc lib/vfs lib/posix test/libc }
create_boot_directory
@ -32,10 +32,7 @@ install_config {
</config>
}
build_boot_image {
core init timer test-libc
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
}
build_boot_image [build_artifacts]
append qemu_args " -nographic "

11
repos/libports/run/libc_block.run
View File

@ -6,9 +6,8 @@ if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
create_boot_directory
build {
core init timer
core init timer lib/ld lib/libc lib/posix lib/vfs_import
server/vfs_block
lib/vfs_import
test/libc_block
}
@ -70,13 +69,7 @@ set cmd "dd if=/dev/zero of=$disk_image bs=1024 count=65536"
puts "creating disk image: $cmd"
catch { exec sh -c $cmd }
# generic modules
build_boot_image {
core init timer
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
vfs_block vfs_import.lib.so
test-libc_block test.hda
}
build_boot_image [list {*}[build_artifacts] test.hda]
append qemu_args " -nographic "

39
repos/libports/run/libc_component.run
View File

@ -1,21 +1,11 @@
#
# Build
#
set build_components {
core init timer server/terminal_crosslink
test/libc_counter test/libc_component
build {
core init timer lib/ld lib/libc lib/vfs lib/posix
server/terminal_crosslink test/libc_counter test/libc_component
}
build $build_components
create_boot_directory
#
# Generate config
#
append config {
install_config {
<config verbose="yes">
<parent-provides>
<service name="ROM"/>
@ -76,26 +66,9 @@ append config {
</config>
}
install_config $config
build_boot_image [build_artifacts]
#
# Boot modules
#
set boot_modules {
core init timer terminal_crosslink
test-libc_counter-source test-libc_component
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
}
build_boot_image $boot_modules
append qemu_args "-nographic "
#
# Execute test case
#
append qemu_args " -nographic "
run_genode_until forever
run_genode_until "child \"test-libc_counter-sink\" exited with exit value 0.*\n" 30

2
repos/libports/run/libc_getaddrinfo.run
View File

@ -107,7 +107,7 @@ install_config {
</config>
}
build_boot_image { test-libc_getaddrinfo }
build_boot_image [build_artifacts]
append qemu_args " -nographic "
append_qemu_nic_args

12
repos/libports/run/libc_getpwent.run
View File

@ -1,4 +1,7 @@
build "core init app/sequence server/vfs test/libc_getpwent"
build {
core init lib/ld lib/libc lib/vfs lib/posix
app/sequence server/vfs test/libc_getpwent
}
create_boot_directory
@ -66,12 +69,9 @@ install_config {
</config>
}
build_boot_image {
core init vfs sequence test-libc_getpwent
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
}
build_boot_image [build_artifacts]
append qemu_args " -nographic "
append qemu_args " -nographic "
run_genode_until "child .* exited with exit value 0.*\n" 20

17
repos/libports/run/libc_integration.run
View File

@ -46,14 +46,6 @@ if { [get_cmd_switch --autopilot] } {
create_boot_directory
set build_components {
test/libc_integration
}
set boot_modules {
test-libc_integration
}
import_from_depot [depot_user]/src/[base_src]
import_from_depot [depot_user]/src/init
import_from_depot [depot_user]/src/libc
@ -63,10 +55,9 @@ import_from_depot [depot_user]/src/vfs
import_from_depot [depot_user]/src/vfs_pipe \
[depot_user]/src/vfs_jitterentropy
build $build_components
build { test/libc_integration }
set config {}
append config {
install_config {
<config prio_levels="2">
<parent-provides>
<service name="ROM"/>
@ -111,9 +102,7 @@ append config {
</config>
}
install_config $config
build_boot_image $boot_modules
build_boot_image [build_artifacts]
append qemu_args " -nographic -smp 10 "

17
repos/libports/run/libc_select.run
View File

@ -1,14 +1,11 @@
set build_components {
core init timer server/terminal_crosslink
test/libc_select test/libc_counter
lib/vfs_pipe
build {
core init timer lib/ld lib/libc lib/vfs lib/posix lib/stdcxx lib/vfs_pipe
server/terminal_crosslink test/libc_select test/libc_counter
}
build $build_components
create_boot_directory
set config {
install_config {
<config>
<parent-provides>
<service name="ROM"/>
@ -65,17 +62,13 @@ set config {
</config>
}
install_config $config
set boot_modules {
build_boot_image {
core init timer terminal_crosslink
test-libc_counter-source test-libc_select
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so
vfs_pipe.lib.so posix.lib.so
}
build_boot_image $boot_modules
append qemu_args " -nographic "
run_genode_until "child \"test-libc_select\" exited with exit value 0.*\n" 120

37
repos/libports/run/libc_vfs_component.run
View File

@ -1,21 +1,11 @@
#
# Build
#
set build_components {
core init timer server/terminal_crosslink server/vfs
test/libc_counter test/libc_component
build {
core init timer lib/ld lib/libc lib/vfs lib/posix
server/terminal_crosslink server/vfs test/libc_counter test/libc_component
}
build $build_components
create_boot_directory
#
# Generate config
#
append config {
install_config {
<config verbose="yes">
<parent-provides>
<service name="ROM"/>
@ -87,27 +77,10 @@ append config {
</config>
}
install_config $config
#
# Boot modules
#
set boot_modules {
core init timer terminal_crosslink vfs
test-libc_counter-source test-libc_component
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
}
build_boot_image $boot_modules
build_boot_image [build_artifacts]
append qemu_args "-nographic "
#
# Execute test case
#
run_genode_until forever
run_genode_until "child \"test-libc_counter-sink\" exited with exit value 0.*\n" 30

1
repos/libports/run/libc_vfs_fat.run
View File

@ -3,7 +3,6 @@ set mkfs_opts "-F32 -nlibc_vfs"
set test_build_components lib/vfs_fatfs
set test_vfs_config "<fatfs/>"
set test_boot_modules vfs_fatfs.lib.so
set use_vfs_server 0

14
repos/libports/run/libc_vfs_filesystem_test.inc
View File

@ -11,7 +11,6 @@
# \arg use_vfs_server
# \arg test_build_components
# \arg test_vfs_config
# \arg test_boot_modules
#
if {[catch { exec which $mkfs_cmd } ]} {
@ -26,7 +25,7 @@ if {[expr ![have_include "power_on/qemu"] && ![have_spec linux]]} {
# Build
#
set build_components { test/libc_vfs }
set build_components { test/libc_vfs lib/libc lib/vfs test/libc_vfs }
lappend build_components {*}$test_build_components
@ -138,16 +137,7 @@ catch { exec sh -c $cmd }
# Boot modules
#
# generic modules
append boot_modules {
libc.lib.so vfs.lib.so test-libc_vfs test.hda
}
lappend boot_modules {*}$test_boot_modules
build_boot_image $boot_modules
puts "#### boot_modules: $boot_modules"
build_boot_image [list {*}[build_artifacts] test.hda]
#
# Qemu

1
repos/libports/run/libc_vfs_fs_fat.run
View File

@ -8,7 +8,6 @@ set mkfs_opts "-F32 -nlibc_vfs"
set test_build_components lib/vfs_fatfs
set test_vfs_config "<fatfs/>"
set test_boot_modules vfs_fatfs.lib.so
set use_vfs_server 1

25
repos/libports/run/libc_vfs_select.run
View File

@ -1,14 +1,11 @@
set build_components {
core init timer server/terminal_crosslink server/vfs
test/libc_select test/libc_counter
lib/vfs_pipe
build {
core init timer lib/ld lib/libc lib/posix lib/vfs lib/vfs_pipe lib/stdcxx
server/terminal_crosslink server/vfs test/libc_select test/libc_counter
}
build $build_components
create_boot_directory
set config {
install_config {
<config>
<parent-provides>
<service name="ROM"/>
@ -29,10 +26,12 @@ set config {
<resource name="RAM" quantum="2M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="terminal_crosslink">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Terminal"/> </provides>
</start>
<start name="vfs">
<resource name="RAM" quantum="12M"/>
<provides> <service name="File_system"/> </provides>
@ -54,6 +53,7 @@ set config {
<libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/>
</config>
</start>
<start name="test-libc_select">
<resource name="RAM" quantum="4M"/>
<config>
@ -74,16 +74,7 @@ set config {
</config>
}
install_config $config
set boot_modules {
core init timer terminal_crosslink vfs
test-libc_counter-source test-libc_select
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so
vfs_pipe.lib.so posix.lib.so
}
build_boot_image $boot_modules
build_boot_image [build_artifacts]
append qemu_args " -nographic "

34
repos/libports/run/libc_vfs_tap.run
View File

@ -1,26 +1,14 @@
#
# Build
#
#
create_boot_directory
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/vfs_tap
set build_components {
core init timer
server/nic_router
test/libc_vfs_tap
build {
core init timer lib/libc lib/vfs lib/posix
server/nic_router test/libc_vfs_tap
}
build $build_components
#
# Generate config
#
append config {
install_config {
<config verbose="yes">
<parent-provides>
<service name="ROM"/>
@ -87,19 +75,7 @@ append config {
</config>
}
install_config $config
#
# Boot modules
#
set boot_modules {
core init timer test-libc_vfs_tap nic_router
libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
}
build_boot_image $boot_modules
build_boot_image [build_artifacts]
append qemu_args "-nographic "

8
repos/libports/run/libc_with_libc.run
View File

@ -1,4 +1,4 @@
build { core init timer test/libc_with_libc }
build { core init timer lib/ld lib/libc lib/vfs test/libc_with_libc }
create_boot_directory
@ -32,11 +32,7 @@ install_config {
</start>
</config>}
build_boot_image {
core init timer
ld.lib.so libc.lib.so vfs.lib.so
test-libc_with_libc
}
build_boot_image [build_artifacts]
append qemu_args " -nographic "

2
repos/libports/run/lwip.run
View File

@ -130,7 +130,7 @@ install_config {
build { test/lwip/http_srv }
build_boot_image { test-lwip_httpsrv }
build_boot_image [build_artifacts]
#
# Qemu config

36
repos/libports/run/lwip_lx.run
View File

@ -22,26 +22,14 @@
assert_spec linux
#
# Build
#
build {
core init timer
drivers/nic
test/lwip/http_srv
lib/vfs_lwip
server/nic_router
server/report_rom
core init timer lib/ld lib/libc lib/vfs lib/vfs_lwip
drivers/nic test/lwip/http_srv server/nic_router server/report_rom
}
create_boot_directory
#
# Generate config
#
set config {
install_config {
<config verbose="yes">
<parent-provides>
@ -127,23 +115,7 @@ set config {
</config>
}
install_config $config
#
# Boot modules
#
set boot_modules {
core init timer linux_nic_drv
ld.lib.so libc.lib.so vfs.lib.so vfs_lwip.lib.so test-lwip_httpsrv
nic_router report_rom
}
build_boot_image $boot_modules
#
# Execute test case
#
build_boot_image [build_artifacts]
run_genode_until forever

7
repos/libports/run/memcpy.run
View File

@ -5,7 +5,7 @@ if { [get_cmd_switch --autopilot] } {
}
}
build "core init test/memcpy"
build { core init lib/ld lib/libc lib/vfs test/memcpy }
create_boot_directory
@ -35,10 +35,7 @@ install_config {
</config>
}
build_boot_image {
core init test-memcpy
ld.lib.so libc.lib.so vfs.lib.so
}
build_boot_image [build_artifacts]
append qemu_args " -nographic "

18
repos/libports/run/mupdf.run
View File

@ -1,6 +1,10 @@
build { app/pdf_view }
build {
lib/libc lib/vfs lib/openjpeg lib/freetype lib/libpng lib/zlib lib/jbig2dec
lib/mupdf lib/jpeg app/pdf_view
}
create_boot_directory
import_from_depot \
[depot_user]/pkg/[drivers_interactive_pkg] \
[depot_user]/pkg/motif_wm \
@ -25,10 +29,12 @@ install_config {
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
</start>
<start name="drivers" caps="1500" managing_system="yes">
<resource name="RAM" quantum="64M"/>
<binary name="init"/>
@ -50,7 +56,7 @@ install_config {
<capture/> <event/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />
<domain name="default" layer="2" content="client" label="no" hover="always"/>
<domain name="default" layer="2" content="client" label="no" hover="always" width="1024" height="768"/>
<policy label_prefix="pointer" domain="pointer"/>
<default-policy domain="default"/>
@ -111,13 +117,7 @@ set fd [open [run_dir]/genode/focus w]
puts $fd "<focus label=\"wm -> focus\"/>"
close $fd
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
pdf_view
test.pdf
}
build_boot_image [list {*}[build_artifacts] test.pdf]
append qemu_args " -m 800"

5
repos/libports/run/nic_bridge.run
View File

@ -166,10 +166,7 @@ install_config {
</start>
</config>}
build_boot_image {
test-http_clnt
test-lwip_httpsrv
}
build_boot_image [build_artifacts]
append qemu_args " -nographic "
append_qemu_nic_args

25
repos/libports/run/oss.run
View File

@ -1,23 +1,19 @@
assert_spec x86
if {[have_board linux]} {
puts "Run script does not support Linux."
exit 0
puts "Run script does not support Linux."
exit 0
}
if {[have_include "power_on/qemu"]} {
puts "Run script does not support Qemu"
exit 0
puts "Run script does not support Qemu"
exit 0
}
build {
core init timer
drivers/acpi
drivers/audio
drivers/platform
app/pci_decode
server/report_rom
lib/vfs_oss test/oss
core init timer lib/ld lib/libc lib/vfs lib/posix lib/vfs_oss
drivers/acpi drivers/audio drivers/platform app/pci_decode
server/report_rom test/oss
}
create_boot_directory
@ -121,11 +117,6 @@ install_config {
</config>
}
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
}
build_boot_image [build_artifacts]
run_genode_until forever

14
repos/libports/run/pcg32.run
View File

@ -1,11 +1,4 @@
#
# \brief Test of the PCG32 library
# \author Emery Hemingway
# \date 2017-08-23
#
build "core init test/pcg32"
build { core init lib/ld lib/libc lib/vfs lib/posix test/pcg32 }
create_boot_directory
@ -37,10 +30,7 @@ install_config {
</config>
}
build_boot_image {
core init test-pcg32
ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
}
build_boot_image [build_artifacts]
append qemu_args " -nographic "

5
repos/libports/run/sntp_client.run
View File

@ -20,7 +20,7 @@ import_from_depot [depot_user]/src/[base_src] \
build { app/sntp_client }
append config {
install_config {
<config>
<parent-provides>
<service name="ROM"/>
@ -106,8 +106,7 @@ append config {
</start>
</config>}
install_config $config
build_boot_image { sntp_client }
build_boot_image [build_artifacts]
append qemu_args " -nographic "
append_qemu_nic_args

10
repos/libports/run/system_rtc.run
View File

@ -1,5 +1,3 @@
# RTC test
assert_spec x86
if {[expr ![have_include power_on/qemu] && ![have_spec linux]]} {
@ -16,8 +14,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/posix \
[depot_user]/pkg/system_rtc-[board]
set config {
install_config {
<config prio_levels="2" verbose="yes">
<parent-provides>
<service name="ROM"/>
@ -86,11 +83,8 @@ set config {
</config>
}
install_config $config
build { test/system_rtc test/libc_rtc }
set build_components { test/system_rtc test/libc_rtc }
build $build_components
build_boot_image [build_artifacts]
append qemu_args " -nographic "

11
repos/libports/run/vfs_lwip.inc
View File

@ -1,11 +0,0 @@
proc append_socket_fs_build_components { } {
global build_components
append build_components { lib/vfs_lwip }
}
proc socket_fs_plugin {} { return lwip }
proc append_socket_fs_boot_modules {} {
global boot_modules
append boot_modules { vfs_lwip.lib.so }
}