From e2661c58dc6e38610e02acd95e148cc68783da90 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Mon, 23 Apr 2018 10:49:21 +0200 Subject: [PATCH] Convert static VFS library to dynamic library Fix #2759 --- repos/base-linux/run/lx_fs.run | 2 +- repos/dde_linux/recipes/pkg/wifi/archives | 1 + repos/dde_linux/recipes/pkg/wifi/runtime | 1 + repos/dde_linux/recipes/src/wifi_drv/used_apis | 2 -- repos/dde_linux/run/lxip_http_srv.run | 2 +- repos/dde_linux/run/lxip_udp_echo.run | 2 +- repos/dde_linux/run/usb_net.run | 2 +- repos/dde_linux/run/usb_rndis.run | 2 +- repos/dde_linux/run/vfs_lxip.run | 2 +- repos/dde_linux/run/wifi.run | 2 +- repos/dde_rump/run/rump_ext2.run | 2 +- repos/dde_rump/run/rump_fat.run | 2 +- repos/gems/recipes/pkg/backdrop/archives | 1 + repos/gems/recipes/pkg/depot_download/archives | 1 + repos/gems/recipes/pkg/fonts_fs/runtime | 1 + repos/gems/recipes/pkg/sticks_blue_backdrop/runtime | 1 + repos/gems/recipes/pkg/terminal/archives | 1 + repos/gems/recipes/pkg/terminal/runtime | 1 + repos/gems/recipes/pkg/themed_wm/archives | 1 + repos/gems/recipes/pkg/themed_wm/runtime | 1 + repos/gems/recipes/src/depot_query/used_apis | 4 ---- repos/gems/recipes/src/menu_view/used_apis | 4 ---- repos/gems/recipes/src/terminal/used_apis | 3 --- repos/gems/run/depot_query.run | 2 +- repos/gems/run/fs_report_cow.run | 3 ++- repos/gems/run/http_blk.run | 2 +- repos/gems/run/libc_vfs_audit.run | 2 +- repos/gems/run/mixer_gui_qt_test.run | 2 +- repos/gems/run/noux_vfs_audit.run | 2 +- repos/gems/run/pipe.run | 2 +- repos/gems/run/tcp_terminal.run | 2 +- repos/gems/run/terminal_mux.run | 5 +++-- repos/gems/run/wm.run | 3 ++- .../src/app/depot_download_manager/gen_depot_query.cc | 1 + repos/gems/src/app/depot_download_manager/gen_extract.cc | 1 + repos/gems/src/app/depot_download_manager/gen_fetchurl.cc | 1 + repos/gems/src/app/depot_download_manager/gen_verify.cc | 1 + repos/gems/src/app/depot_query/main.cc | 5 ++++- repos/libports/recipes/pkg/pdf_view/archives | 1 + repos/libports/recipes/pkg/pdf_view/runtime | 1 + repos/libports/recipes/src/libc/used_apis | 8 ++------ repos/libports/run/avplay.run | 2 +- repos/libports/run/expat.run | 2 +- repos/libports/run/extract.run | 2 +- repos/libports/run/fatfs_blkio.run | 2 +- repos/libports/run/fetchurl.run | 2 +- repos/libports/run/ldso.run | 2 +- repos/libports/run/libc.run | 2 +- repos/libports/run/libc_block.run | 2 +- repos/libports/run/libc_component.run | 2 +- repos/libports/run/libc_counter.run | 2 +- repos/libports/run/libc_filesystem_test.inc | 2 +- repos/libports/run/libc_getenv.run | 2 +- repos/libports/run/libc_pipe.run | 2 +- repos/libports/run/libc_select.run | 2 +- repos/libports/run/libc_vfs.run | 2 +- repos/libports/run/libc_vfs_block.run | 2 +- repos/libports/run/libc_vfs_component.run | 2 +- repos/libports/run/libc_vfs_counter.run | 2 +- repos/libports/run/libc_vfs_filesystem_test.inc | 2 +- repos/libports/run/libc_vfs_fs.run | 2 +- repos/libports/run/libc_vfs_fs_test.inc | 2 +- repos/libports/run/libc_vfs_ram.run | 2 +- repos/libports/run/libc_vfs_select.run | 2 +- repos/libports/run/libc_with_libc.run | 2 +- repos/libports/run/lwip.run | 2 +- repos/libports/run/lwip_lx.run | 2 +- repos/libports/run/mesa.inc | 2 +- repos/libports/run/moon.run | 2 +- repos/libports/run/mupdf.run | 2 +- repos/libports/run/netty.inc | 2 +- repos/libports/run/nic_bridge.run | 2 +- repos/libports/run/nic_bridge_lighttpd.run | 2 +- repos/libports/run/nic_router.inc | 2 +- repos/libports/run/nim.run | 2 +- repos/libports/run/nim_netty.run | 2 +- repos/libports/run/pcg32.run | 2 +- repos/libports/run/pthread.run | 2 +- repos/libports/run/python.run | 2 +- repos/libports/run/qt5.run | 2 +- repos/libports/run/qt5_avplay.run | 2 +- repos/libports/run/qt5_calculatorform.run | 2 +- repos/libports/run/qt5_openglwindow.run | 2 +- repos/libports/run/qt5_qpluginwidget.run | 2 +- repos/libports/run/qt5_quicktest.run | 2 +- repos/libports/run/qt5_samegame.run | 2 +- repos/libports/run/qt5_tetrix.run | 2 +- repos/libports/run/qt5_textedit.run | 2 +- repos/libports/run/qt5_virtualkeyboard.run | 2 +- repos/libports/run/rust.run | 2 +- repos/libports/run/sdl.run | 2 +- repos/libports/run/sequence.run | 2 +- repos/libports/run/smartcard.run | 2 +- repos/libports/run/stdcxx.run | 2 +- repos/libports/run/test-ping_client.run | 2 +- repos/libports/run/test-ping_server.run | 2 +- repos/os/lib/mk/vfs.mk | 4 +++- repos/os/lib/symbols/vfs | 5 +++++ repos/os/recipes/api/vfs/content.mk | 4 ++-- repos/os/recipes/pkg/test-fs_report/archives | 1 + repos/os/recipes/pkg/test-fs_report/runtime | 1 + repos/os/recipes/src/fs_report/used_apis | 4 ---- repos/os/recipes/src/vfs/api | 1 + repos/os/recipes/src/vfs/content.mk | 6 ++++++ repos/os/run/fs_log.run | 2 +- repos/os/run/fs_report.run | 2 +- repos/os/run/fs_rom_update_fs.run | 3 ++- repos/os/run/fs_rom_update_ram.run | 3 ++- repos/os/run/log_core.run | 2 +- repos/os/run/vfs_stress_fs.run | 2 +- repos/os/run/vfs_stress_ram.run | 2 +- repos/os/src/server/fs_report/main.cc | 5 ++++- repos/ports/recipes/pkg/noux-system/archives | 1 + repos/ports/recipes/pkg/noux-system/runtime | 1 + repos/ports/recipes/pkg/vbox5-nova-sculpt/archives | 1 + repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime | 1 + repos/ports/recipes/src/noux/used_apis | 3 --- repos/ports/run/arora.run | 2 +- repos/ports/run/debug_nitpicker.run | 2 +- repos/ports/run/dosbox.run | 2 +- repos/ports/run/gdb_monitor.run | 2 +- repos/ports/run/gdb_monitor_interactive.run | 2 +- repos/ports/run/gdb_monitor_target_config.run | 2 +- repos/ports/run/genode_org.run | 2 +- repos/ports/run/libc_noux.run | 2 +- repos/ports/run/lighttpd.run | 2 +- repos/ports/run/netperf.inc | 2 +- repos/ports/run/noux.run | 2 +- repos/ports/run/noux_fork.run | 5 +++-- repos/ports/run/noux_gdb.run | 2 +- repos/ports/run/noux_net_netcat.run | 2 +- repos/ports/run/noux_signals.run | 2 +- repos/ports/run/noux_tool_chain_auto.run | 2 +- repos/ports/run/noux_uname.run | 2 +- repos/ports/run/vbox_auto_genode_usb_hid.run | 2 +- repos/ports/run/verify.run | 2 +- repos/ports/run/virtualbox.run | 2 +- repos/ports/run/virtualbox_auto.inc | 2 +- repos/ports/run/virtualbox_nic_router.run | 2 +- repos/ports/src/noux/minimal/target.mk | 2 +- 140 files changed, 161 insertions(+), 137 deletions(-) create mode 100644 repos/os/lib/symbols/vfs create mode 100644 repos/os/recipes/src/vfs/api diff --git a/repos/base-linux/run/lx_fs.run b/repos/base-linux/run/lx_fs.run index 36a156c783..5e8f6c653e 100644 --- a/repos/base-linux/run/lx_fs.run +++ b/repos/base-linux/run/lx_fs.run @@ -61,7 +61,7 @@ exec mkdir -p bin/libc_vfs # build_boot_image { - core init ld.lib.so libc.lib.so lx_fs test-libc_vfs + core init ld.lib.so libc.lib.so vfs.lib.so lx_fs test-libc_vfs libc_vfs } diff --git a/repos/dde_linux/recipes/pkg/wifi/archives b/repos/dde_linux/recipes/pkg/wifi/archives index 145c4ce1d7..277ae89fa1 100644 --- a/repos/dde_linux/recipes/pkg/wifi/archives +++ b/repos/dde_linux/recipes/pkg/wifi/archives @@ -1,6 +1,7 @@ _/src/wifi_drv _/src/libcrypto _/src/libssl +_/src/vfs _/src/vfs_jitterentropy _/src/libc _/raw/wifi_firmware diff --git a/repos/dde_linux/recipes/pkg/wifi/runtime b/repos/dde_linux/recipes/pkg/wifi/runtime index c730f076e8..ed1eec506f 100755 --- a/repos/dde_linux/recipes/pkg/wifi/runtime +++ b/repos/dde_linux/recipes/pkg/wifi/runtime @@ -25,6 +25,7 @@ + diff --git a/repos/dde_linux/recipes/src/wifi_drv/used_apis b/repos/dde_linux/recipes/src/wifi_drv/used_apis index 307d4cfbec..718ec71d56 100644 --- a/repos/dde_linux/recipes/src/wifi_drv/used_apis +++ b/repos/dde_linux/recipes/src/wifi_drv/used_apis @@ -3,8 +3,6 @@ os libc libcrypto libssl -file_system -file_system_session nic_session platform_session report_session diff --git a/repos/dde_linux/run/lxip_http_srv.run b/repos/dde_linux/run/lxip_http_srv.run index 64f3f32a9a..9488c083b2 100644 --- a/repos/dde_linux/run/lxip_http_srv.run +++ b/repos/dde_linux/run/lxip_http_srv.run @@ -100,7 +100,7 @@ install_config $config # generic modules set boot_modules { core ld.lib.so init timer posix.lib.so - libc.lib.so libm.lib.so lxip.lib.so test-lxip_http_srv + libc.lib.so vfs.lib.so libm.lib.so lxip.lib.so test-lxip_http_srv } # platform-specific modules diff --git a/repos/dde_linux/run/lxip_udp_echo.run b/repos/dde_linux/run/lxip_udp_echo.run index 9b6217798e..d0f0d2759f 100644 --- a/repos/dde_linux/run/lxip_udp_echo.run +++ b/repos/dde_linux/run/lxip_udp_echo.run @@ -99,7 +99,7 @@ install_config $config # generic modules set boot_modules { core ld.lib.so init timer - libc.lib.so libm.lib.so lxip.lib.so test-lxip_udp_echo + libc.lib.so vfs.lib.so libm.lib.so lxip.lib.so test-lxip_udp_echo } # platform-specific modules diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 65e601be79..1a873a0d45 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -93,7 +93,7 @@ install_config $config # generic modules set boot_modules { core ld.lib.so init timer usb_drv - libc.lib.so libm.lib.so lwip.lib.so posix.lib.so test-lwip_httpsrv + libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so posix.lib.so test-lwip_httpsrv } append_platform_drv_boot_modules diff --git a/repos/dde_linux/run/usb_rndis.run b/repos/dde_linux/run/usb_rndis.run index 954bf365f0..18b7226a33 100644 --- a/repos/dde_linux/run/usb_rndis.run +++ b/repos/dde_linux/run/usb_rndis.run @@ -100,7 +100,7 @@ install_config $config # generic modules set boot_modules { core ld.lib.so init timer usb_drv - libc.lib.so libc_pipe.lib.so lwip.lib.so pthread.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so lwip.lib.so pthread.lib.so tcp_terminal test-terminal_echo } diff --git a/repos/dde_linux/run/vfs_lxip.run b/repos/dde_linux/run/vfs_lxip.run index a15057e0c1..39427577c0 100644 --- a/repos/dde_linux/run/vfs_lxip.run +++ b/repos/dde_linux/run/vfs_lxip.run @@ -89,7 +89,7 @@ install_config $config append boot_modules { core init timer } [nic_drv_binary] { - ld.lib.so libc.lib.so libc_pipe.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libc_pipe.lib.so posix.lib.so libm.lib.so vfs_lxip.lib.so lxip.lib.so tcp_terminal diff --git a/repos/dde_linux/run/wifi.run b/repos/dde_linux/run/wifi.run index f5ed4b3825..693c820b7d 100644 --- a/repos/dde_linux/run/wifi.run +++ b/repos/dde_linux/run/wifi.run @@ -137,7 +137,7 @@ set firmware_modules { set boot_modules { core ld.lib.so init timer rtc_drv report_rom dynamic_rom vfs_jitterentropy.lib.so posix.lib.so - libc.lib.so libm.lib.so libcrypto.lib.so libssl.lib.so + libc.lib.so vfs.lib.so libm.lib.so libcrypto.lib.so libssl.lib.so wpa_driver_nl80211.lib.so wpa_supplicant.lib.so wifi.lib.so wifi_drv diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 1a98deb31e..a136a77a1d 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -84,7 +84,7 @@ install_config $config set boot_modules { core ld.lib.so init timer test-libc_vfs ram_blk rump.lib.so rump_fs.lib.so rump_fs - ext2.raw libc.lib.so + ext2.raw libc.lib.so vfs.lib.so } build_boot_image $boot_modules diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run index 873a13cb62..42055f10e5 100644 --- a/repos/dde_rump/run/rump_fat.run +++ b/repos/dde_rump/run/rump_fat.run @@ -85,7 +85,7 @@ install_config $config set boot_modules { core ld.lib.so init timer test-libc_vfs ram_blk rump.lib.so rump_fs.lib.so rump_fs - fs.raw libc.lib.so + fs.raw libc.lib.so vfs.lib.so } build_boot_image $boot_modules diff --git a/repos/gems/recipes/pkg/backdrop/archives b/repos/gems/recipes/pkg/backdrop/archives index 2d741c0f54..fcdc746df6 100644 --- a/repos/gems/recipes/pkg/backdrop/archives +++ b/repos/gems/recipes/pkg/backdrop/archives @@ -1,4 +1,5 @@ _/src/backdrop _/src/libc +_/src/vfs _/src/zlib _/src/libpng diff --git a/repos/gems/recipes/pkg/depot_download/archives b/repos/gems/recipes/pkg/depot_download/archives index 0371c83812..0b1a095c4d 100644 --- a/repos/gems/recipes/pkg/depot_download/archives +++ b/repos/gems/recipes/pkg/depot_download/archives @@ -9,6 +9,7 @@ _/src/libc _/src/libssh _/src/libssl _/src/libcrypto +_/src/vfs _/src/zlib _/src/curl _/src/init diff --git a/repos/gems/recipes/pkg/fonts_fs/runtime b/repos/gems/recipes/pkg/fonts_fs/runtime index 11140b5a51..fc0e4510bc 100644 --- a/repos/gems/recipes/pkg/fonts_fs/runtime +++ b/repos/gems/recipes/pkg/fonts_fs/runtime @@ -9,6 +9,7 @@ + diff --git a/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime b/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime index d165422814..65f4cc8dae 100644 --- a/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime +++ b/repos/gems/recipes/pkg/sticks_blue_backdrop/runtime @@ -5,6 +5,7 @@ + diff --git a/repos/gems/recipes/pkg/terminal/archives b/repos/gems/recipes/pkg/terminal/archives index dc711350e6..1119e9f9a0 100644 --- a/repos/gems/recipes/pkg/terminal/archives +++ b/repos/gems/recipes/pkg/terminal/archives @@ -1,5 +1,6 @@ _/raw/ttf-bitstream-vera-minimal _/raw/terminal _/src/terminal +_/src/vfs _/src/vfs_ttf _/src/libc diff --git a/repos/gems/recipes/pkg/terminal/runtime b/repos/gems/recipes/pkg/terminal/runtime index 3c90daa3be..5c0238c33c 100644 --- a/repos/gems/recipes/pkg/terminal/runtime +++ b/repos/gems/recipes/pkg/terminal/runtime @@ -11,6 +11,7 @@ + diff --git a/repos/gems/recipes/pkg/themed_wm/archives b/repos/gems/recipes/pkg/themed_wm/archives index 93bfc67a7d..7f4c992967 100644 --- a/repos/gems/recipes/pkg/themed_wm/archives +++ b/repos/gems/recipes/pkg/themed_wm/archives @@ -3,4 +3,5 @@ _/raw/themed_wm _/src/themed_decorator _/src/libc _/src/libpng +_/src/vfs _/src/zlib diff --git a/repos/gems/recipes/pkg/themed_wm/runtime b/repos/gems/recipes/pkg/themed_wm/runtime index fadf1a188a..14d5a90859 100644 --- a/repos/gems/recipes/pkg/themed_wm/runtime +++ b/repos/gems/recipes/pkg/themed_wm/runtime @@ -9,6 +9,7 @@ + diff --git a/repos/gems/recipes/src/depot_query/used_apis b/repos/gems/recipes/src/depot_query/used_apis index bbd8c51022..ade9ce3115 100644 --- a/repos/gems/recipes/src/depot_query/used_apis +++ b/repos/gems/recipes/src/depot_query/used_apis @@ -2,7 +2,3 @@ base os vfs report_session -block_session -terminal_session -rtc_session -file_system_session diff --git a/repos/gems/recipes/src/menu_view/used_apis b/repos/gems/recipes/src/menu_view/used_apis index 973804df2e..5f95031c9b 100644 --- a/repos/gems/recipes/src/menu_view/used_apis +++ b/repos/gems/recipes/src/menu_view/used_apis @@ -13,7 +13,3 @@ framebuffer_session input_session timer_session report_session -block_session -file_system_session -rtc_session -terminal_session diff --git a/repos/gems/recipes/src/terminal/used_apis b/repos/gems/recipes/src/terminal/used_apis index f6af6ded56..aec14c9df4 100644 --- a/repos/gems/recipes/src/terminal/used_apis +++ b/repos/gems/recipes/src/terminal/used_apis @@ -7,6 +7,3 @@ terminal_session timer_session vfs gems -block_session -file_system_session -rtc_session diff --git a/repos/gems/run/depot_query.run b/repos/gems/run/depot_query.run index bf469fe360..6741d31703 100644 --- a/repos/gems/run/depot_query.run +++ b/repos/gems/run/depot_query.run @@ -117,7 +117,7 @@ install_config { } -build_boot_image { init depot_query depot_deploy } +build_boot_image { init depot_query depot_deploy vfs.lib.so } append qemu_args " -nographic " diff --git a/repos/gems/run/fs_report_cow.run b/repos/gems/run/fs_report_cow.run index 15de984393..ba884a1e51 100644 --- a/repos/gems/run/fs_report_cow.run +++ b/repos/gems/run/fs_report_cow.run @@ -95,8 +95,9 @@ set boot_modules { fs_report fs_rom test-fs_report - vfs_cow.lib.so vfs + vfs_cow.lib.so + vfs.lib.so } build_boot_image $boot_modules diff --git a/repos/gems/run/http_blk.run b/repos/gems/run/http_blk.run index 26371b4840..6270f47296 100644 --- a/repos/gems/run/http_blk.run +++ b/repos/gems/run/http_blk.run @@ -179,7 +179,7 @@ catch { exec dd if=/dev/zero of=bin/index.bin bs=512 count=400 } # generic modules set boot_modules { core ld.lib.so init timer - libc.lib.so libm.lib.so posix.lib.so + libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip.lib.so zlib.lib.so lighttpd nic_bridge http_blk index.bin test-rom_blk } diff --git a/repos/gems/run/libc_vfs_audit.run b/repos/gems/run/libc_vfs_audit.run index ca4a67196f..b67031b6d7 100644 --- a/repos/gems/run/libc_vfs_audit.run +++ b/repos/gems/run/libc_vfs_audit.run @@ -65,7 +65,7 @@ install_config $config build_boot_image { core init vfs - ld.lib.so libc.lib.so + ld.lib.so libc.lib.so vfs.lib.so test-libc_vfs vfs_audit.lib.so } diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index 87fad4f748..ac20a925d1 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -242,7 +242,7 @@ exec tar chf bin/qt5_fs_mixer_gui_qt.tar -C bin/qt5_fs/mixer_gui_qt . set boot_modules { core ld.lib.so init timer - libc.lib.so + libc.lib.so vfs.lib.so report_rom dynamic_rom ram_fs fs_rom diff --git a/repos/gems/run/noux_vfs_audit.run b/repos/gems/run/noux_vfs_audit.run index 9d51005de8..c6901f8e48 100644 --- a/repos/gems/run/noux_vfs_audit.run +++ b/repos/gems/run/noux_vfs_audit.run @@ -59,7 +59,7 @@ build_boot_image { coreutils.tar libc_noux.lib.so libm.lib.so - noux libc.lib.so + noux libc.lib.so vfs.lib.so posix.lib.so sequence timer diff --git a/repos/gems/run/pipe.run b/repos/gems/run/pipe.run index 9ed3208097..abff30452b 100644 --- a/repos/gems/run/pipe.run +++ b/repos/gems/run/pipe.run @@ -32,7 +32,7 @@ build "core init app/pipe" build_boot_image { core init pipe - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } append qemu_args " -nographic " diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index 81d89a32f9..c913d2b74f 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -86,7 +86,7 @@ install_config $config set boot_modules { core ld.lib.so init timer nic_drv - libc.lib.so pthread.lib.so lwip.lib.so libc_pipe.lib.so + libc.lib.so vfs.lib.so pthread.lib.so lwip.lib.so libc_pipe.lib.so tcp_terminal test-terminal_echo } diff --git a/repos/gems/run/terminal_mux.run b/repos/gems/run/terminal_mux.run index 78e3199f3f..18a2ac10c5 100644 --- a/repos/gems/run/terminal_mux.run +++ b/repos/gems/run/terminal_mux.run @@ -34,6 +34,7 @@ append config { + @@ -46,7 +47,7 @@ append config { - } + @@ -139,7 +140,7 @@ install_config $config set boot_modules { core init timer ld.lib.so noux terminal_mux terminal_log test-signal cli_monitor test-resource_yield posix.lib.so - libc.lib.so libm.lib.so libc_noux.lib.so libc_terminal.lib.so ncurses.lib.so + libc.lib.so vfs.lib.so libm.lib.so libc_noux.lib.so libc_terminal.lib.so ncurses.lib.so vim.tar uart_drv } diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run index 350d2cd322..974624cfe0 100644 --- a/repos/gems/run/wm.run +++ b/repos/gems/run/wm.run @@ -13,7 +13,8 @@ import_from_depot genodelabs/src/[base_src] \ genodelabs/src/demo \ genodelabs/src/init \ genodelabs/src/nitpicker \ - genodelabs/src/nit_fb + genodelabs/src/nit_fb \ + genodelabs/src/vfs install_config { diff --git a/repos/gems/src/app/depot_download_manager/gen_depot_query.cc b/repos/gems/src/app/depot_download_manager/gen_depot_query.cc index bbd37ee589..dcea5474af 100644 --- a/repos/gems/src/app/depot_download_manager/gen_depot_query.cc +++ b/repos/gems/src/app/depot_download_manager/gen_depot_query.cc @@ -53,6 +53,7 @@ void Depot_download_manager::gen_depot_query_start_content(Xml_generator &xml, }); gen_parent_unscoped_rom_route(xml, "depot_query"); gen_parent_unscoped_rom_route(xml, "ld.lib.so"); + gen_parent_rom_route(xml, "vfs.lib.so"); gen_parent_route (xml); gen_parent_route (xml); gen_parent_route (xml); diff --git a/repos/gems/src/app/depot_download_manager/gen_extract.cc b/repos/gems/src/app/depot_download_manager/gen_extract.cc index dec22ea374..82bd713666 100644 --- a/repos/gems/src/app/depot_download_manager/gen_extract.cc +++ b/repos/gems/src/app/depot_download_manager/gen_extract.cc @@ -86,6 +86,7 @@ void Depot_download_manager::gen_extract_start_content(Xml_generator &xml, gen_parent_rom_route(xml, "libm.lib.so"); gen_parent_rom_route(xml, "posix.lib.so"); gen_parent_rom_route(xml, "libarchive.lib.so"); + gen_parent_rom_route(xml, "vfs.lib.so"); gen_parent_rom_route(xml, "zlib.lib.so"); gen_parent_rom_route(xml, "liblzma.lib.so"); gen_parent_route(xml); diff --git a/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc b/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc index 9b87254a24..15b0a67cdf 100644 --- a/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc +++ b/repos/gems/src/app/depot_download_manager/gen_fetchurl.cc @@ -96,6 +96,7 @@ void Depot_download_manager::gen_fetchurl_start_content(Xml_generator &xml, gen_parent_rom_route(xml, "libssh.lib.so"); gen_parent_rom_route(xml, "libssl.lib.so"); gen_parent_rom_route(xml, "libcrypto.lib.so"); + gen_parent_rom_route(xml, "vfs.lib.so"); gen_parent_rom_route(xml, "zlib.lib.so"); gen_parent_rom_route(xml, "pthread.lib.so"); gen_parent_route (xml); diff --git a/repos/gems/src/app/depot_download_manager/gen_verify.cc b/repos/gems/src/app/depot_download_manager/gen_verify.cc index bc15d0712d..66b1f7e4d7 100644 --- a/repos/gems/src/app/depot_download_manager/gen_verify.cc +++ b/repos/gems/src/app/depot_download_manager/gen_verify.cc @@ -79,6 +79,7 @@ void Depot_download_manager::gen_verify_start_content(Xml_generator &xml, gen_parent_rom_route(xml, "libc.lib.so"); gen_parent_rom_route(xml, "libm.lib.so"); gen_parent_rom_route(xml, "pthread.lib.so"); + gen_parent_rom_route(xml, "vfs.lib.so"); gen_parent_route (xml); gen_parent_route (xml); gen_parent_route (xml); diff --git a/repos/gems/src/app/depot_query/main.cc b/repos/gems/src/app/depot_query/main.cc index 07c7d4cd66..303ba152b6 100644 --- a/repos/gems/src/app/depot_query/main.cc +++ b/repos/gems/src/app/depot_query/main.cc @@ -571,5 +571,8 @@ void Depot_query::Main::_query_user(Archive::User const &user, Xml_generator &xm } -void Component::construct(Genode::Env &env) { static Depot_query::Main main(env); } +void Component::construct(Genode::Env &env) +{ + static Depot_query::Main main(env); +} diff --git a/repos/libports/recipes/pkg/pdf_view/archives b/repos/libports/recipes/pkg/pdf_view/archives index 39b0006859..e5c80d513c 100644 --- a/repos/libports/recipes/pkg/pdf_view/archives +++ b/repos/libports/recipes/pkg/pdf_view/archives @@ -6,6 +6,7 @@ _/src/libpng _/src/mupdf _/src/pdf_view _/src/openjpeg +_/src/vfs _/src/zlib _/src/nit_fb _/raw/pdf_view diff --git a/repos/libports/recipes/pkg/pdf_view/runtime b/repos/libports/recipes/pkg/pdf_view/runtime index 1fa7e0f90e..6bfedd1cc7 100644 --- a/repos/libports/recipes/pkg/pdf_view/runtime +++ b/repos/libports/recipes/pkg/pdf_view/runtime @@ -16,6 +16,7 @@ + diff --git a/repos/libports/recipes/src/libc/used_apis b/repos/libports/recipes/src/libc/used_apis index 34b4ce70ed..890a12fd73 100644 --- a/repos/libports/recipes/src/libc/used_apis +++ b/repos/libports/recipes/src/libc/used_apis @@ -1,9 +1,5 @@ -so base os -vfs -block_session -file_system_session -rtc_session -terminal_session +so timer_session +vfs diff --git a/repos/libports/run/avplay.run b/repos/libports/run/avplay.run index e7d59b2c38..1691a70392 100644 --- a/repos/libports/run/avplay.run +++ b/repos/libports/run/avplay.run @@ -113,7 +113,7 @@ install_config $config append boot_modules { core init timer } [audio_drv_binary] { avplay - ld.lib.so libc.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so + ld.lib.so libc.lib.so vfs.lib.so vfs.lib.so vfs.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so avfilter.lib.so avutil.lib.so avcodec.lib.so avformat.lib.so swscale.lib.so avresample.lib.so mediafile diff --git a/repos/libports/run/expat.run b/repos/libports/run/expat.run index 45e4710dbe..7e64758011 100644 --- a/repos/libports/run/expat.run +++ b/repos/libports/run/expat.run @@ -56,7 +56,7 @@ install_config { build_boot_image { core init timer - ld.lib.so libc.lib.so expat.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so vfs.lib.so vfs.lib.so expat.lib.so posix.lib.so test-expat } diff --git a/repos/libports/run/extract.run b/repos/libports/run/extract.run index bb0681bd11..8fbe99c7a6 100644 --- a/repos/libports/run/extract.run +++ b/repos/libports/run/extract.run @@ -36,7 +36,7 @@ build { app/extract } build_boot_image { extract - libc.lib.so + libc.lib.so vfs.lib.so libarchive.lib.so liblzma.lib.so zlib.lib.so } diff --git a/repos/libports/run/fatfs_blkio.run b/repos/libports/run/fatfs_blkio.run index 896aa21742..aaaff903d4 100644 --- a/repos/libports/run/fatfs_blkio.run +++ b/repos/libports/run/fatfs_blkio.run @@ -124,7 +124,7 @@ catch { exec sh -c $cmd } # generic modules set boot_modules { - libc.lib.so + libc.lib.so vfs.lib.so libm.lib.so test-fatfs_blkio } diff --git a/repos/libports/run/fetchurl.run b/repos/libports/run/fetchurl.run index 64d22664bf..39435e297b 100644 --- a/repos/libports/run/fetchurl.run +++ b/repos/libports/run/fetchurl.run @@ -108,7 +108,7 @@ set boot_modules { core init ld.lib.so curl.lib.so fetchurl - libc.lib.so + libc.lib.so vfs.lib.so libcrypto.lib.so libssh.lib.so libssl.lib.so diff --git a/repos/libports/run/ldso.run b/repos/libports/run/ldso.run index 81f1673440..cbc80284ab 100644 --- a/repos/libports/run/ldso.run +++ b/repos/libports/run/ldso.run @@ -29,7 +29,7 @@ install_config $config set boot_modules { core init test-ldso test-ldso_lib_1.lib.so test-ldso_lib_2.lib.so test-ldso_lib_dl.lib.so - ld.lib.so libc.lib.so libm.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so } build_boot_image $boot_modules diff --git a/repos/libports/run/libc.run b/repos/libports/run/libc.run index 094d50002a..4da25a64a9 100644 --- a/repos/libports/run/libc.run +++ b/repos/libports/run/libc.run @@ -30,7 +30,7 @@ install_config { build_boot_image { core init test-libc - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } append qemu_args " -nographic " diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index 0e27528854..c63e6476c7 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -108,7 +108,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so test-libc_block } diff --git a/repos/libports/run/libc_component.run b/repos/libports/run/libc_component.run index 7395ac8c64..39528b5ed2 100644 --- a/repos/libports/run/libc_component.run +++ b/repos/libports/run/libc_component.run @@ -86,7 +86,7 @@ install_config $config set boot_modules { core init timer terminal_crosslink test-libc_counter-source test-libc_component - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } build_boot_image $boot_modules diff --git a/repos/libports/run/libc_counter.run b/repos/libports/run/libc_counter.run index 7eab33da7d..ca181a59ba 100644 --- a/repos/libports/run/libc_counter.run +++ b/repos/libports/run/libc_counter.run @@ -68,7 +68,7 @@ install_config $config set boot_modules { core init timer terminal_crosslink test-libc_counter-source test-libc_counter-sink - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } build_boot_image $boot_modules diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index e85147717e..6774305cb4 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -137,7 +137,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } append boot_modules test-libc_$filesystem diff --git a/repos/libports/run/libc_getenv.run b/repos/libports/run/libc_getenv.run index 3136b1253c..c27c318a94 100644 --- a/repos/libports/run/libc_getenv.run +++ b/repos/libports/run/libc_getenv.run @@ -33,7 +33,7 @@ install_config { build_boot_image { core init test-libc_getenv - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } append qemu_args " -nographic " diff --git a/repos/libports/run/libc_pipe.run b/repos/libports/run/libc_pipe.run index 0cbb56c4a0..b6ce704b38 100644 --- a/repos/libports/run/libc_pipe.run +++ b/repos/libports/run/libc_pipe.run @@ -30,7 +30,7 @@ install_config { build_boot_image { core init test-libc_pipe posix.lib.so - ld.lib.so libc.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so } append qemu_args " -nographic " diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run index ea8251fec7..bf6123d046 100644 --- a/repos/libports/run/libc_select.run +++ b/repos/libports/run/libc_select.run @@ -68,7 +68,7 @@ install_config $config set boot_modules { core init timer terminal_crosslink test-libc_counter-source test-libc_select - ld.lib.so libc.lib.so libm.lib.so stdcxx.lib.so pthread.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so pthread.lib.so libc_pipe.lib.so posix.lib.so } diff --git a/repos/libports/run/libc_vfs.run b/repos/libports/run/libc_vfs.run index e2f1987e60..5c4e5d7bab 100644 --- a/repos/libports/run/libc_vfs.run +++ b/repos/libports/run/libc_vfs.run @@ -59,7 +59,7 @@ install_config $config build_boot_image { core init - ld.lib.so libc.lib.so + ld.lib.so libc.lib.so vfs.lib.so ram_fs test-libc_vfs } diff --git a/repos/libports/run/libc_vfs_block.run b/repos/libports/run/libc_vfs_block.run index f4f367e754..2ed97bd94d 100644 --- a/repos/libports/run/libc_vfs_block.run +++ b/repos/libports/run/libc_vfs_block.run @@ -74,7 +74,7 @@ install_config $config build_boot_image { core init - ld.lib.so libc.lib.so + ld.lib.so libc.lib.so vfs.lib.so ram_blk test-libc_vfs_block } diff --git a/repos/libports/run/libc_vfs_component.run b/repos/libports/run/libc_vfs_component.run index 522aab6046..948baa7b7e 100644 --- a/repos/libports/run/libc_vfs_component.run +++ b/repos/libports/run/libc_vfs_component.run @@ -97,7 +97,7 @@ install_config $config set boot_modules { core init timer terminal_crosslink vfs test-libc_counter-source test-libc_component - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } build_boot_image $boot_modules diff --git a/repos/libports/run/libc_vfs_counter.run b/repos/libports/run/libc_vfs_counter.run index f81dbad1ac..e35ef11e10 100644 --- a/repos/libports/run/libc_vfs_counter.run +++ b/repos/libports/run/libc_vfs_counter.run @@ -80,7 +80,7 @@ install_config $config set boot_modules { core init timer terminal_crosslink vfs test-libc_counter-source test-libc_counter-sink - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } build_boot_image $boot_modules diff --git a/repos/libports/run/libc_vfs_filesystem_test.inc b/repos/libports/run/libc_vfs_filesystem_test.inc index 8111a9d9ee..97d75cd9a8 100644 --- a/repos/libports/run/libc_vfs_filesystem_test.inc +++ b/repos/libports/run/libc_vfs_filesystem_test.inc @@ -160,7 +160,7 @@ install_config $config # generic modules append boot_modules { - libc.lib.so test-libc_vfs + libc.lib.so vfs.lib.so test-libc_vfs } lappend boot_modules {*}$test_boot_modules diff --git a/repos/libports/run/libc_vfs_fs.run b/repos/libports/run/libc_vfs_fs.run index 5c13597605..4c4df94112 100644 --- a/repos/libports/run/libc_vfs_fs.run +++ b/repos/libports/run/libc_vfs_fs.run @@ -62,7 +62,7 @@ install_config $config build_boot_image { core init vfs - ld.lib.so libc.lib.so + ld.lib.so libc.lib.so vfs.lib.so test-libc_vfs } diff --git a/repos/libports/run/libc_vfs_fs_test.inc b/repos/libports/run/libc_vfs_fs_test.inc index 8d89deaf6c..48bb4fb1e1 100644 --- a/repos/libports/run/libc_vfs_fs_test.inc +++ b/repos/libports/run/libc_vfs_fs_test.inc @@ -126,7 +126,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so test-libc_vfs } diff --git a/repos/libports/run/libc_vfs_ram.run b/repos/libports/run/libc_vfs_ram.run index 6411fd5e90..6e90e5fd71 100644 --- a/repos/libports/run/libc_vfs_ram.run +++ b/repos/libports/run/libc_vfs_ram.run @@ -56,7 +56,7 @@ install_config $config build_boot_image { core init - ld.lib.so libc.lib.so + ld.lib.so libc.lib.so vfs.lib.so test-libc_vfs } diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run index 867da9aace..164bb83667 100644 --- a/repos/libports/run/libc_vfs_select.run +++ b/repos/libports/run/libc_vfs_select.run @@ -77,7 +77,7 @@ 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 libm.lib.so stdcxx.lib.so pthread.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so pthread.lib.so libc_pipe.lib.so posix.lib.so } diff --git a/repos/libports/run/libc_with_libc.run b/repos/libports/run/libc_with_libc.run index eb3c212042..a799918cea 100644 --- a/repos/libports/run/libc_with_libc.run +++ b/repos/libports/run/libc_with_libc.run @@ -46,7 +46,7 @@ install_config $config set boot_modules { core init timer - ld.lib.so libc.lib.so + ld.lib.so libc.lib.so vfs.lib.so test-libc_with_libc } diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 7d68b98d70..87dad78450 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -125,7 +125,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libm.lib.so lwip.lib.so test-lwip_httpsrv posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so test-lwip_httpsrv posix.lib.so } # platform-specific modules diff --git a/repos/libports/run/lwip_lx.run b/repos/libports/run/lwip_lx.run index b679bcf7b1..74154e3cc4 100644 --- a/repos/libports/run/lwip_lx.run +++ b/repos/libports/run/lwip_lx.run @@ -58,7 +58,7 @@ install_config $config set boot_modules { core init timer linux_nic_drv - ld.lib.so libc.lib.so libm.lib.so posix.lib.so lwip.lib.so test-lwip_httpsrv + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip.lib.so test-lwip_httpsrv } build_boot_image $boot_modules diff --git a/repos/libports/run/mesa.inc b/repos/libports/run/mesa.inc index 0b0a31493f..ce8c82bbca 100644 --- a/repos/libports/run/mesa.inc +++ b/repos/libports/run/mesa.inc @@ -179,7 +179,7 @@ set boot_modules { core init ld.lib.so timer nitpicker pointer liquid_fb launchpad - libc.lib.so libm.lib.so pthread.lib.so + libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so egl.lib.so mesa.lib.so stdcxx.lib.so expat.lib.so glapi.lib.so diff --git a/repos/libports/run/moon.run b/repos/libports/run/moon.run index f269e18b69..26a2fb95ca 100644 --- a/repos/libports/run/moon.run +++ b/repos/libports/run/moon.run @@ -37,7 +37,7 @@ install_config { build_boot_image { core init timer test-moon - ld.lib.so libc.lib.so libm.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so } append qemu_args " -nographic " diff --git a/repos/libports/run/mupdf.run b/repos/libports/run/mupdf.run index 144806af74..d26b75859d 100644 --- a/repos/libports/run/mupdf.run +++ b/repos/libports/run/mupdf.run @@ -88,7 +88,7 @@ if {![file exist bin/test.pdf]} { set boot_modules { core init ld.lib.so timer - libc.lib.so libm.lib.so + 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 diff --git a/repos/libports/run/netty.inc b/repos/libports/run/netty.inc index 3a0f4b0a69..4dce902252 100644 --- a/repos/libports/run/netty.inc +++ b/repos/libports/run/netty.inc @@ -105,7 +105,7 @@ append config { append boot_modules { core init timer } [nic_drv_binary] { vfs - ld.lib.so libc.lib.so vfs_lxip.lib.so lxip.lib.so + ld.lib.so libc.lib.so vfs.lib.so vfs_lxip.lib.so lxip.lib.so } lappend_if [use_dynamic_rom] boot_modules dynamic_rom diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 5fa8e2c51b..63476d8da2 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -105,7 +105,7 @@ append boot_modules { timer } [nic_drv_binary] { nic_bridge ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so test-http_clnt diff --git a/repos/libports/run/nic_bridge_lighttpd.run b/repos/libports/run/nic_bridge_lighttpd.run index 2d055069eb..56dff32a4f 100644 --- a/repos/libports/run/nic_bridge_lighttpd.run +++ b/repos/libports/run/nic_bridge_lighttpd.run @@ -138,7 +138,7 @@ append boot_modules { timer } [nic_drv_binary] { nic_bridge ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so posix.lib.so lwip.lib.so test-http_clnt diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc index 6c2827f684..bd3f0ca324 100644 --- a/repos/libports/run/nic_router.inc +++ b/repos/libports/run/nic_router.inc @@ -61,7 +61,7 @@ proc server_config { name prot ip_addr gateway netmask nic port } { set boot_modules " core init timer nic_router nic_bridge nic_loopback ld.lib.so - libc.lib.so lwip.lib.so [client_bin udp] [server_bin udp] + libc.lib.so vfs.lib.so lwip.lib.so [client_bin udp] [server_bin udp] [client_bin http] [server_bin http] [platform_drv_boot_modules]" append qemu_args "-nographic " diff --git a/repos/libports/run/nim.run b/repos/libports/run/nim.run index 63ba464c77..4d6d709891 100644 --- a/repos/libports/run/nim.run +++ b/repos/libports/run/nim.run @@ -48,7 +48,7 @@ install_config $config set boot_modules { core init ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so rtc_drv test-nim timer diff --git a/repos/libports/run/nim_netty.run b/repos/libports/run/nim_netty.run index 632d04b12a..3aaed94912 100644 --- a/repos/libports/run/nim_netty.run +++ b/repos/libports/run/nim_netty.run @@ -67,7 +67,7 @@ install_config $config set boot_modules { core init timer linux_nic_drv ram_fs vfs - ld.lib.so libc.lib.so libm.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so vfs_lxip.lib.so lxip.lib.so test-nim_echo_server diff --git a/repos/libports/run/pcg32.run b/repos/libports/run/pcg32.run index a7b1625493..af0b685bad 100644 --- a/repos/libports/run/pcg32.run +++ b/repos/libports/run/pcg32.run @@ -39,7 +39,7 @@ install_config { build_boot_image { core init test-pcg32 - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } append qemu_args " -nographic " diff --git a/repos/libports/run/pthread.run b/repos/libports/run/pthread.run index 8857b9775a..01f8dde114 100644 --- a/repos/libports/run/pthread.run +++ b/repos/libports/run/pthread.run @@ -29,7 +29,7 @@ install_config { build_boot_image { core init test-pthread - ld.lib.so libc.lib.so libm.lib.so pthread.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so posix.lib.so } append qemu_args " -nographic " diff --git a/repos/libports/run/python.run b/repos/libports/run/python.run index f07816cc32..c2e23846e7 100644 --- a/repos/libports/run/python.run +++ b/repos/libports/run/python.run @@ -70,7 +70,7 @@ install_config $config # generic modules set boot_modules { core init - ld.lib.so libc.lib.so libm.lib.so python.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so python.lib.so posix.lib.so test-python } diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index 640d42f086..ecb9d5edb2 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -104,7 +104,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libm.lib.so libpng.lib.so diff --git a/repos/libports/run/qt5_avplay.run b/repos/libports/run/qt5_avplay.run index f6319a1264..7dd6aaf017 100644 --- a/repos/libports/run/qt5_avplay.run +++ b/repos/libports/run/qt5_avplay.run @@ -90,7 +90,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so mesa.lib.so posix.lib.so libc_pipe.lib.so diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index a2d90f9abc..173d4edd6c 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -77,7 +77,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libm.lib.so libpng.lib.so diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index fcb9993f99..a9980dc00d 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -73,7 +73,7 @@ append boot_modules { expat.lib.so freetype.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libm.lib.so libpng.lib.so diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index dc10814748..8bd09119f0 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -100,7 +100,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libcrypto.lib.so libm.lib.so diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index 90815c0641..b7ebddb9c7 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -80,7 +80,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libcrypto.lib.so libm.lib.so diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index d8a0c74914..e4142d1b54 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -80,7 +80,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libcrypto.lib.so libm.lib.so diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index f8419aa992..a1de0fd581 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -76,7 +76,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libm.lib.so libpng.lib.so diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index e3f42a272c..21e9a295c6 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -146,7 +146,7 @@ append boot_modules { freetype.lib.so glapi.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libm.lib.so libpng.lib.so diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index 910e6e1e7e..ae4a268871 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -80,7 +80,7 @@ append boot_modules { expat.lib.so mesa.lib.so ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libc_pipe.lib.so libm.lib.so libpng.lib.so diff --git a/repos/libports/run/rust.run b/repos/libports/run/rust.run index 0bdf1ab718..5446642001 100644 --- a/repos/libports/run/rust.run +++ b/repos/libports/run/rust.run @@ -20,7 +20,7 @@ install_config { } -build_boot_image "core init test-rust ld.lib.so libc.lib.so libm.lib.so posix.lib.so" +build_boot_image "core init test-rust ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so" append qemu_args "-nographic " diff --git a/repos/libports/run/sdl.run b/repos/libports/run/sdl.run index 874e239326..9d99f707c0 100644 --- a/repos/libports/run/sdl.run +++ b/repos/libports/run/sdl.run @@ -85,7 +85,7 @@ set boot_modules { core init timer test-sdl - ld.lib.so libc.lib.so libm.lib.so sdl.lib.so pthread.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so sdl.lib.so pthread.lib.so } # platform-specific modules diff --git a/repos/libports/run/sequence.run b/repos/libports/run/sequence.run index e15d63b973..2cea344a8c 100644 --- a/repos/libports/run/sequence.run +++ b/repos/libports/run/sequence.run @@ -104,7 +104,7 @@ install_config $config build_boot_image { sequence - libc.lib.so libm.lib.so posix.lib.so + libc.lib.so vfs.lib.so libm.lib.so posix.lib.so test-libc } diff --git a/repos/libports/run/smartcard.run b/repos/libports/run/smartcard.run index 1b664e9cee..e5a95f1cda 100644 --- a/repos/libports/run/smartcard.run +++ b/repos/libports/run/smartcard.run @@ -112,7 +112,7 @@ install_config $config set boot_modules { core init timer usb_drv test-smartcard ld.lib.so pcsc-lite.lib.so ccid.lib.so libusb.lib.so - libc.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so posix.lib.so + libc.lib.so vfs.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so posix.lib.so Info.plist } diff --git a/repos/libports/run/stdcxx.run b/repos/libports/run/stdcxx.run index 0069642d0e..225f05aec1 100644 --- a/repos/libports/run/stdcxx.run +++ b/repos/libports/run/stdcxx.run @@ -28,7 +28,7 @@ install_config { build_boot_image { core init test-stdcxx - ld.lib.so libc.lib.so libm.lib.so stdcxx.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so stdcxx.lib.so posix.lib.so } append qemu_args " -nographic " diff --git a/repos/libports/run/test-ping_client.run b/repos/libports/run/test-ping_client.run index 72b3771b1b..5a5c02e9ee 100644 --- a/repos/libports/run/test-ping_client.run +++ b/repos/libports/run/test-ping_client.run @@ -130,7 +130,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so lwip.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so lwip.lib.so posix.lib.so test-ping_client_libc_lwip } diff --git a/repos/libports/run/test-ping_server.run b/repos/libports/run/test-ping_server.run index 2932111660..055aca1384 100644 --- a/repos/libports/run/test-ping_server.run +++ b/repos/libports/run/test-ping_server.run @@ -104,7 +104,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so lwip.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so lwip.lib.so posix.lib.so test-ping_server_libc_lwip } diff --git a/repos/os/lib/mk/vfs.mk b/repos/os/lib/mk/vfs.mk index 435e11ca5e..593a1fdcd2 100644 --- a/repos/os/lib/mk/vfs.mk +++ b/repos/os/lib/mk/vfs.mk @@ -1,6 +1,8 @@ SRC_CC += file_system_factory.cc INC_DIR += $(REP_DIR)/src/lib/vfs -LIBS = ld +LIBS = base vpath %.cc $(REP_DIR)/src/lib/vfs + +SHARED_LIB = yes diff --git a/repos/os/lib/symbols/vfs b/repos/os/lib/symbols/vfs new file mode 100644 index 0000000000..45fca6df16 --- /dev/null +++ b/repos/os/lib/symbols/vfs @@ -0,0 +1,5 @@ +_ZN3Vfs26Global_file_system_factory6createERNS_3EnvEN6Genode8Xml_nodeE T +_ZN3Vfs26Global_file_system_factory6extendEPKcRNS_19File_system_factoryE T +_ZN3Vfs26Global_file_system_factoryC1ERN6Genode9AllocatorE T +_ZN3Vfs26Global_file_system_factoryC2ERN6Genode9AllocatorE T +_ZTVN3Vfs26Global_file_system_factoryE D 40 diff --git a/repos/os/recipes/api/vfs/content.mk b/repos/os/recipes/api/vfs/content.mk index 50016099f0..2fd504c323 100644 --- a/repos/os/recipes/api/vfs/content.mk +++ b/repos/os/recipes/api/vfs/content.mk @@ -1,6 +1,6 @@ -content: include/vfs include/ram_fs/chunk.h lib/mk/vfs.mk src/lib/vfs LICENSE +content: include/vfs lib/symbols/vfs LICENSE -include/vfs include/ram_fs/chunk.h lib/mk/vfs.mk src/lib/vfs: +include/vfs lib/symbols/vfs: $(mirror_from_rep_dir) LICENSE: diff --git a/repos/os/recipes/pkg/test-fs_report/archives b/repos/os/recipes/pkg/test-fs_report/archives index f444e1ff59..45e39401cd 100644 --- a/repos/os/recipes/pkg/test-fs_report/archives +++ b/repos/os/recipes/pkg/test-fs_report/archives @@ -3,3 +3,4 @@ _/src/ram_fs _/src/fs_rom _/src/fs_report _/src/test-fs_report +_/src/vfs diff --git a/repos/os/recipes/pkg/test-fs_report/runtime b/repos/os/recipes/pkg/test-fs_report/runtime index a141a10197..90bc624c2b 100644 --- a/repos/os/recipes/pkg/test-fs_report/runtime +++ b/repos/os/recipes/pkg/test-fs_report/runtime @@ -8,6 +8,7 @@ + diff --git a/repos/os/recipes/src/fs_report/used_apis b/repos/os/recipes/src/fs_report/used_apis index 0d27980fdf..f9afabe733 100644 --- a/repos/os/recipes/src/fs_report/used_apis +++ b/repos/os/recipes/src/fs_report/used_apis @@ -1,8 +1,4 @@ base -block_session -file_system_session os report_session -rtc_session -terminal_session vfs diff --git a/repos/os/recipes/src/vfs/api b/repos/os/recipes/src/vfs/api new file mode 100644 index 0000000000..0a15d9fc41 --- /dev/null +++ b/repos/os/recipes/src/vfs/api @@ -0,0 +1 @@ +vfs diff --git a/repos/os/recipes/src/vfs/content.mk b/repos/os/recipes/src/vfs/content.mk index a657f99e45..ad62f2736d 100644 --- a/repos/os/recipes/src/vfs/content.mk +++ b/repos/os/recipes/src/vfs/content.mk @@ -1,2 +1,8 @@ SRC_DIR = include/file_system src/server/vfs include $(GENODE_DIR)/repos/base/recipes/src/content.inc + + +content: include/ram_fs/chunk.h lib/mk/vfs.mk src/lib/vfs + +include/vfs include/ram_fs/chunk.h lib/mk/vfs.mk src/lib/vfs: + $(mirror_from_rep_dir) diff --git a/repos/os/run/fs_log.run b/repos/os/run/fs_log.run index a4720811c7..b852830eb8 100644 --- a/repos/os/run/fs_log.run +++ b/repos/os/run/fs_log.run @@ -66,7 +66,7 @@ create_boot_directory install_config $config -build_boot_image "core init ld.lib.so bomb timer vfs fs_log" +build_boot_image "core init ld.lib.so bomb timer vfs fs_log vfs.lib.so" append qemu_args " -nographic" diff --git a/repos/os/run/fs_report.run b/repos/os/run/fs_report.run index a7469fe927..6f122e4385 100644 --- a/repos/os/run/fs_report.run +++ b/repos/os/run/fs_report.run @@ -81,7 +81,7 @@ install_config $config # set boot_modules { core ld.lib.so init timer - fs_report fs_rom ram_fs test-fs_report + fs_report fs_rom ram_fs test-fs_report vfs.lib.so } build_boot_image $boot_modules diff --git a/repos/os/run/fs_rom_update_fs.run b/repos/os/run/fs_rom_update_fs.run index 378149e41d..8978654689 100644 --- a/repos/os/run/fs_rom_update_fs.run +++ b/repos/os/run/fs_rom_update_fs.run @@ -125,10 +125,11 @@ set boot_modules { core ld.lib.so init dynamic_rom fs_rom - vfs rom_logger rom_to_file timer + vfs + vfs.lib.so } build_boot_image $boot_modules diff --git a/repos/os/run/fs_rom_update_ram.run b/repos/os/run/fs_rom_update_ram.run index d34bc033fc..6738576940 100644 --- a/repos/os/run/fs_rom_update_ram.run +++ b/repos/os/run/fs_rom_update_ram.run @@ -110,10 +110,11 @@ set boot_modules { core ld.lib.so init dynamic_rom fs_rom - vfs rom_logger rom_to_file timer + vfs + vfs.lib.so } build_boot_image $boot_modules diff --git a/repos/os/run/log_core.run b/repos/os/run/log_core.run index e3ad2fe589..25666e783c 100644 --- a/repos/os/run/log_core.run +++ b/repos/os/run/log_core.run @@ -80,7 +80,7 @@ install_config { } -build_boot_image "core init timer ld.lib.so vfs fs_log log_core" +build_boot_image "core init timer ld.lib.so vfs fs_log log_core vfs.lib.so" append qemu_args " -nographic " diff --git a/repos/os/run/vfs_stress_fs.run b/repos/os/run/vfs_stress_fs.run index 35015cca5f..258972cf6e 100644 --- a/repos/os/run/vfs_stress_fs.run +++ b/repos/os/run/vfs_stress_fs.run @@ -42,7 +42,7 @@ install_config { } -build_boot_image "core init ld.lib.so timer ram_fs vfs_stress" +build_boot_image "core init ld.lib.so timer ram_fs vfs_stress vfs.lib.so" append qemu_args "-nographic -smp cpus=6" diff --git a/repos/os/run/vfs_stress_ram.run b/repos/os/run/vfs_stress_ram.run index 109d0d35ed..a91f3895ea 100644 --- a/repos/os/run/vfs_stress_ram.run +++ b/repos/os/run/vfs_stress_ram.run @@ -35,7 +35,7 @@ install_config { } -build_boot_image "core init ld.lib.so timer vfs_stress" +build_boot_image "core init ld.lib.so timer vfs_stress vfs.lib.so" append qemu_args "-nographic -smp cpus=6" diff --git a/repos/os/src/server/fs_report/main.cc b/repos/os/src/server/fs_report/main.cc index 116672e1b9..e487269005 100644 --- a/repos/os/src/server/fs_report/main.cc +++ b/repos/os/src/server/fs_report/main.cc @@ -263,4 +263,7 @@ struct Fs_report::Main } }; -void Component::construct(Genode::Env &env) { static Fs_report::Main main(env); } +void Component::construct(Genode::Env &env) +{ + static Fs_report::Main main(env); +} diff --git a/repos/ports/recipes/pkg/noux-system/archives b/repos/ports/recipes/pkg/noux-system/archives index 53448b68a0..0a4aa477de 100644 --- a/repos/ports/recipes/pkg/noux-system/archives +++ b/repos/ports/recipes/pkg/noux-system/archives @@ -9,3 +9,4 @@ _/src/ncurses _/src/nit_fb _/src/terminal _/src/init +_/src/vfs diff --git a/repos/ports/recipes/pkg/noux-system/runtime b/repos/ports/recipes/pkg/noux-system/runtime index 6c17902c59..3638adb35d 100644 --- a/repos/ports/recipes/pkg/noux-system/runtime +++ b/repos/ports/recipes/pkg/noux-system/runtime @@ -25,6 +25,7 @@ + diff --git a/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives b/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives index 113ebddb36..4008708727 100755 --- a/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives +++ b/repos/ports/recipes/pkg/vbox5-nova-sculpt/archives @@ -10,3 +10,4 @@ _/src/zlib _/src/nit_fb _/src/libiconv _/src/stdcxx +_/src/vfs diff --git a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime index 44f98a7773..1809bff76c 100755 --- a/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime +++ b/repos/ports/recipes/pkg/vbox5-nova-sculpt/runtime @@ -21,6 +21,7 @@ + diff --git a/repos/ports/recipes/src/noux/used_apis b/repos/ports/recipes/src/noux/used_apis index 8fc99275e1..0d8514f831 100644 --- a/repos/ports/recipes/src/noux/used_apis +++ b/repos/ports/recipes/src/noux/used_apis @@ -4,9 +4,6 @@ vfs libc noux noux_session -block_session -file_system_session -rtc_session terminal_session timer_session posix diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index b9ede4fd34..118c630bee 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -127,7 +127,7 @@ append boot_modules { testnit arora ld.lib.so - libc.lib.so libm.lib.so lwip.lib.so + libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so zlib.lib.so libpng.lib.so jpeg.lib.so libssl.lib.so libcrypto.lib.so freetype.lib.so libc_pipe.lib.so diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run index 70d66c59f4..0a0a3094e0 100644 --- a/repos/ports/run/debug_nitpicker.run +++ b/repos/ports/run/debug_nitpicker.run @@ -123,7 +123,7 @@ proc binary_name_gdbserver_platform_lib_so { } { # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libc_pipe.lib.so libc_terminal.lib.so + ld.lib.so libc.lib.so vfs.lib.so libc_pipe.lib.so libc_terminal.lib.so uart_drv gdb_monitor gdbserver_platform.lib.so nitpicker pointer scout diff --git a/repos/ports/run/dosbox.run b/repos/ports/run/dosbox.run index bfef30d366..47abdd4835 100644 --- a/repos/ports/run/dosbox.run +++ b/repos/ports/run/dosbox.run @@ -121,7 +121,7 @@ if {![file exists bin/dosbox.tar]} { append boot_modules { core init timer } [audio_drv_binary] { ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libm.lib.so lwip.lib.so libpng.lib.so stdcxx.lib.so sdl.lib.so sdl_net.lib.so pthread.lib.so zlib.lib.so dosbox dosbox.tar diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run index 3066786dd6..66b50b26df 100644 --- a/repos/ports/run/gdb_monitor.run +++ b/repos/ports/run/gdb_monitor.run @@ -96,7 +96,7 @@ proc binary_name_gdbserver_platform_lib_so { } { # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libm.lib.so libc_pipe.lib.so libc_terminal.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so libc_pipe.lib.so libc_terminal.lib.so uart_drv posix.lib.so gdb_monitor gdbserver_platform.lib.so test-gdb_monitor } diff --git a/repos/ports/run/gdb_monitor_interactive.run b/repos/ports/run/gdb_monitor_interactive.run index bfeff4dccb..bbc01fc88b 100644 --- a/repos/ports/run/gdb_monitor_interactive.run +++ b/repos/ports/run/gdb_monitor_interactive.run @@ -84,7 +84,7 @@ proc binary_name_gdbserver_platform_lib_so { } { # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so libc_pipe.lib.so libc_terminal.lib.so uart_drv gdb_monitor gdbserver_platform.lib.so test-gdb_monitor diff --git a/repos/ports/run/gdb_monitor_target_config.run b/repos/ports/run/gdb_monitor_target_config.run index 7e29fd663e..685851a6a1 100644 --- a/repos/ports/run/gdb_monitor_target_config.run +++ b/repos/ports/run/gdb_monitor_target_config.run @@ -84,7 +84,7 @@ proc binary_name_gdbserver_platform_lib_so { } { # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libc_pipe.lib.so libc_terminal.lib.so + ld.lib.so libc.lib.so vfs.lib.so libc_pipe.lib.so libc_terminal.lib.so uart_drv gdb_monitor gdbserver_platform.lib.so test-gdb_monitor_target_config } diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run index 334ecdd8e1..1a6ce58868 100644 --- a/repos/ports/run/genode_org.run +++ b/repos/ports/run/genode_org.run @@ -160,7 +160,7 @@ exec tar cfv bin/genode_org.tar -h -C bin/genode_org . # generic modules set boot_modules { core init timer ld.lib.so - libc.lib.so libm.lib.so posix.lib.so + libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip.lib.so zlib.lib.so lighttpd genode_org.tar } diff --git a/repos/ports/run/libc_noux.run b/repos/ports/run/libc_noux.run index f5c7d9479b..9482d6825a 100644 --- a/repos/ports/run/libc_noux.run +++ b/repos/ports/run/libc_noux.run @@ -73,7 +73,7 @@ install_config $config # generic modules set boot_modules { core init timer uart_drv ram_fs noux - ld.lib.so libc.lib.so libc_noux.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libc_noux.lib.so posix.lib.so libc_noux.tar } diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run index ed1d719c4e..ec3951b105 100644 --- a/repos/ports/run/lighttpd.run +++ b/repos/ports/run/lighttpd.run @@ -108,7 +108,7 @@ install_config $config # generic modules append boot_modules { core init timer ld.lib.so } [nic_drv_binary] { - libc.lib.so libm.lib.so posix.lib.so + libc.lib.so vfs.lib.so libm.lib.so posix.lib.so lwip.lib.so zlib.lib.so lighttpd } diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index 4e921c0d6c..f3daca93b0 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -326,7 +326,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libm.lib.so posix.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } append boot_modules " $netperf_app " diff --git a/repos/ports/run/noux.run b/repos/ports/run/noux.run index c1d9373921..7d159ee9a7 100644 --- a/repos/ports/run/noux.run +++ b/repos/ports/run/noux.run @@ -39,7 +39,7 @@ install_config { } build_boot_image { - core init timer log_terminal ld.lib.so noux libc.lib.so libm.lib.so + core init timer log_terminal ld.lib.so noux libc.lib.so vfs.lib.so libm.lib.so libc_noux.lib.so coreutils.tar posix.lib.so } diff --git a/repos/ports/run/noux_fork.run b/repos/ports/run/noux_fork.run index 9051ae1170..1114a60cf4 100644 --- a/repos/ports/run/noux_fork.run +++ b/repos/ports/run/noux_fork.run @@ -20,6 +20,7 @@ install_config { + @@ -28,7 +29,7 @@ install_config { - + @@ -42,7 +43,7 @@ install_config { } build_boot_image { - core init timer log_terminal noux ld.lib.so libc.lib.so libm.lib.so + core init timer log_terminal noux ld.lib.so libc.lib.so vfs.lib.so libm.lib.so libc_noux.lib.so posix.lib.so test-noux_fork } diff --git a/repos/ports/run/noux_gdb.run b/repos/ports/run/noux_gdb.run index 98cfea76d4..250450f66d 100644 --- a/repos/ports/run/noux_gdb.run +++ b/repos/ports/run/noux_gdb.run @@ -50,7 +50,7 @@ if { [have_spec foc] } { set gdb_target_binaries { test-gdb_monitor ld.lib.so - libc.lib.so + libc.lib.so vfs.lib.so libm.lib.so posix.lib.so } diff --git a/repos/ports/run/noux_net_netcat.run b/repos/ports/run/noux_net_netcat.run index 6eed344bcc..f31cf521ef 100644 --- a/repos/ports/run/noux_net_netcat.run +++ b/repos/ports/run/noux_net_netcat.run @@ -174,7 +174,7 @@ install_config $config # generic modules set boot_modules { core init timer tcp_terminal nic_bridge - ld.lib.so noux_net libc.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so + ld.lib.so noux_net libc.lib.so vfs.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so libc_noux.lib.so lwip.lib.so netcat.tar posix.lib.so } diff --git a/repos/ports/run/noux_signals.run b/repos/ports/run/noux_signals.run index 96c59e0907..5911591922 100644 --- a/repos/ports/run/noux_signals.run +++ b/repos/ports/run/noux_signals.run @@ -50,7 +50,7 @@ append config { install_config $config set boot_modules { - core init timer ld.lib.so noux libc.lib.so posix.lib.so + core init timer ld.lib.so noux libc.lib.so vfs.lib.so posix.lib.so uart_drv libc_noux.lib.so noux_signals.tar } diff --git a/repos/ports/run/noux_tool_chain_auto.run b/repos/ports/run/noux_tool_chain_auto.run index b77a008a3f..497e075d3b 100644 --- a/repos/ports/run/noux_tool_chain_auto.run +++ b/repos/ports/run/noux_tool_chain_auto.run @@ -251,7 +251,7 @@ install_config $config # generic modules set boot_modules { core init timer ld.lib.so noux log_terminal ram_fs - libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so stdcxx.lib.so + libc.lib.so vfs.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so stdcxx.lib.so pcre.lib.so posix.lib.so vimrc bash_profile } diff --git a/repos/ports/run/noux_uname.run b/repos/ports/run/noux_uname.run index 404f44d28a..ae1bff3998 100644 --- a/repos/ports/run/noux_uname.run +++ b/repos/ports/run/noux_uname.run @@ -68,7 +68,7 @@ build_boot_image { coreutils.tar libc_noux.lib.so libm.lib.so - noux libc.lib.so + noux libc.lib.so vfs.lib.so posix.lib.so sequence timer diff --git a/repos/ports/run/vbox_auto_genode_usb_hid.run b/repos/ports/run/vbox_auto_genode_usb_hid.run index e42895f035..048cf197ad 100644 --- a/repos/ports/run/vbox_auto_genode_usb_hid.run +++ b/repos/ports/run/vbox_auto_genode_usb_hid.run @@ -218,7 +218,7 @@ set boot_modules { virtualbox-nova usb_hid.iso vm_genode_usb_hid.vbox - ld.lib.so libc.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so libc_terminal.lib.so libiconv.lib.so stdcxx.lib.so qemu-usb.lib.so } diff --git a/repos/ports/run/verify.run b/repos/ports/run/verify.run index f8043af33f..6de4321ddd 100644 --- a/repos/ports/run/verify.run +++ b/repos/ports/run/verify.run @@ -47,7 +47,7 @@ exec tar cf [run_dir]/genode/test.tar -C [genode_dir]/repos/ports/src/app/verify file copy [genode_dir]/depot/nfeske/pubkey [run_dir]/genode/pubkey -build_boot_image { verify libc.lib.so pthread.lib.so } +build_boot_image { verify libc.lib.so vfs.lib.so pthread.lib.so } append qemu_args " -nographic " diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index 1c03e82168..f366f697fb 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -310,7 +310,7 @@ lappend_if [expr $use_gui] boot_modules nit_fb lappend_if [expr $use_gui] boot_modules pointer append boot_modules { - ld.lib.so libc.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so libc_terminal.lib.so libiconv.lib.so stdcxx.lib.so qemu-usb.lib.so } diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index d53e60a884..b8e89a7722 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -346,7 +346,7 @@ install_config $config append boot_modules { core init timer part_blk ahci_drv fs_rom - ld.lib.so libc.lib.so libm.lib.so pthread.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so libc_terminal.lib.so libiconv.lib.so stdcxx.lib.so qemu-usb.lib.so diff --git a/repos/ports/run/virtualbox_nic_router.run b/repos/ports/run/virtualbox_nic_router.run index 709d6c0e7b..e2219ec364 100644 --- a/repos/ports/run/virtualbox_nic_router.run +++ b/repos/ports/run/virtualbox_nic_router.run @@ -202,7 +202,7 @@ lappend_if [have_spec linux] boot_modules fb_sdl lappend_if [have_spec x86] boot_modules rtc_drv append boot_modules { - ld.lib.so libc.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so + ld.lib.so libc.lib.so vfs.lib.so libm.lib.so pthread.lib.so libc_pipe.lib.so libc_terminal.lib.so libiconv.lib.so stdcxx.lib.so qemu-usb.lib.so } diff --git a/repos/ports/src/noux/minimal/target.mk b/repos/ports/src/noux/minimal/target.mk index 0b0d6b62cf..0de56d143a 100644 --- a/repos/ports/src/noux/minimal/target.mk +++ b/repos/ports/src/noux/minimal/target.mk @@ -1,5 +1,5 @@ TARGET = noux -LIBS = alarm vfs +LIBS = base alarm vfs SRC_CC = main.cc syscall.cc dummy_net.cc construct.cc INC_DIR += $(PRG_DIR) INC_DIR += $(PRG_DIR)/../