ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-21 06:33:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gems: use [build_artifacts] in run scripts

Browse Source 
Issue #4860
This commit is contained in:
Norman Feske 2023-11-17 18:11:02 +01:00 committed by Christian Helmuth
parent b843dbf045
commit 5a75a2f930
31 changed files with 56 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/gems/run/aes_cbc_4k.run
View File

@ -8,7 +8,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
exit 0 exit 0
} }
build "core init test/aes_cbc_4k" build { core lib/ld init lib/libc lib/vfs lib/libcrypto test/aes_cbc_4k }
create_boot_directory create_boot_directory
@ -132,10 +132,8 @@ if {$debug_steps} { exit 0 }
# #
# build and boot image # build and boot image
# #
set boot_modules { core ld.lib.so init }
append boot_modules { libc.lib.so vfs.lib.so libcrypto.lib.so test-aes_cbc_4k }
build_boot_image $boot_modules build_boot_image [build_artifacts]
append qemu_args "-nographic " append qemu_args "-nographic "

3
repos/gems/run/cpu_load_display.run
View File

@ -147,6 +147,7 @@ install_config {
</start> </start>
</config>} </config>}
build_boot_image {} build_boot_image [build_artifacts]
append qemu_args " -smp 4,cores=4 " append qemu_args " -smp 4,cores=4 "
run_genode_until forever run_genode_until forever

10
repos/gems/run/cpu_sampler.run
View File

@ -5,8 +5,8 @@ if { ![have_spec foc] && ![have_spec hw] && ![have_spec nova] &&
} }
set build_components { set build_components {
core init timer core lib/ld init timer
server/cpu_sampler server/cpu_sampler lib/cpu_sampler_platform
test/cpu_sampler test/cpu_sampler
} }
@ -74,11 +74,7 @@ proc binary_name_cpu_sampler_platform_lib_so { } {
} }
} }
build_boot_image { build_boot_image [build_artifacts]
core ld.lib.so init timer
cpu_sampler cpu_sampler_platform.lib.so
test-cpu_sampler
}
append qemu_args "-nographic " append qemu_args "-nographic "

2
repos/gems/run/decorator.run
View File

@ -176,6 +176,6 @@ install_config {
build { app/decorator } build { app/decorator }
build_boot_image { decorator } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

3
repos/gems/run/decorator_stress.run
View File

@ -103,7 +103,6 @@ install_config {
build { app/decorator test/decorator_stress } build { app/decorator test/decorator_stress }
build_boot_image { decorator test-decorator_stress } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

2
repos/gems/run/depot_autopilot.run
View File

@ -447,7 +447,7 @@ proc prepare_to_run_genode { } {
# Build boot image from boot modules # Build boot image from boot modules
# #
set boot_modules { depot_autopilot } set boot_modules [build_artifacts]
append boot_modules $test_modules append boot_modules $test_modules
build_boot_image $boot_modules build_boot_image $boot_modules

2
repos/gems/run/depot_deploy.run
View File

@ -293,7 +293,7 @@ set noswapfile
set viminfo=} set viminfo=}
close $vimrc_fd close $vimrc_fd
build_boot_image { depot_query depot_deploy } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

4
repos/gems/run/depot_download.run
View File

@ -164,9 +164,7 @@ copy_file [genode_dir]/repos/gems/recipes/raw/depot_download/depot_download.conf
build { app/depot_download_manager app/depot_query } build { app/depot_download_manager app/depot_query }
append boot_modules { depot_download_manager depot_query } build_boot_image [build_artifacts]
build_boot_image $boot_modules
append qemu_args " -nographic " append qemu_args " -nographic "
append_qemu_nic_args append_qemu_nic_args

2
repos/gems/run/depot_query.run
View File

@ -136,7 +136,7 @@ install_config {
</config>} </config>}
build_boot_image { init depot_query depot_deploy vfs.lib.so } build_boot_image [build_artifacts]
append qemu_args " -nographic " append qemu_args " -nographic "

10
repos/gems/run/driver_manager.run
View File

@ -138,16 +138,10 @@ set fd [open [run_dir]/genode/usb_policy "w"]
puts $fd {<usb/>} puts $fd {<usb/>}
close $fd close $fd
copy_file [genode_dir]/repos/gems/sculpt/drivers/pc \
#
# Override 'drivers.config' as supplied with the 'drivers_managed-pc' pkg
# with the (possibly modified) version found in the source tree. This avoids
# the need to re-create the pkg while testing modifications of this file.
#
copy_file [genode_dir]/repos/gems/recipes/raw/drivers_managed-pc/drivers.config \
[run_dir]/genode/drivers.config [run_dir]/genode/drivers.config
build_boot_image { driver_manager test-driver_manager ld.lib.so } build_boot_image [build_artifacts]
# #
# Build ext2 file-system images to be supplied to Qemu # Build ext2 file-system images to be supplied to Qemu

7
repos/gems/run/file_vault.inc
View File

@ -393,12 +393,7 @@ if {[have_board linux]} {
exec mkdir -p bin/file_vault_dir/trust_anchor exec mkdir -p bin/file_vault_dir/trust_anchor
} }
append boot_modules { append boot_modules [build_artifacts]
file_vault
file_vault-sync_to_tresor_vfs_init
file_vault-truncate_file
}
lappend_if [have_board linux] boot_modules file_vault_dir lappend_if [have_board linux] boot_modules file_vault_dir

2
repos/gems/run/fs_query.run
View File

@ -225,7 +225,7 @@ install_config {
build { app/sequence app/fs_query } build { app/sequence app/fs_query }
build_boot_image { sequence fs_query } build_boot_image [build_artifacts]
append qemu_args " -nographic " append qemu_args " -nographic "

10
repos/gems/run/gpt_write.run
View File

@ -6,7 +6,7 @@ assert_spec linux
# #
# Build # Build
# #
build { core init timer server/lx_block app/gpt_write } build { core lib/ld init timer server/lx_block app/gpt_write }
create_boot_directory create_boot_directory
@ -60,13 +60,7 @@ install_config {
# #
catch { exec dd if=/dev/zero of=bin/gpt.img bs=1M count=256 } catch { exec dd if=/dev/zero of=bin/gpt.img bs=1M count=256 }
# build_boot_image [list {*}[build_artifacts] gpt.img]
# Boot modules
#
build_boot_image {
core ld.lib.so init timer lx_block gpt_write
gpt.img
}
run_genode_until {child "gpt_write" exited with exit value 0.*\n} 10 run_genode_until {child "gpt_write" exited with exit value 0.*\n} 10

2
repos/gems/run/gui_fader.run
View File

@ -125,6 +125,6 @@ install_config {
build { server/gui_fader } build { server/gui_fader }
build_boot_image { gui_fader } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

2
repos/gems/run/menu_view.run
View File

@ -330,6 +330,6 @@ install_config {
build { app/menu_view } build { app/menu_view }
build_boot_image { menu_view menu_view_styles.tar } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

24
repos/gems/run/mixer_gui_qt_test.run
View File

@ -7,20 +7,16 @@ import_from_depot [depot_user]/src/dynamic_rom \
# Generate config # Generate config
# #
append config { install_config {
<config> <config>
<parent-provides>} <parent-provides>
append config [qt5_parent_provides] } [qt5_parent_provides] {
append config {
</parent-provides> </parent-provides>
<default caps="100"/> <default caps="100"/>
<default-route> <default-route>
<any-service> <parent/> <any-child/> </any-service> <any-service> <parent/> <any-child/> </any-service>
</default-route>} </default-route>
} [qt5_start_nodes] {
append config [qt5_start_nodes]
append config {
<start name="dynamic_rom"> <start name="dynamic_rom">
<resource name="RAM" quantum="4M"/> <resource name="RAM" quantum="4M"/>
<provides><service name="ROM"/></provides> <provides><service name="ROM"/></provides>
@ -80,15 +76,7 @@ append config {
</start> </start>
</config>} </config>}
install_config $config build_boot_image [qt5_boot_modules]
#
# Boot modules
#
append boot_modules [qt5_boot_modules]
build_boot_image $boot_modules
run_genode_until forever run_genode_until forever

6
repos/gems/run/nano3d.run
View File

@ -8,7 +8,7 @@ import_from_depot [depot_user]/src/[base_src] \
[depot_user]/src/dynamic_rom \ [depot_user]/src/dynamic_rom \
[depot_user]/src/nitpicker [depot_user]/src/nitpicker
append config { install_config {
<config> <config>
<parent-provides> <parent-provides>
<service name="ROM"/> <service name="ROM"/>
@ -112,10 +112,8 @@ append config {
</start> </start>
</config>} </config>}
install_config $config
build { app/nano3d } build { app/nano3d }
build_boot_image { nano3d } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

5
repos/gems/run/tcp_terminal.run
View File

@ -115,10 +115,7 @@ install_config {
</config> </config>
} }
build_boot_image { tcp_terminal } build_boot_image [build_artifacts]
# qemu config
append qemu_args " -nographic " append qemu_args " -nographic "
append_qemu_nic_args "hostfwd=tcp::5555-:8888" append_qemu_nic_args "hostfwd=tcp::5555-:8888"

2
repos/gems/run/terminal_echo.run
View File

@ -77,7 +77,7 @@ close $fd
build { server/terminal } build { server/terminal }
build_boot_image { terminal } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

2
repos/gems/run/terminal_log.run
View File

@ -94,6 +94,6 @@ install_config {
build { server/terminal_log test/nitpicker } build { server/terminal_log test/nitpicker }
build_boot_image { terminal_log testnit } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

4
repos/gems/run/text_area.run
View File

@ -147,8 +147,8 @@ set fd [open [run_dir]/genode/focus w]
puts $fd "<focus label=\"text_area.2 -> \"/>" puts $fd "<focus label=\"text_area.2 -> \"/>"
close $fd close $fd
build { app/text_area app/menu_view } build { app/text_area app/menu_view lib/vfs lib/sandbox }
build_boot_image { text_area sandbox.lib.so vfs.lib.so menu_view menu_view_styles.tar } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

2
repos/gems/run/text_painter.run
View File

@ -99,6 +99,6 @@ set fd [open [run_dir]/genode/focus w]
puts $fd "<focus label=\"gui_fb -> \" domain=\"default\"/>" puts $fd "<focus label=\"gui_fb -> \" domain=\"default\"/>"
close $fd close $fd
build_boot_image { vfs test-text_painter vfs_ttf.lib.so } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever

15
repos/gems/run/tiled_wm.run
View File

@ -33,7 +33,7 @@ proc qt5_decorator_config { } {
</config>} </config>}
} }
append config { install_config {
<config> <config>
<parent-provides>} [qt5_parent_provides] { <parent-provides>} [qt5_parent_provides] {
</parent-provides> </parent-provides>
@ -219,18 +219,7 @@ append config {
</config> </config>
} }
install_config $config build_boot_image [qt5_boot_modules]
# for debugging only
#append build_components { app/window_layouter app/themed_decorator }
#build $build_components
append boot_modules [qt5_boot_modules]
# for debugging only
#append boot_modules { window_layouter themed_decorator }
build_boot_image $boot_modules
run_genode_until forever run_genode_until forever

4
repos/gems/run/trace_recorder.run
View File

@ -149,9 +149,7 @@ install_config {
exec rm -rf bin/fs exec rm -rf bin/fs
exec mkdir -p bin/fs exec mkdir -p bin/fs
build_boot_image { lx_fs build_boot_image [list {*}[build_artifacts] fs]
fs
ping }
append qemu_args " -nographic " append qemu_args " -nographic "

3
repos/gems/run/trace_recorder_ctf.run
View File

@ -159,8 +159,7 @@ install_config {
exec rm -rf bin/fs exec rm -rf bin/fs
exec mkdir -p bin/fs exec mkdir -p bin/fs
build_boot_image { lx_fs build_boot_image [list {*}[build_artifacts] fs]
fs }
append qemu_args " -nographic " append qemu_args " -nographic "

4
repos/gems/run/trace_recorder_pcapng.run
View File

@ -129,9 +129,7 @@ install_config {
exec rm -rf bin/fs exec rm -rf bin/fs
exec mkdir -p bin/fs/ exec mkdir -p bin/fs/
build_boot_image { lx_fs build_boot_image [list {*}[build_artifacts] fs]
fs
ping }
append qemu_args " -nographic " append qemu_args " -nographic "

28
repos/gems/run/tresor_tester.run
View File

@ -58,10 +58,8 @@ proc jent_avail { } {
} }
append build_components { append build_components {
core core lib/ld init timer
init server/vfs lib/vfs lib/libc lib/libcrypto
timer
server/vfs
app/tresor_tester app/tresor_tester
server/log_terminal server/log_terminal
server/report_rom server/report_rom
@ -1115,27 +1113,9 @@ if {[have_board linux]} {
} }
} }
append boot_modules { set boot_modules [build_artifacts]
core
init
timer
tresor_tester
ld.lib.so
log_terminal
report_rom
vfs
libc.lib.so
libcrypto.lib.so
vfs.lib.so
vfs_tresor_trust_anchor.lib.so
vfs_tresor_crypto_aes_cbc.lib.so
vfs_import.lib.so
}
append_if [jent_avail] boot_modules { vfs_jitterentropy.lib.so } lappend_if [have_board linux] boot_modules [tresor_image_name]
append_if [have_board linux] boot_modules { lx_fs }
append_if [have_board linux] boot_modules [tresor_image_name]
build_boot_image $boot_modules build_boot_image $boot_modules

4
repos/gems/run/vfs_import.run
View File

@ -3,7 +3,7 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
exit 0 exit 0
} }
build { app/sequence server/vfs lib/vfs_import test/libc } build { app/sequence server/vfs lib/libc lib/vfs lib/vfs_import test/libc }
create_boot_directory create_boot_directory
@ -104,7 +104,7 @@ install_config {
</config> </config>
} }
build_boot_image { vfs_import.lib.so libc.lib.so vfs vfs.lib.so sequence } build_boot_image [build_artifacts]
append qemu_args " -nographic " append qemu_args " -nographic "

36
repos/gems/run/vfs_tresor.run
View File

@ -17,9 +17,7 @@ import_from_depot [depot_user]/pkg/[drivers_interactive_pkg] \
build { build {
core core lib/ld timer init
timer
init
server/lx_fs server/lx_fs
lib/vfs_tresor lib/vfs_tresor
lib/vfs_tresor_crypto_aes_cbc lib/vfs_tresor_crypto_aes_cbc
@ -28,6 +26,7 @@ build {
lib/vfs_import lib/vfs_import
lib/vfs_jitterentropy lib/vfs_jitterentropy
lib/vfs_pipe lib/vfs_pipe
lib/vfs lib/libc lib/posix lib/libcrypto
test/vfs_stress test/vfs_stress
test/libc test/libc
server/log_terminal server/log_terminal
@ -295,35 +294,10 @@ set shell_script "run/vfs_tresor.sh"
set repo "[repository_contains $shell_script]" set repo "[repository_contains $shell_script]"
exec cp $repo/$shell_script bin/ exec cp $repo/$shell_script bin/
append boot_modules { set boot_modules [build_artifacts]
lx_fs
tresor_init_trust_anchor
vfs_tresor.lib.so
vfs_tresor_crypto_aes_cbc.lib.so
vfs_tresor_crypto_memcopy.lib.so
vfs_tresor_trust_anchor.lib.so
vfs_tresor.sh
vfs.lib.so
vfs_import.lib.so
vfs_jitterentropy.lib.so
vfs_pipe.lib.so
posix.lib.so
libc.lib.so
libcrypto.lib.so
log_terminal
fs_rom
report_rom
sequence
init
core
timer
ld.lib.so
}
append boot_modules { append boot_modules { vfs_tresor.sh encrypted_private_key superblock_hash }
encrypted_private_key superblock_hash lappend boot_modules [tresor_image_file]
}
append boot_modules [tresor_image_file]
set fd [open [run_dir]/genode/focus w] set fd [open [run_dir]/genode/focus w]
puts $fd "<focus label=\"terminal_service -> \" domain=\"default\"/>" puts $fd "<focus label=\"terminal_service -> \" domain=\"default\"/>"

31
repos/gems/run/vfs_tresor_init.run
View File

@ -11,11 +11,11 @@ proc tresor_image_size_mb { } {
return $image_size return $image_size
} }
append build_components { build {
core init timer core lib/ld init timer
server/lx_block server/lx_block
server/lx_fs server/lx_fs
server/vfs server/vfs lib/vfs
app/sequence app/sequence
app/tresor_init_trust_anchor app/tresor_init_trust_anchor
@ -27,8 +27,6 @@ append build_components {
lib/libcrypto lib/libcrypto
} }
build $build_components
create_boot_directory create_boot_directory
append config { append config {
@ -147,28 +145,7 @@ install_config $config
exec rm -rf bin/[tresor_image_file] exec rm -rf bin/[tresor_image_file]
exec truncate -s [tresor_image_size_mb]M bin/[tresor_image_file] exec truncate -s [tresor_image_size_mb]M bin/[tresor_image_file]
append boot_modules { build_boot_image [list {*}[build_artifacts] [tresor_image_file]]
core
init
timer
lx_block
lx_fs
sequence
vfs
vfs.lib.so
vfs_jitterentropy.lib.so
ld.lib.so
libcrypto.lib.so
libc.lib.so
tresor_init_trust_anchor
tresor_init
vfs_tresor_trust_anchor.lib.so
vfs_tresor_crypto_aes_cbc.lib.so
}
append boot_modules [tresor_image_file]
build_boot_image $boot_modules
run_genode_until {.*child "initialize_tresor" exited with exit value 0.*\n} 240 run_genode_until {.*child "initialize_tresor" exited with exit value 0.*\n} 240

2
repos/gems/run/wm.run
View File

@ -158,6 +158,6 @@ copy_file [genode_dir]/repos/gems/recipes/raw/motif_wm/wm.config [run_dir]/genod
build { app/window_layouter app/decorator server/nitpicker server/wm test/nitpicker } build { app/window_layouter app/decorator server/nitpicker server/wm test/nitpicker }
build_boot_image { window_layouter decorator nitpicker wm testnit } build_boot_image [build_artifacts]
run_genode_until forever run_genode_until forever