From 67741655d17b79de080a924072bb4806b548c0be Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 24 Nov 2023 12:26:29 +0100 Subject: [PATCH] dde_rump: use [build_artifacts] in run scripts Issue #4860 --- repos/dde_rump/run/fs_rom_update_ext2.run | 46 ++++------------------ repos/dde_rump/run/libc_vfs_ext2.run | 6 --- repos/dde_rump/run/libc_vfs_fs_ext2.run | 6 --- repos/dde_rump/run/rump_ext2.run | 39 +++++-------------- repos/dde_rump/run/rump_fat.run | 47 ++++++----------------- repos/dde_rump/run/rump_iso.run | 44 ++++++--------------- repos/dde_rump/run/vfs_stress_ext2.run | 25 ++++-------- repos/dde_rump/run/vfs_stress_rump_fs.run | 28 +++++--------- 8 files changed, 58 insertions(+), 183 deletions(-) diff --git a/repos/dde_rump/run/fs_rom_update_ext2.run b/repos/dde_rump/run/fs_rom_update_ext2.run index d403b695a5..7aea7e15a1 100644 --- a/repos/dde_rump/run/fs_rom_update_ext2.run +++ b/repos/dde_rump/run/fs_rom_update_ext2.run @@ -1,8 +1,5 @@ -# -# Build -# -set build_components { - core init timer +build { + core lib/ld init timer lib/vfs app/rom_logger app/rom_to_file lib/vfs_rump @@ -13,8 +10,6 @@ set build_components { server/vfs } -build $build_components - create_boot_directory catch { exec dd if=/dev/zero of=bin/ext2.img bs=1024 count=8192 } @@ -23,10 +18,7 @@ set mkfs_cmd [installed_command mkfs.ext2] catch { exec $mkfs_cmd -F bin/ext2.img } -# -# Generate config -# -append config { +install_config { @@ -61,7 +53,7 @@ append config { - + @@ -95,7 +87,9 @@ append config { - + + + @@ -121,31 +115,7 @@ append config { } -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core ld.lib.so init - dynamic_rom - ext2.img - fs_rom - vfs_block - rom_logger - rom_to_file - rump_fs.lib.so - rump.lib.so - timer - vfs - vfs.lib.so - vfs_rump.lib.so - vfs_import.lib.so -} - -build_boot_image $boot_modules +build_boot_image [list {*}[build_artifacts] ext2.img] append qemu_args " -nographic" diff --git a/repos/dde_rump/run/libc_vfs_ext2.run b/repos/dde_rump/run/libc_vfs_ext2.run index 12b02f39e1..e2c39b0f5b 100644 --- a/repos/dde_rump/run/libc_vfs_ext2.run +++ b/repos/dde_rump/run/libc_vfs_ext2.run @@ -5,12 +5,6 @@ set test_build_components "lib/vfs_rump" set test_vfs_config "" -set test_boot_modules { - rump_fs.lib.so - rump.lib.so - vfs_rump.lib.so -} - set use_vfs_server 0 source ${genode_dir}/repos/libports/run/libc_vfs_filesystem_test.inc diff --git a/repos/dde_rump/run/libc_vfs_fs_ext2.run b/repos/dde_rump/run/libc_vfs_fs_ext2.run index 653d6e740c..2a60c39ab1 100644 --- a/repos/dde_rump/run/libc_vfs_fs_ext2.run +++ b/repos/dde_rump/run/libc_vfs_fs_ext2.run @@ -10,12 +10,6 @@ set test_build_components "lib/vfs_rump" set test_vfs_config "" -set test_boot_modules { - rump_fs.lib.so - rump.lib.so - vfs_rump.lib.so -} - set use_vfs_server 1 source ${genode_dir}/repos/libports/run/libc_vfs_filesystem_test.inc diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 00697e0dfa..df69d7dfbb 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -7,17 +7,8 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} { exit 0 } -# -# Check used commands -# -set mke2fs [installed_command mke2fs] -set dd [installed_command dd] - -# -# Build -# -set build_components { - core init timer +build { + core init timer lib/ld lib/libc lib/vfs server/vfs_block server/vfs lib/vfs_rump @@ -25,7 +16,11 @@ set build_components { test/libc_vfs } -build $build_components +# +# Check used commands +# +set mke2fs [installed_command mke2fs] +set dd [installed_command dd] # # Build EXT2-file-system image @@ -35,10 +30,7 @@ catch { exec $mke2fs -F bin/ext2.raw } create_boot_directory -# -# Generate config -# -append config { +install_config { @@ -92,20 +84,7 @@ append config { } -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core ld.lib.so init timer test-libc_vfs vfs_block - rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so - ext2.raw libc.lib.so vfs.lib.so vfs_import.lib.so -} - -build_boot_image $boot_modules +build_boot_image [list {*}[build_artifacts] ext2.raw] append qemu_args " -nographic" diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run index 7dda62dcde..9ba6999572 100644 --- a/repos/dde_rump/run/rump_fat.run +++ b/repos/dde_rump/run/rump_fat.run @@ -1,5 +1,12 @@ -if {[have_spec arm]} { - assert_spec arm_v7 +if {[have_spec arm]} { assert_spec arm_v7 } + +build { + core lib/ld init timer lib/vfs lib/libc + server/vfs_block + server/vfs + lib/vfs_rump + lib/vfs_import + test/libc_vfs } # @@ -8,20 +15,6 @@ if {[have_spec arm]} { set mkfs [installed_command mkfs.vfat] set dd [installed_command dd] -# -# Build -# -set build_components { - core init timer - server/vfs_block - server/vfs - lib/vfs_rump - lib/vfs_import - test/libc_vfs -} - -build $build_components - # # Build FAT-file-system image # @@ -30,10 +23,7 @@ catch { exec $mkfs -F16 bin/fs.raw } create_boot_directory -# -# Generate config -# -append config { +install_config { @@ -68,7 +58,7 @@ append config { - + @@ -89,20 +79,7 @@ append config { } -install_config $config - -# -# Boot modules -# - -# generic modules -set boot_modules { - core ld.lib.so init timer test-libc_vfs vfs_block - rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so - fs.raw libc.lib.so vfs.lib.so vfs_import.lib.so -} - -build_boot_image $boot_modules +build_boot_image [list {*}[build_artifacts] fs.raw] append qemu_args " -nographic " diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run index ea0ff8aa4a..af3f0e8c16 100644 --- a/repos/dde_rump/run/rump_iso.run +++ b/repos/dde_rump/run/rump_iso.run @@ -1,17 +1,7 @@ -if {[have_spec arm]} { - assert_spec arm_v7 -} +if {[have_spec arm]} { assert_spec arm_v7 } -# -# Check used commands -# -set mkisofs [installed_command mkisofs] - -# -# Build -# -set build_components { - core init timer +build { + core lib/ld init timer lib/vfs server/fs_rom server/vfs_block server/vfs @@ -19,13 +9,9 @@ set build_components { test/iso } -build $build_components create_boot_directory -# -# Generate config -# -append config { +install_config { @@ -57,7 +43,7 @@ append config { - + @@ -78,6 +64,11 @@ append config { } +# +# Check used commands +# +set xorrisofs [installed_command xorrisofs] + # # Create iso # @@ -88,21 +79,10 @@ for { set i 1 } { $i <= 30 } { incr i } { } exec rm -f bin/fs.iso -catch { exec $mkisofs -l -R -hide-rr-moved -jcharset utf-8 -o bin/fs.iso [run_dir]} +catch { exec $xorrisofs -l -R -hide-rr-moved -o bin/fs.iso [run_dir]} -install_config $config - -# -# Boot modules -# -set boot_modules { - core ld.lib.so init timer test-iso vfs_block - rump.lib.so rump_fs.lib.so vfs_rump.lib.so vfs vfs.lib.so - fs.iso fs_rom -} - -build_boot_image $boot_modules +build_boot_image [list {*}[build_artifacts] fs.iso] append qemu_args "-nographic " diff --git a/repos/dde_rump/run/vfs_stress_ext2.run b/repos/dde_rump/run/vfs_stress_ext2.run index 9659b6821c..8238c450d6 100644 --- a/repos/dde_rump/run/vfs_stress_ext2.run +++ b/repos/dde_rump/run/vfs_stress_ext2.run @@ -4,21 +4,19 @@ # \date 2015-08-30 # -# -# Check used commands -# -set mke2fs [installed_command mke2fs] -set dd [installed_command dd] - -set build_components { - core init timer +build { + core lib/ld init timer lib/vfs test/vfs_stress server/vfs_block lib/vfs_rump lib/vfs_import } -build $build_components +# +# Check used commands +# +set mke2fs [installed_command mke2fs] +set dd [installed_command dd] # # Build EXT2-file-system image @@ -69,14 +67,7 @@ install_config { } -set boot_modules { - core init ld.lib.so timer vfs_stress - rump.lib.so rump_fs.lib.so - vfs.lib.so vfs_rump.lib.so vfs_import.lib.so - vfs_block ext2.raw -} - -build_boot_image $boot_modules +build_boot_image [list {*}[build_artifacts] ext2.raw] append qemu_args "-nographic -smp cpus=6" diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run index 936b901b88..ff5a669e67 100644 --- a/repos/dde_rump/run/vfs_stress_rump_fs.run +++ b/repos/dde_rump/run/vfs_stress_rump_fs.run @@ -4,14 +4,8 @@ # \date 2015-08-30 # -# -# Check used commands -# -set mke2fs [installed_command mke2fs] -set dd [installed_command dd] - -set build_components { - core init timer +build { + core lib/ld init timer lib/vfs test/vfs_stress server/vfs server/vfs_block @@ -19,8 +13,11 @@ set build_components { lib/vfs_import } -build $build_components - +# +# Check used commands +# +set mke2fs [installed_command mke2fs] +set dd [installed_command dd] # # Build EXT2-file-system image @@ -76,16 +73,9 @@ install_config { - -} + } -set boot_modules { - core init ld.lib.so timer vfs_stress - rump.lib.so rump_fs.lib.so vfs vfs_rump.lib.so - vfs_block ext2.raw vfs.lib.so vfs_import.lib.so -} - -build_boot_image $boot_modules +build_boot_image [list {*}[build_artifacts] ext2.raw] append qemu_args "-nographic -smp cpus=6"