dde_rump: use [build_artifacts] in run scripts

Issue #4860

repos/dde_rump/run/fs_rom_update_ext2.run

@@ -1,8 +1,5 @@
-#
+build {
-# Build
+	core lib/ld init timer lib/vfs
-#
-set build_components {
-	core init timer
 	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 }
 
-#
+install_config {
-# Generate config
-#
-append config {
 <config>
 	<parent-provides>
 		<service name="CPU"/>
@@ -61,7 +53,7 @@ append config {
 		</config>
 	</start>
 	<start name="vfs" caps="256">
-		<resource name="RAM" quantum="10M"/>
+		<resource name="RAM" quantum="20M"/>
 		<provides><service name="File_system"/></provides>
 		<config>
 			<vfs> <rump fs="ext2fs" ram="8M"/> </vfs>
@@ -95,7 +87,9 @@ append config {
 	</start>
 	<start name="rom_to_file">
 		<resource name="RAM" quantum="2M"/>
-		<config rom="dynamic_rom"/>
+		<config rom="dynamic_rom">
+			<vfs> <fs/> </vfs>
+		</config>
 		<route>
 			<service name="ROM" label="dynamic_rom"> <child name="dynamic_rom"/> </service>
 			<service name="File_system" > <child name="vfs"/> </service>
@@ -121,31 +115,7 @@ append config {
 	</start>
 </config>}
 
-install_config $config
+build_boot_image [list {*}[build_artifacts] ext2.img]
-
-#
-# 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
 
 append qemu_args "  -nographic"
 

repos/dde_rump/run/libc_vfs_ext2.run

@@ -5,12 +5,6 @@ set test_build_components "lib/vfs_rump"
 
 set test_vfs_config "<rump fs=\"ext2fs\" ram=\"10M\" writeable=\"yes\"/>"
 
-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

repos/dde_rump/run/libc_vfs_fs_ext2.run

@@ -10,12 +10,6 @@ set test_build_components "lib/vfs_rump"
 
 set test_vfs_config "<rump fs=\"ext2fs\" ram=\"10M\" writeable=\"yes\"/>"
 
-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

repos/dde_rump/run/rump_ext2.run

@@ -7,17 +7,8 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	exit 0
 }
 
-#
+build {
-# Check used commands
+	core init timer lib/ld lib/libc lib/vfs
-#
-set mke2fs [installed_command mke2fs]
-set dd     [installed_command dd]
-
-#
-# Build
-#
-set build_components {
-	core init timer
 	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
 
-#
+install_config {
-# Generate config
-#
-append config {
 <config verbose="yes">
 	<parent-provides>
 		<service name="ROM"/>
@@ -92,20 +84,7 @@ append config {
 	</start>
 </config>}
 
-install_config $config
+build_boot_image [list {*}[build_artifacts] ext2.raw]
-
-#
-# 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
 
 append qemu_args "  -nographic"
 

repos/dde_rump/run/rump_fat.run

@@ -1,5 +1,12 @@
-if {[have_spec arm]} {
+if {[have_spec arm]} { assert_spec arm_v7 }
-   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
 
-#
+install_config {
-# Generate config
-#
-append config {
 <config>
 	<parent-provides>
 		<service name="ROM"/>
@@ -68,7 +58,7 @@ append config {
 		</config>
 	</start>
 	<start name="vfs" caps="200">
-		<resource name="RAM" quantum="10M" />
+		<resource name="RAM" quantum="30M" />
 		<provides><service name="File_system"/></provides>
 		<config>
 			<vfs>
@@ -89,20 +79,7 @@ append config {
 	</start>
 </config>}
 
-install_config $config
+build_boot_image [list {*}[build_artifacts] fs.raw]
-
-#
-# 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
 
 append qemu_args "  -nographic "
 

repos/dde_rump/run/rump_iso.run

@@ -1,17 +1,7 @@
-if {[have_spec arm]} {
+if {[have_spec arm]} { assert_spec arm_v7 }
-   assert_spec arm_v7
-}
 
-#
+build {
-# Check used commands
+	core lib/ld init timer lib/vfs
-#
-set mkisofs [installed_command mkisofs]
-
-#
-# Build
-#
-set build_components {
-	core init timer
 	server/fs_rom
 	server/vfs_block
 	server/vfs
@@ -19,13 +9,9 @@ set build_components {
 	test/iso
 }
 
-build $build_components
 create_boot_directory
 
-#
+install_config {
-# Generate config
-#
-append config {
 <config>
 	<parent-provides>
 		<service name="ROM"/>
@@ -57,7 +43,7 @@ append config {
 		</config>
 	</start>
 	<start name="vfs" caps="200">
-		<resource name="RAM" quantum="12M" />
+		<resource name="RAM" quantum="20M" />
 		<provides><service name="File_system"/></provides>
 		<config>
 			<vfs> <rump fs="cd9660" ram="10M" writeable="no"/> </vfs>
@@ -78,6 +64,11 @@ append config {
 	</start>
 </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
+build_boot_image [list {*}[build_artifacts] fs.iso]
-
-#
-# 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
 
 append qemu_args "-nographic "
 

repos/dde_rump/run/vfs_stress_ext2.run

@@ -4,21 +4,19 @@
 # \date   2015-08-30
 #
 
-#
+build {
-# Check used commands
+	core lib/ld init timer lib/vfs
-#
-set mke2fs [installed_command mke2fs]
-set dd     [installed_command dd]
-
-set build_components {
-	core init timer
 	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 {
 </config>
 }
 
-set boot_modules {
+build_boot_image [list {*}[build_artifacts] ext2.raw]
- 	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
 
 append qemu_args "-nographic -smp cpus=6"
 

repos/dde_rump/run/vfs_stress_rump_fs.run

@@ -4,14 +4,8 @@
 # \date   2015-08-30
 #
 
-#
+build {
-# Check used commands
+	core lib/ld init timer lib/vfs
-#
-set mke2fs [installed_command mke2fs]
-set dd     [installed_command dd]
-
-set build_components {
-	core init timer
 	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 {
 			<default-policy root="/" writeable="yes"/>
 		</config>
 	</start>
-</config>
+</config> }
-}
 
-set boot_modules {
+build_boot_image [list {*}[build_artifacts] ext2.raw]
- 	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
 
 append qemu_args "-nographic -smp cpus=6"