diff --git a/repos/dde_rump/run/fs_rom_update_ext2.run b/repos/dde_rump/run/fs_rom_update_ext2.run index c8c2dbf63b..54d09f074a 100644 --- a/repos/dde_rump/run/fs_rom_update_ext2.run +++ b/repos/dde_rump/run/fs_rom_update_ext2.run @@ -6,9 +6,10 @@ set build_components { app/rom_logger app/rom_to_file lib/vfs/rump + lib/vfs/import server/dynamic_rom server/fs_rom - server/ram_block + server/vfs_block server/vfs } @@ -45,10 +46,19 @@ append config { - - + + - + + + + + + + + + @@ -123,7 +133,7 @@ set boot_modules { dynamic_rom ext2.img fs_rom - ram_block + vfs_block rom_logger rom_to_file rump_fs.lib.so @@ -132,6 +142,7 @@ set boot_modules { vfs vfs.lib.so vfs_rump.lib.so + vfs_import.lib.so } build_boot_image $boot_modules diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 3e51c955b9..b503d8223a 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -13,9 +13,10 @@ set dd [installed_command dd] # set build_components { core init timer - server/ram_block + server/vfs_block server/vfs lib/vfs/rump + lib/vfs/import test/libc_vfs } @@ -52,10 +53,19 @@ append config { - + - + + + + + + + + + @@ -85,15 +95,15 @@ install_config $config # generic modules set boot_modules { - core ld.lib.so init timer test-libc_vfs ram_block + 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 + ext2.raw libc.lib.so vfs.lib.so vfs_import.lib.so } build_boot_image $boot_modules append qemu_args " -nographic" -run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 +run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 80 exec rm -f bin/ext2.raw diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run index 5670742c26..eb4eeb1940 100644 --- a/repos/dde_rump/run/rump_fat.run +++ b/repos/dde_rump/run/rump_fat.run @@ -13,9 +13,10 @@ set dd [installed_command dd] # set build_components { core init timer - server/ram_block + server/vfs_block server/vfs lib/vfs/rump + lib/vfs/import test/libc_vfs } @@ -52,10 +53,19 @@ append config { - - + + - + + + + + + + + + @@ -87,9 +97,9 @@ install_config $config # generic modules set boot_modules { - core ld.lib.so init timer test-libc_vfs ram_block + 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 + fs.raw libc.lib.so vfs.lib.so vfs_import.lib.so } build_boot_image $boot_modules diff --git a/repos/dde_rump/run/vfs_stress_ext2.run b/repos/dde_rump/run/vfs_stress_ext2.run index ef4d5bd303..3c53a326ad 100644 --- a/repos/dde_rump/run/vfs_stress_ext2.run +++ b/repos/dde_rump/run/vfs_stress_ext2.run @@ -10,7 +10,15 @@ set mke2fs [installed_command mke2fs] set dd [installed_command dd] -build "core init timer test/vfs_stress server/ram_block lib/vfs/rump" +set build_components { + core init timer + test/vfs_stress + server/vfs_block + lib/vfs/rump + lib/vfs/import +} + +build $build_components # # Build EXT2-file-system image @@ -39,10 +47,19 @@ install_config { - - + + - + + + + + + + + + @@ -56,8 +73,8 @@ 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 - ram_block ext2.raw + vfs.lib.so vfs_rump.lib.so vfs_import.lib.so + vfs_block ext2.raw } build_boot_image $boot_modules diff --git a/repos/dde_rump/run/vfs_stress_rump_fs.run b/repos/dde_rump/run/vfs_stress_rump_fs.run index 37284400aa..80e9ac9405 100644 --- a/repos/dde_rump/run/vfs_stress_rump_fs.run +++ b/repos/dde_rump/run/vfs_stress_rump_fs.run @@ -10,7 +10,17 @@ set mke2fs [installed_command mke2fs] set dd [installed_command dd] -build "core init timer test/vfs_stress server/ram_block server/vfs lib/vfs/rump" +set build_components { + core init timer + test/vfs_stress + server/vfs + server/vfs_block + lib/vfs/rump + lib/vfs/import +} + +build $build_components + # # Build EXT2-file-system image @@ -45,10 +55,19 @@ install_config { - - + + - + + + + + + + + + @@ -64,7 +83,7 @@ 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 - ram_block ext2.raw vfs.lib.so + vfs_block ext2.raw vfs.lib.so vfs_import.lib.so } build_boot_image $boot_modules diff --git a/repos/gems/run/leitzentrale.run b/repos/gems/run/leitzentrale.run index c8f93c4eb8..ffe0978604 100644 --- a/repos/gems/run/leitzentrale.run +++ b/repos/gems/run/leitzentrale.run @@ -23,7 +23,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/rom_filter \ [depot_user]/src/terminal \ [depot_user]/src/posix \ - [depot_user]/src/ram_block \ + [depot_user]/src/vfs_block \ [depot_user]/src/part_block \ [depot_user]/src/rump \ [depot_user]/src/ncurses \ @@ -225,10 +225,19 @@ install_config { - + - + + + + + + + + + diff --git a/repos/libports/recipes/pkg/test-libc_vfs_block/archives b/repos/libports/recipes/pkg/test-libc_vfs_block/archives index 0d8ebfdcaa..f3a961ee6d 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_block/archives +++ b/repos/libports/recipes/pkg/test-libc_vfs_block/archives @@ -1,5 +1,6 @@ _/src/init _/src/test-libc_vfs_block -_/src/ram_block +_/src/vfs_block _/src/libc _/src/vfs +_/src/vfs_import diff --git a/repos/libports/recipes/pkg/test-libc_vfs_block/hash b/repos/libports/recipes/pkg/test-libc_vfs_block/hash index 0438387602..4782bd09eb 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_block/hash +++ b/repos/libports/recipes/pkg/test-libc_vfs_block/hash @@ -1 +1 @@ -2020-05-26 31951cde4980b1e6bc973d218501209b7be7356d +2020-06-18 c6dee9f5b822b747c80ba7867d9cf1f44b78f464 diff --git a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime index 658397e6be..1926f1f510 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime @@ -10,7 +10,8 @@ - + + @@ -26,10 +27,19 @@ - + - + + + + + + + + + diff --git a/repos/libports/recipes/pkg/test-solo5/archives b/repos/libports/recipes/pkg/test-solo5/archives index b10cd865ae..8380a1d839 100644 --- a/repos/libports/recipes/pkg/test-solo5/archives +++ b/repos/libports/recipes/pkg/test-solo5/archives @@ -1,6 +1,8 @@ _/src/init _/src/nic_loopback -_/src/ram_block +_/src/vfs_block _/src/sequence _/src/solo5 _/src/test-solo5 +_/src/vfs +_/src/vfs_import diff --git a/repos/libports/recipes/pkg/test-solo5/hash b/repos/libports/recipes/pkg/test-solo5/hash index da2d0ba53c..48dcae3045 100644 --- a/repos/libports/recipes/pkg/test-solo5/hash +++ b/repos/libports/recipes/pkg/test-solo5/hash @@ -1 +1 @@ -2020-05-26 af675f815ed7e779e69b1facd28d41957bc0e3d0 +2020-06-18-b 32b32ac1918d2a2aebb7636e6faae4ea958b5eeb diff --git a/repos/libports/recipes/pkg/test-solo5/runtime b/repos/libports/recipes/pkg/test-solo5/runtime index 09175d3d20..4d30b71026 100644 --- a/repos/libports/recipes/pkg/test-solo5/runtime +++ b/repos/libports/recipes/pkg/test-solo5/runtime @@ -1,4 +1,4 @@ - + @@ -11,7 +11,6 @@ - @@ -21,6 +20,9 @@ + + + @@ -39,10 +41,19 @@ - - + + - + + + + + + + + + diff --git a/repos/libports/run/fatfs_blkio.run b/repos/libports/run/fatfs_blkio.run index 0a6ea921a4..237f4e47ba 100644 --- a/repos/libports/run/fatfs_blkio.run +++ b/repos/libports/run/fatfs_blkio.run @@ -15,10 +15,10 @@ set use_sd_card_drv [expr [have_spec pbxa9]] # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] -# use ram_block on Linux -set use_ram_block [have_spec linux] +# use vfs_block on Linux +set use_vfs_block [have_spec linux] -if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { +if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -43,7 +43,8 @@ create_boot_directory set depot_pkgs "[depot_user]/src/[base_src] [depot_user]/src/init" lappend_if $use_ahci depot_pkgs [depot_user]/src/ahci_drv -lappend_if $use_ram_block depot_pkgs [depot_user]/src/ram_block +lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_block +lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_import import_from_depot {*}$depot_pkgs @@ -100,11 +101,20 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_block config { - +append_if $use_vfs_block config { + - + + + + + + + + + } append config { @@ -130,7 +140,7 @@ set boot_modules { } lappend_if $use_sd_card_drv boot_modules pbxa9_sd_card_drv -lappend_if $use_ram_block boot_modules test.hda +lappend_if $use_vfs_block boot_modules vfs_import.lib.so append_platform_drv_boot_modules diff --git a/repos/libports/run/fs_rom_update_fat.run b/repos/libports/run/fs_rom_update_fat.run index 57efc466fe..8519cff34d 100644 --- a/repos/libports/run/fs_rom_update_fat.run +++ b/repos/libports/run/fs_rom_update_fat.run @@ -6,9 +6,10 @@ set build_components { app/rom_logger app/rom_to_file lib/vfs/fatfs + lib/vfs/import server/dynamic_rom server/fs_rom - server/ram_block + server/vfs_block server/vfs } @@ -43,10 +44,19 @@ append config { - - + + - + + + + + + + + + @@ -121,13 +131,14 @@ set boot_modules { dynamic_rom fat.img fs_rom - ram_block + 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 diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index ae52302b9d..0b19cd0032 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -1,8 +1,8 @@ set use_sd_card_drv [expr [have_spec pbxa9]] set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] -set use_ram_block [have_spec linux] +set use_vfs_block [have_spec linux] -if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { +if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -20,7 +20,8 @@ set build_components { lappend_if $use_ahci_drv build_components drivers/ahci lappend_if $use_sd_card_drv build_components drivers/sd_card -lappend_if $use_ram_block build_components server/ram_block +lappend_if $use_vfs_block build_components server/vfs_block +lappend_if $use_vfs_block build_components lib/vfs/import source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components @@ -84,11 +85,20 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_block config { - - +append_if $use_vfs_block config { + + - + + + + + + + + + } append config { @@ -110,8 +120,8 @@ set boot_modules { lappend_if $use_ahci_drv boot_modules ahci_drv lappend_if $use_sd_card_drv boot_modules pbxa9_sd_card_drv -lappend_if $use_ram_block boot_modules ram_block -lappend_if $use_ram_block boot_modules test.hda +lappend_if $use_vfs_block boot_modules vfs_block +lappend_if $use_vfs_block boot_modules vfs_import.lib.so append_platform_drv_boot_modules diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index fb2625b52c..c46f26b8a8 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -15,13 +15,13 @@ set use_sd_card_drv [expr [have_include "power_on/qemu"] && [have_spec pbxa9]] # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] -# use ram_block on Linux and Qemu/rpi3 -set use_ram_block [expr [have_spec linux] || [expr [have_include "power_on/qemu"] && [have_spec rpi3]]] +# use vfs_block on Linux and Qemu/rpi3 +set use_vfs_block [expr [have_spec linux] || [expr [have_include "power_on/qemu"] && [have_spec rpi3]]] if {[catch { exec which $mkfs_cmd } ]} { puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } -if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { +if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -40,7 +40,8 @@ lappend build_components test/libc_$filesystem lappend_if $use_ahci build_components drivers/ahci lappend_if $use_sd_card_drv build_components drivers/sd_card -lappend_if $use_ram_block build_components server/ram_block +lappend_if $use_vfs_block build_components server/vfs_block +lappend_if $use_vfs_block build_components lib/vfs/import source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components @@ -116,11 +117,20 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_block config { - - +append_if $use_vfs_block config { + + - + + + + + + + + + } append config { @@ -158,8 +168,9 @@ append boot_modules libc_$filesystem.lib.so lappend_if $use_ahci boot_modules ahci_drv lappend_if $use_sd_card_drv boot_modules pbxa9_sd_card_drv -lappend_if $use_ram_block boot_modules ram_block -lappend_if $use_ram_block boot_modules test.hda +lappend_if $use_vfs_block boot_modules vfs_block +lappend_if $use_vfs_block boot_modules test.hda +lappend_if $use_vfs_block boot_modules vfs_import.lib.so append_platform_drv_boot_modules diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc index cb94932650..19d9eaf2d2 100644 --- a/repos/libports/run/libc_vfs_filesystem_test.inc +++ b/repos/libports/run/libc_vfs_filesystem_test.inc @@ -25,13 +25,13 @@ set use_sd_card_drv [expr [have_spec pbxa9]] # use AHCI on x86 set use_ahci [expr [have_spec x86] && ![have_spec linux]] -# use ram_block on Linux -set use_ram_block [expr [have_spec linux] || [have_spec rpi3]] +# use vfs_block on Linux +set use_vfs_block [expr [have_spec linux] || [have_spec rpi3]] if {[catch { exec which $mkfs_cmd } ]} { puts stderr "Error: $mkfs_cmd not installed, aborting test"; exit } -if {[expr ![have_include "power_on/qemu"] && !$use_ram_block]} { +if {[expr ![have_include "power_on/qemu"] && !$use_vfs_block]} { puts "\nPlease setup your native sd or hard drive. Remove this fail stop"; puts "check when you have prepared your native environment.\n"; exit 0 @@ -57,8 +57,9 @@ create_boot_directory set depot_pkgs "[depot_user]/src/[base_src] [depot_user]/src/init" lappend_if $use_ahci depot_pkgs [depot_user]/src/ahci_drv -lappend_if $use_ram_block depot_pkgs [depot_user]/src/ram_block +lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_block lappend_if $use_vfs_server depot_pkgs [depot_user]/src/vfs +lappend_if $use_vfs_block depot_pkgs [depot_user]/src/vfs_import import_from_depot {*}$depot_pkgs @@ -128,11 +129,20 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_block config { - - +append_if $use_vfs_block config { + + - + + + + + + + + + } append_if $use_vfs_server config " @@ -179,7 +189,7 @@ append boot_modules { lappend boot_modules {*}$test_boot_modules lappend_if $use_sd_card_drv boot_modules pbxa9_sd_card_drv -lappend_if $use_ram_block boot_modules test.hda +lappend_if $use_vfs_block boot_modules test.hda append_platform_drv_boot_modules diff --git a/repos/libports/run/libc_vfs_fs_test.inc b/repos/libports/run/libc_vfs_fs_test.inc index ebfb29057e..b09dedf032 100644 --- a/repos/libports/run/libc_vfs_fs_test.inc +++ b/repos/libports/run/libc_vfs_fs_test.inc @@ -6,7 +6,7 @@ set use_sd_card_drv [expr [have_spec pbxa9]] set use_ahci_drv [expr [have_spec x86] && ![have_spec linux]] -set use_ram_block [have_spec linux] +set use_vfs_block [have_spec linux] set mkfs [installed_command $mkfs_cmd] if {[expr ![have_spec pbxa9] && ![have_spec x86]]} { @@ -25,7 +25,7 @@ lappend build_components $build_component lappend_if $use_ahci_drv build_components drivers/ahci lappend_if $use_sd_card_drv build_components drivers/sd_card -lappend_if $use_ram_block build_components server/ram_block +lappend_if $use_vfs_block build_components server/vfs_block source ${genode_dir}/repos/base/run/platform_drv.inc append_platform_drv_build_components @@ -105,11 +105,20 @@ append_if $use_sd_card_drv config { } -append_if $use_ram_block config { - +append_if $use_vfs_block config { + - + + + + + + + + + } append config { @@ -133,8 +142,10 @@ lappend boot_modules $binary lappend_if $use_ahci_drv boot_modules ahci_drv lappend_if $use_sd_card_drv boot_modules pbxa9_sd_card_drv -lappend_if $use_ram_block boot_modules ram_block -lappend_if $use_ram_block boot_modules test.hda +lappend_if $use_vfs_block boot_modules vfs_import.lib.so +lappend_if $use_vfs_block boot_modules vfs_block +lappend_if $use_vfs_block boot_modules test.hda +lappend_if $use_vfs_block boot_modules vfs_import.lib.so append_platform_drv_boot_modules diff --git a/repos/libports/run/solo5.run b/repos/libports/run/solo5.run index e0446ffd48..030b817191 100644 --- a/repos/libports/run/solo5.run +++ b/repos/libports/run/solo5.run @@ -14,9 +14,11 @@ import_from_depot \ [depot_user]/src/[base_src] \ [depot_user]/src/init \ [depot_user]/src/nic_loopback \ - [depot_user]/src/ram_block \ + [depot_user]/src/vfs_block \ [depot_user]/src/rtc_drv \ [depot_user]/src/sequence \ + [depot_user]/src/vfs \ + [depot_user]/src/vfs_import append config { @@ -48,10 +50,19 @@ append config { - + - + + + + + + + + + diff --git a/repos/os/recipes/pkg/test-vfs_block/hash b/repos/os/recipes/pkg/test-vfs_block/hash index 8f051cd1f0..2a9d54b643 100644 --- a/repos/os/recipes/pkg/test-vfs_block/hash +++ b/repos/os/recipes/pkg/test-vfs_block/hash @@ -1 +1 @@ -2020-06-16-j b4b7ecfb2b9e1ca7e6e8de471b29fc572658816f +2020-06-25 6bf691c90176270767ae008db257d18f3850928a diff --git a/repos/os/recipes/pkg/test-vfs_block/runtime b/repos/os/recipes/pkg/test-vfs_block/runtime index 26fb1992b5..fd9f927e44 100644 --- a/repos/os/recipes/pkg/test-vfs_block/runtime +++ b/repos/os/recipes/pkg/test-vfs_block/runtime @@ -3,7 +3,7 @@ - + child "block_tester" exited with exit value 0 Error: @@ -37,7 +37,7 @@ - + diff --git a/repos/ports/run/seoul.inc b/repos/ports/run/seoul.inc index 2813ab92ae..e0af86e76f 100644 --- a/repos/ports/run/seoul.inc +++ b/repos/ports/run/seoul.inc @@ -69,7 +69,7 @@ if {$use_fancy_stuff} { set use_framebuffer 1 } lappend_if $use_block_vdi build_components server/vdi_block lappend_if $use_usb build_components drivers/usb -lappend_if $use_block_ram build_components server/ram_block +lappend_if $use_block_ram build_components server/vfs_block lappend_if $use_drv_ahci build_components drivers/ahci lappend_if $use_nic_session build_components drivers/nic lappend_if $use_nic_bridge build_components server/nic_bridge @@ -252,10 +252,19 @@ append_if $use_part_block config { } append_if $use_block_ram config { - - + + - + + + + + + + + + } append_if $use_fs_rump config { @@ -524,7 +533,8 @@ set boot_modules { lappend_if $use_block_vdi boot_modules vdi_block lappend_if [expr !$use_usb] boot_modules ps2_drv lappend_if $use_usb boot_modules usb_drv -lappend_if $use_block_ram boot_modules ram_block +lappend_if $use_block_ram boot_modules vfs_block +lappend_if $use_block_ram boot_modules vfs.lib.so lappend_if $use_drv_ahci boot_modules ahci_drv lappend_if $use_nic_session boot_modules ipxe_nic_drv lappend_if $use_nic_bridge boot_modules nic_bridge