From c7f1b85652c29d747a6c14c81bf1ec68004199e5 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Mon, 14 Apr 2014 11:57:22 +0200 Subject: [PATCH] Retire libc_{log, block, fs, rom} Those plugins are superseded by libc_vfs. Issue #999 --- base-linux/run/lx_fs.run | 26 +- base-linux/run/lx_rmap.inc | 4 - base-linux/src/test/lx_rmap/dynamic/target.mk | 2 +- dde_linux/run/usb_net.run | 7 +- dde_rump/run/rump_ext2.run | 15 +- dde_rump/run/rump_fat.run | 15 +- gems/run/http_blk.run | 68 +- gems/run/tcp_terminal.run | 5 +- gems/src/server/file_terminal/README | 12 +- gems/src/server/file_terminal/target.mk | 2 +- gems/src/server/tcp_terminal/target.mk | 2 +- libports/lib/mk/libc_block.mk | 7 - libports/lib/mk/libc_fs.mk | 7 - libports/lib/mk/libc_fuse_exfat.mk | 2 +- libports/lib/mk/libc_fuse_ext2.mk | 2 +- libports/lib/mk/libc_fuse_ntfs-3g.mk | 2 +- libports/lib/mk/libc_log.mk | 6 - libports/lib/mk/libc_rom.mk | 6 - libports/run/avplay.run | 14 +- libports/run/eglgears.run | 7 +- libports/run/expat.run | 12 +- libports/run/http_srv_tracing.run | 36 +- .../http_srv_tracing_nonblocking_panda.run | 2 +- libports/run/http_srv_tracing_panda.run | 7 +- libports/run/{test-libc.run => libc.run} | 9 +- libports/run/libc_block.run | 10 +- libports/run/libc_ffat.run | 7 + libports/run/libc_ffat_fs.run | 18 +- libports/run/libc_filesystem_test.inc | 14 +- libports/run/libc_fs.run | 67 -- libports/run/libc_fs_tar_fs.run | 12 +- libports/run/libc_fuse_exfat.run | 7 +- libports/run/libc_fuse_ext2.run | 7 +- libports/run/libc_vfs.run | 5 +- libports/run/lwip.run | 11 +- libports/run/lwip_lx.run | 7 +- libports/run/moon.run | 7 +- libports/run/mupdf.run | 10 +- libports/run/network_test.inc | 5 +- libports/run/pthread.run | 7 +- libports/run/python.run | 40 +- libports/run/qt5.run | 1 - libports/run/qt5_avplay.run | 3 - libports/run/qt5_calculatorform.run | 1 - libports/run/qt5_openglwindow.run | 8 +- libports/run/qt5_previewer.run | 1 - libports/run/qt5_qpluginwidget.run | 3 - libports/run/qt5_quicktest.run | 22 +- libports/run/qt5_samegame.run | 22 +- libports/run/qt5_tetrix.run | 3 - libports/run/qt5_textedit.run | 14 +- libports/run/sdl.run | 5 +- libports/run/test-nicbridge_static.run | 12 +- libports/run/test-nicbridge_static2.run | 65 +- libports/run/test-ping_client.run | 13 +- libports/run/test-ping_server.run | 5 +- libports/src/app/avplay/target.mk | 2 +- libports/src/app/eglgears/target.mk | 2 +- libports/src/app/mupdf/target.mk | 2 +- .../src/app/qt5/examples/samegame/target.mk | 2 - .../src/app/qt5/examples/textedit/target.mk | 1 - .../src/app/qt5/qt_avplay/avplay_policy.h | 19 + libports/src/app/qt5/qt_quicktest/target.mk | 2 - libports/src/app/qt5/tmpl/target_final.inc | 2 +- libports/src/lib/libc_block/plugin.cc | 544 ------------ libports/src/lib/libc_ffat/plugin.cc | 75 +- libports/src/lib/libc_fs/plugin.cc | 824 ------------------ libports/src/lib/libc_fuse/plugin.cc | 33 +- libports/src/lib/libc_log/plugin.cc | 129 --- libports/src/lib/libc_rom/README | 5 - libports/src/lib/libc_rom/plugin.cc | 186 ---- libports/src/lib/libc_vfs/plugin.cc | 6 +- libports/src/lib/libdrm/ioctl.cc | 11 +- libports/src/server/fs_log/target.mk | 2 +- libports/src/server/fuse_fs/exfat/target.mk | 2 +- libports/src/server/fuse_fs/ext2/target.mk | 2 +- libports/src/server/fuse_fs/ntfs-3g/target.mk | 2 +- libports/src/test/expat/target.mk | 2 +- libports/src/test/libc/target.mk | 2 +- libports/src/test/libc_block/target.mk | 2 +- libports/src/test/libc_ffat/target.mk | 2 +- libports/src/test/libc_fs/target.mk | 6 - libports/src/test/libc_fs_tar_fs/target.mk | 2 +- libports/src/test/libc_fuse_exfat/target.mk | 2 +- libports/src/test/libc_fuse_ext2/target.mk | 2 +- libports/src/test/libc_fuse_ntfs-3g/target.mk | 2 +- libports/src/test/libc_vfs/target.mk | 2 +- libports/src/test/lwip/http_clnt/target.mk | 2 +- libports/src/test/lwip/http_srv/target.mk | 2 +- .../src/test/lwip/http_srv_static/target.mk | 2 +- .../src/test/lwip/http_srv_tracing/target.mk | 2 +- .../http_srv_tracing_nonblocking/target.mk | 2 +- libports/src/test/lwip/loopback/target.mk | 2 +- .../lwip/pingpong/client/libc_lwip/target.mk | 2 +- .../test/lwip/pingpong/client/lwip/target.mk | 2 +- .../src/test/lwip/pingpong/client/main.cc | 5 +- .../lwip/pingpong/server/libc_lwip/target.mk | 2 +- .../test/lwip/pingpong/server/lwip/target.mk | 2 +- libports/src/test/moon/target.mk | 2 +- libports/src/test/pthread/target.mk | 2 +- libports/src/test/python/hello.py | 13 - libports/src/test/python/target.mk | 2 +- libports/src/test/sdl/target.mk | 2 +- os/run/ldso.run | 5 + ports/lib/mk/virtualbox_libc_support.inc | 5 +- ports/run/arora.run | 15 +- ports/run/dosbox.run | 21 +- ports/run/gdb_monitor.run | 13 +- ports/run/gdb_monitor_interactive.run | 13 +- ports/run/genode_org.run | 30 +- ports/run/lighttpd.run | 56 +- ports/run/netperf.inc | 6 +- ports/run/noux_net_netcat.run | 3 +- ports/run/virtualbox.run | 31 +- ports/run/virtualbox_auto.inc | 2 +- ports/run/virtualbox_auto_disk.run | 14 + ports/src/app/arora/target.mk | 4 +- ports/src/app/dosbox/target.mk | 4 +- ports/src/app/gdb_monitor/target.mk | 2 +- ports/src/app/lighttpd/target.mk | 2 +- ports/src/app/netperf/target.inc | 2 +- ports/src/test/gdb_monitor/target.mk | 2 +- ports/src/virtualbox/dummies.cc | 1 - ports/src/virtualbox/logger.cc | 2 +- qt4/run/qt_avplay.run | 2 - qt4/run/textedit.run | 13 +- qt4/src/app/examples/textedit/target.mk | 2 +- 127 files changed, 665 insertions(+), 2197 deletions(-) delete mode 100644 libports/lib/mk/libc_block.mk delete mode 100644 libports/lib/mk/libc_fs.mk delete mode 100644 libports/lib/mk/libc_log.mk delete mode 100644 libports/lib/mk/libc_rom.mk rename libports/run/{test-libc.run => libc.run} (77%) delete mode 100644 libports/run/libc_fs.run delete mode 100644 libports/src/lib/libc_block/plugin.cc delete mode 100644 libports/src/lib/libc_fs/plugin.cc delete mode 100644 libports/src/lib/libc_log/plugin.cc delete mode 100644 libports/src/lib/libc_rom/README delete mode 100644 libports/src/lib/libc_rom/plugin.cc delete mode 100644 libports/src/test/libc_fs/target.mk delete mode 100644 libports/src/test/python/hello.py diff --git a/base-linux/run/lx_fs.run b/base-linux/run/lx_fs.run index 5e2f470d9..1f0aed7be 100644 --- a/base-linux/run/lx_fs.run +++ b/base-linux/run/lx_fs.run @@ -1,5 +1,5 @@ # -# \brief Test for using the libc_fs plugin with the Linux file system +# \brief Test for using the libc_vfs plugin with the Linux file system # \author Norman Feske # \author Christian Helmuth # \date 2013-11-07 @@ -11,7 +11,7 @@ assert_spec linux # Build # -build { core init server/lx_fs test/libc_fs } +build { core init server/lx_fs test/libc_vfs } create_boot_directory @@ -37,10 +37,18 @@ install_config { - + - + + + + + + + + + } @@ -49,17 +57,15 @@ install_config { # Create test-directory structure # -exec mkdir -p bin/libc_fs +exec mkdir -p bin/libc_vfs # # Boot modules # build_boot_image { - core init - ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so - lx_fs test-libc_fs - libc_fs + core init ld.lib.so libc.lib.so lx_fs test-libc_vfs + libc_vfs } # @@ -74,6 +80,6 @@ puts "\ntest succeeded\n" # Cleanup test-directory structure # -exec rm -r bin/libc_fs +exec rm -r bin/libc_vfs # vi: set ft=tcl : diff --git a/base-linux/run/lx_rmap.inc b/base-linux/run/lx_rmap.inc index de1f29c61..ded0506e8 100644 --- a/base-linux/run/lx_rmap.inc +++ b/base-linux/run/lx_rmap.inc @@ -44,7 +44,6 @@ append_if [expr {$test_type eq "static"}] config { } append_if [expr {$test_type eq "dynamic"}] config { } - append config { @@ -61,9 +60,6 @@ set boot_modules { core init} lappend_if [expr {$test_type eq "static"}] boot_modules test-lx_rmap_static lappend_if [expr {$test_type eq "dynamic"}] boot_modules test-lx_rmap_dynamic lappend_if [expr {$test_type eq "dynamic"}] boot_modules ld.lib.so -lappend_if [expr {$test_type eq "dynamic"}] boot_modules libc.lib.so -lappend_if [expr {$test_type eq "dynamic"}] boot_modules libc_log.lib.so -lappend_if [expr {$test_type eq "dynamic"}] boot_modules libm.lib.so build_boot_image $boot_modules diff --git a/base-linux/src/test/lx_rmap/dynamic/target.mk b/base-linux/src/test/lx_rmap/dynamic/target.mk index 4c6aafcef..4cd1bb969 100644 --- a/base-linux/src/test/lx_rmap/dynamic/target.mk +++ b/base-linux/src/test/lx_rmap/dynamic/target.mk @@ -5,6 +5,6 @@ endif TARGET = test-lx_rmap_dynamic SRC_CC = main.cc -LIBS = base libc +LIBS = base ld vpath main.cc $(PRG_DIR)/.. diff --git a/dde_linux/run/usb_net.run b/dde_linux/run/usb_net.run index 0db99b8e8..1534743fe 100644 --- a/dde_linux/run/usb_net.run +++ b/dde_linux/run/usb_net.run @@ -63,6 +63,11 @@ set config { + + + + + } append_if [have_spec acpi] config { @@ -112,7 +117,7 @@ install_config $config set boot_modules { core init timer usb_drv - ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so test-lwip_httpsrv + ld.lib.so libc.lib.so lwip.lib.so test-lwip_httpsrv } lappend_if [have_spec acpi] boot_modules acpi_drv diff --git a/dde_rump/run/rump_ext2.run b/dde_rump/run/rump_ext2.run index 9a828906d..4baf9de6e 100644 --- a/dde_rump/run/rump_ext2.run +++ b/dde_rump/run/rump_ext2.run @@ -12,7 +12,7 @@ set build_components { drivers/timer server/ram_blk server/rump_fs - test/libc_fs + test/libc_vfs } build $build_components @@ -60,8 +60,16 @@ append config { - + + + + + + + + + } @@ -73,10 +81,9 @@ install_config $config # generic modules set boot_modules { - core init timer test-libc_fs ram_blk + core init timer test-libc_vfs ram_blk rump.lib.so rump_fs.lib.so rump_fs ld.lib.so ext2.raw libc.lib.so - libc_fs.lib.so libc_log.lib.so } build_boot_image $boot_modules diff --git a/dde_rump/run/rump_fat.run b/dde_rump/run/rump_fat.run index 5be533bdf..31b56dbc8 100644 --- a/dde_rump/run/rump_fat.run +++ b/dde_rump/run/rump_fat.run @@ -12,7 +12,7 @@ set build_components { drivers/timer server/ram_blk server/rump_fs - test/libc_fs + test/libc_vfs } build $build_components @@ -60,8 +60,16 @@ append config { - + + + + + + + + + } @@ -73,10 +81,9 @@ install_config $config # generic modules set boot_modules { - core init timer test-libc_fs ram_blk + core init timer test-libc_vfs ram_blk rump.lib.so rump_fs.lib.so rump_fs ld.lib.so fs.raw libc.lib.so - libc_fs.lib.so libc_log.lib.so } build_boot_image $boot_modules diff --git a/gems/run/http_blk.run b/gems/run/http_blk.run index 058346991..70b6c42f5 100644 --- a/gems/run/http_blk.run +++ b/gems/run/http_blk.run @@ -17,7 +17,6 @@ if {$use_nic_driver} { set network_driver "nic_drv" } set build_components { core init drivers/timer - server/ram_fs server/nic_bridge server/http_blk app/lighttpd @@ -126,36 +125,6 @@ append config { - - - - - - - - - -# lighttpd configuration -server.port = 80 -server.document-root = "/website" -server.event-handler = "select" -server.network-backend = "write" -index-file.names = ( - "index.xhtml", "index.html", "index.htm" -) -mimetype.assign = ( - ".html" => "text/html", - ".htm" => "text/html" -) - - - - - - - - - @@ -178,7 +147,36 @@ mimetype.assign = ( - + + + + + + + + + +# lighttpd configuration +server.port = 80 +server.document-root = "/website" +server.event-handler = "select" +server.network-backend = "write" +index-file.names = ( + "index.xhtml", "index.html", "index.htm" +) +mimetype.assign = ( + ".html" => "text/html", + ".htm" => "text/html" +) + + + + + + + + @@ -197,8 +195,8 @@ catch { exec dd if=/dev/zero of=bin/index.bin bs=512 count=400 } # generic modules set boot_modules { - core init timer ld.lib.so ram_fs - libc.lib.so libm.lib.so libc_fs.lib.so libc_log.lib.so + core init timer ld.lib.so + libc.lib.so libm.lib.so lwip.lib.so zlib.lib.so lighttpd nic_bridge http_blk index.bin test-rom_blk } @@ -221,4 +219,4 @@ append qemu_args " -net user -redir tcp:5555::80 " append qemu_args " -nographic -serial mon:stdio " run_genode_until {.*all done, finished!.*} 120 -exec rm -f bin/index.bin \ No newline at end of file +exec rm -f bin/index.bin diff --git a/gems/run/tcp_terminal.run b/gems/run/tcp_terminal.run index f8d1bef18..d0f589c3e 100644 --- a/gems/run/tcp_terminal.run +++ b/gems/run/tcp_terminal.run @@ -59,6 +59,9 @@ set config { + + + @@ -85,7 +88,7 @@ install_config $config set boot_modules { core init timer nic_drv - ld.lib.so libc.lib.so lwip.lib.so libc_log.lib.so libc_lock_pipe.lib.so + ld.lib.so libc.lib.so lwip.lib.so libc_lock_pipe.lib.so tcp_terminal test-terminal_echo } diff --git a/gems/src/server/file_terminal/README b/gems/src/server/file_terminal/README index bd7d9bd81..ed0f19d41 100644 --- a/gems/src/server/file_terminal/README +++ b/gems/src/server/file_terminal/README @@ -1,9 +1,15 @@ -File terminal is a service that provides Genode's Terminal_session interface -for a given file via a File_system_session. +File terminal is a service that provides a terminal-session interface and +redirects the terminal input and output to a file. ! ! ! h +! +! +! +! +! +! ! -To keep things simple a client can only open one file at the moment. +To keep things simple, a client can only open one file at the moment. diff --git a/gems/src/server/file_terminal/target.mk b/gems/src/server/file_terminal/target.mk index 65eeea7a4..16adf9572 100644 --- a/gems/src/server/file_terminal/target.mk +++ b/gems/src/server/file_terminal/target.mk @@ -1,3 +1,3 @@ TARGET = file_terminal SRC_CC = main.cc -LIBS = libc libc_fs libc_log +LIBS = libc libc_vfs diff --git a/gems/src/server/tcp_terminal/target.mk b/gems/src/server/tcp_terminal/target.mk index 302077dda..18d42ff19 100644 --- a/gems/src/server/tcp_terminal/target.mk +++ b/gems/src/server/tcp_terminal/target.mk @@ -1,3 +1,3 @@ TARGET = tcp_terminal SRC_CC = main.cc -LIBS = libc libc_lwip_nic_dhcp libc_log libc_lock_pipe +LIBS = libc libc_lwip_nic_dhcp libc_vfs libc_lock_pipe diff --git a/libports/lib/mk/libc_block.mk b/libports/lib/mk/libc_block.mk deleted file mode 100644 index 0c320a173..000000000 --- a/libports/lib/mk/libc_block.mk +++ /dev/null @@ -1,7 +0,0 @@ -LIBS = libc - -SRC_CC = plugin.cc - -vpath %.cc $(REP_DIR)/src/lib/libc_block - -SHARED_LIB = yes diff --git a/libports/lib/mk/libc_fs.mk b/libports/lib/mk/libc_fs.mk deleted file mode 100644 index c94ce68bc..000000000 --- a/libports/lib/mk/libc_fs.mk +++ /dev/null @@ -1,7 +0,0 @@ -SRC_CC = plugin.cc -LIBS += libc -INC_DIR += $(REP_DIR)/src/lib/libc - -vpath plugin.cc $(REP_DIR)/src/lib/libc_fs - -SHARED_LIB = yes diff --git a/libports/lib/mk/libc_fuse_exfat.mk b/libports/lib/mk/libc_fuse_exfat.mk index 08cd5f46f..6d7ac68a3 100644 --- a/libports/lib/mk/libc_fuse_exfat.mk +++ b/libports/lib/mk/libc_fuse_exfat.mk @@ -4,7 +4,7 @@ EXFAT_DIR = $(REP_DIR)/contrib/$(EXFAT) SRC_C = $(notdir $(EXFAT_DIR)/fuse/main.c) SRC_CC = init.cc -LIBS = libc libc_block libc_fuse libfuse libexfat +LIBS = libc libc_vfs libc_fuse libfuse libexfat vpath %.c $(EXFAT_DIR)/fuse vpath %.cc $(REP_DIR)/src/lib/exfat diff --git a/libports/lib/mk/libc_fuse_ext2.mk b/libports/lib/mk/libc_fuse_ext2.mk index a4b1bbc63..0d59b7374 100644 --- a/libports/lib/mk/libc_fuse_ext2.mk +++ b/libports/lib/mk/libc_fuse_ext2.mk @@ -5,7 +5,7 @@ FILTER_OUT = fuse-ext2.probe.c fuse-ext2.wait.c SRC_C = $(filter-out $(FILTER_OUT), $(notdir $(wildcard $(FUSE_EXT2_DIR)/*.c))) SRC_CC = init.cc -LIBS = libc libc_block libc_fuse libfuse libext2fs +LIBS = libc libc_vfs libc_fuse libfuse libext2fs CC_OPT = -DHAVE_CONFIG_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 diff --git a/libports/lib/mk/libc_fuse_ntfs-3g.mk b/libports/lib/mk/libc_fuse_ntfs-3g.mk index bd01909e3..ec69a0d87 100644 --- a/libports/lib/mk/libc_fuse_ntfs-3g.mk +++ b/libports/lib/mk/libc_fuse_ntfs-3g.mk @@ -4,7 +4,7 @@ NTFS_3G_DIR = $(REP_DIR)/contrib/$(NTFS_3G) SRC_C = ntfs-3g.c ntfs-3g_common.c SRC_CC = init.cc -LIBS = libc libc_block libc_fuse libfuse libntfs-3g +LIBS = libc libc_vfs libc_fuse libfuse libntfs-3g CC_OPT = -DHAVE_TIMESPEC -DHAVE_CONFIG_H -DRECORD_LOCKING_NOT_IMPLEMENTED diff --git a/libports/lib/mk/libc_log.mk b/libports/lib/mk/libc_log.mk deleted file mode 100644 index 0df2b0729..000000000 --- a/libports/lib/mk/libc_log.mk +++ /dev/null @@ -1,6 +0,0 @@ -SRC_CC = plugin.cc -LIBS += libc - -vpath plugin.cc $(REP_DIR)/src/lib/libc_log - -SHARED_LIB = yes diff --git a/libports/lib/mk/libc_rom.mk b/libports/lib/mk/libc_rom.mk deleted file mode 100644 index ce167c4c9..000000000 --- a/libports/lib/mk/libc_rom.mk +++ /dev/null @@ -1,6 +0,0 @@ -SRC_CC = plugin.cc -LIBS += libc - -vpath plugin.cc $(REP_DIR)/src/lib/libc_rom - -SHARED_LIB = yes diff --git a/libports/run/avplay.run b/libports/run/avplay.run index 6f1419108..cf34acecd 100644 --- a/libports/run/avplay.run +++ b/libports/run/avplay.run @@ -95,7 +95,7 @@ append config { - + @@ -108,7 +108,7 @@ append config { - + @@ -118,6 +118,12 @@ append config { + + + + + + @@ -135,8 +141,8 @@ install_config $config # set boot_modules { - core init timer oss_drv mixer avplay - ld.lib.so libc.lib.so libc_log.lib.so libc_rom.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so + core init timer audio_out_drv mixer avplay + ld.lib.so libc.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 mediafile } diff --git a/libports/run/eglgears.run b/libports/run/eglgears.run index c65a303ca..62d6d5e0c 100644 --- a/libports/run/eglgears.run +++ b/libports/run/eglgears.run @@ -97,6 +97,11 @@ append config { + + + + + @@ -110,7 +115,7 @@ install_config $config set boot_modules { core init ld.lib.so timer nitpicker nit_fb launchpad eglgears - gallium.lib.so libc.lib.so libm.lib.so libc_log.lib.so pthread.lib.so + gallium.lib.so libc.lib.so libm.lib.so pthread.lib.so } lappend_if [have_spec linux] boot_modules fb_sdl diff --git a/libports/run/expat.run b/libports/run/expat.run index 6b11a2bb6..646b2756c 100644 --- a/libports/run/expat.run +++ b/libports/run/expat.run @@ -40,7 +40,15 @@ install_config { - + + + + + + + + + @@ -52,7 +60,7 @@ install_config { build_boot_image { core init timer - ld.lib.so libc.lib.so libc_log.lib.so libc_rom.lib.so expat.lib.so + ld.lib.so libc.lib.so expat.lib.so test-expat } diff --git a/libports/run/http_srv_tracing.run b/libports/run/http_srv_tracing.run index a5b016b5b..bd456a171 100644 --- a/libports/run/http_srv_tracing.run +++ b/libports/run/http_srv_tracing.run @@ -30,7 +30,7 @@ requires_installation_of lynx build { core init - drivers/pci drivers/timer drivers/nic + drivers/acpi drivers/pci drivers/timer drivers/nic test/lwip/http_srv_tracing } @@ -59,7 +59,7 @@ set config { - + @@ -68,13 +68,32 @@ set config { - } + + + + + + } -append_if [have_spec pci] config { +append_if [have_spec acpi] config { + + + + + + + + + + + + } + +append_if [expr ![have_spec acpi] && [have_spec pci]] config { - + - } + } append config { @@ -90,12 +109,13 @@ install_config $config set boot_modules { core init timer nic_drv - ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so + ld.lib.so libc.lib.so lwip.lib.so test-lwip_httpsrv_tracing } # platform-specific modules -lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec pci] boot_modules pci_drv +lappend_if [have_spec acpi] boot_modules acpi_drv build_boot_image $boot_modules diff --git a/libports/run/http_srv_tracing_nonblocking_panda.run b/libports/run/http_srv_tracing_nonblocking_panda.run index f934ac831..99af67951 100644 --- a/libports/run/http_srv_tracing_nonblocking_panda.run +++ b/libports/run/http_srv_tracing_nonblocking_panda.run @@ -75,7 +75,7 @@ set boot_modules { usb_drv gpio_drv test-lwip_httpsrv_tracing_nob - ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so + ld.lib.so libc.lib.so lwip.lib.so } build_boot_image [join $boot_modules " "] diff --git a/libports/run/http_srv_tracing_panda.run b/libports/run/http_srv_tracing_panda.run index a7008d150..9ade79a93 100644 --- a/libports/run/http_srv_tracing_panda.run +++ b/libports/run/http_srv_tracing_panda.run @@ -60,6 +60,11 @@ set config { + + + + + } @@ -75,7 +80,7 @@ set boot_modules { usb_drv gpio_drv test-lwip_httpsrv_tracing - ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so + ld.lib.so libc.lib.so lwip.lib.so } build_boot_image [join $boot_modules " "] diff --git a/libports/run/test-libc.run b/libports/run/libc.run similarity index 77% rename from libports/run/test-libc.run rename to libports/run/libc.run index 32b4b4434..61c2b9b19 100644 --- a/libports/run/test-libc.run +++ b/libports/run/libc.run @@ -20,14 +20,19 @@ install_config { - + + + + + + } build_boot_image { core init test-libc - ld.lib.so libc.lib.so libc_log.lib.so libm.lib.so + ld.lib.so libc.lib.so libm.lib.so } append qemu_args " -nographic -m 64 " diff --git a/libports/run/libc_block.run b/libports/run/libc_block.run index 928fa84b7..fac083825 100644 --- a/libports/run/libc_block.run +++ b/libports/run/libc_block.run @@ -76,6 +76,14 @@ set config { + + + + + + + + } @@ -128,7 +136,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libc_log.lib.so libc_block.lib.so + ld.lib.so libc.lib.so test-libc_block } diff --git a/libports/run/libc_ffat.run b/libports/run/libc_ffat.run index 7cc6c89f6..726faa4db 100644 --- a/libports/run/libc_ffat.run +++ b/libports/run/libc_ffat.run @@ -2,4 +2,11 @@ set mkfs_cmd mkfs.vfat set mkfs_opts "-F32" set filesystem ffat +# +# The ffat_libc plugin opens a block session directly. If the VFS opened +# the block session, the plugin would try to open a second one, which +# would get denied by the block driver. +# +set libc_dev_blkdev "" + source ${genode_dir}/libports/run/libc_filesystem_test.inc diff --git a/libports/run/libc_ffat_fs.run b/libports/run/libc_ffat_fs.run index b0f860efa..1f8eae84c 100644 --- a/libports/run/libc_ffat_fs.run +++ b/libports/run/libc_ffat_fs.run @@ -1,5 +1,5 @@ # -# \brief Test for using the libc_fs plugin with the FFAT file system +# \brief Test for using the libc_vfs plugin with the FFAT file system # \author Christian Prochaska # \date 2012-07-03 # @@ -21,7 +21,7 @@ set build_components { core init drivers/timer server/ffat_fs - test/libc_fs + test/libc_vfs } lappend_if [have_spec pci] build_components drivers/pci @@ -63,8 +63,16 @@ set config { - + + + + + + + + + } @@ -116,8 +124,8 @@ install_config $config # generic modules set boot_modules { core init timer ffat_fs - ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so - test-libc_fs + ld.lib.so libc.lib.so + test-libc_vfs } lappend_if [have_spec pci] boot_modules pci_drv diff --git a/libports/run/libc_filesystem_test.inc b/libports/run/libc_filesystem_test.inc index 72454abcc..754a00166 100644 --- a/libports/run/libc_filesystem_test.inc +++ b/libports/run/libc_filesystem_test.inc @@ -105,9 +105,17 @@ append config { + + + } +append config $libc_dev_blkdev +append config { + + + + - -} + } append_if [have_spec acpi] config { @@ -171,7 +179,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libc_log.lib.so libc_block.lib.so + ld.lib.so libc.lib.so } append boot_modules test-libc_$filesystem diff --git a/libports/run/libc_fs.run b/libports/run/libc_fs.run deleted file mode 100644 index d18a2764f..000000000 --- a/libports/run/libc_fs.run +++ /dev/null @@ -1,67 +0,0 @@ -# -# \brief Test for using the libc_fs plugin with the RAM file system -# \author Norman Feske -# \date 2012-04-11 -# - -# -# Build -# - -build { core init server/ram_fs test/libc_fs } - -create_boot_directory - -# -# Generate config -# - -install_config { - - - - - - - - - - - - - - - - - - - - - - - - - - -} - -# -# Boot modules -# - -build_boot_image { - core init - ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so - ram_fs test-libc_fs -} - -# -# Execute test case -# - -append qemu_args " -m 128 -nographic " -run_genode_until {.*child exited with exit value 0.*} 60 - -puts "\ntest succeeded\n" - -# vi: set ft=tcl : diff --git a/libports/run/libc_fs_tar_fs.run b/libports/run/libc_fs_tar_fs.run index 2eb7a8cee..8334ade94 100644 --- a/libports/run/libc_fs_tar_fs.run +++ b/libports/run/libc_fs_tar_fs.run @@ -1,5 +1,5 @@ # -# \brief Test for using the libc_fs plugin with the TAR file system +# \brief Test for using the libc_vfs plugin with the TAR file system # \author Christian Prochaska # \date 2012-08-20 # @@ -53,6 +53,14 @@ set config { + + + + + + + + } @@ -82,7 +90,7 @@ exec tar cfv bin/libc_fs_tar_fs.tar -C bin/libc_fs_tar_fs . # generic modules set boot_modules { core init timer tar_fs - ld.lib.so libc.lib.so libc_log.lib.so libc_fs.lib.so + ld.lib.so libc.lib.so test-libc_fs_tar_fs libc_fs_tar_fs.tar } diff --git a/libports/run/libc_fuse_exfat.run b/libports/run/libc_fuse_exfat.run index 95fd5fba6..7f8c3bce0 100644 --- a/libports/run/libc_fuse_exfat.run +++ b/libports/run/libc_fuse_exfat.run @@ -1,5 +1,6 @@ -set mkfs_cmd mkfs.exfat -set mkfs_opts "" -set filesystem fuse_exfat +set mkfs_cmd mkfs.exfat +set mkfs_opts "" +set filesystem fuse_exfat +set libc_dev_blkdev {} source ${genode_dir}/libports/run/libc_filesystem_test.inc diff --git a/libports/run/libc_fuse_ext2.run b/libports/run/libc_fuse_ext2.run index a92db5f36..ed7d50c25 100644 --- a/libports/run/libc_fuse_ext2.run +++ b/libports/run/libc_fuse_ext2.run @@ -1,5 +1,6 @@ -set mkfs_cmd mkfs.ext2 -set mkfs_opts "-F" -set filesystem fuse_ext2 +set mkfs_cmd mkfs.ext2 +set mkfs_opts "-F" +set filesystem fuse_ext2 +set libc_dev_blkdev {} source ${genode_dir}/libports/run/libc_filesystem_test.inc diff --git a/libports/run/libc_vfs.run b/libports/run/libc_vfs.run index 8b33c59f5..2b2578211 100644 --- a/libports/run/libc_vfs.run +++ b/libports/run/libc_vfs.run @@ -40,11 +40,12 @@ install_config { - + + @@ -58,7 +59,7 @@ install_config { build_boot_image { core init - ld.lib.so libc.lib.so libc_log.lib.so + ld.lib.so libc.lib.so ram_fs test-libc_vfs } diff --git a/libports/run/lwip.run b/libports/run/lwip.run index 871ef627e..fd5db894c 100644 --- a/libports/run/lwip.run +++ b/libports/run/lwip.run @@ -75,7 +75,12 @@ set config { - } + + + + + + } append_if [have_spec platform_arndale] config { @@ -125,7 +130,7 @@ append_if [expr ![have_spec acpi] && [have_spec pci]] config { - } + } append config { @@ -140,7 +145,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so test-lwip_httpsrv + ld.lib.so libc.lib.so lwip.lib.so test-lwip_httpsrv } # platform-specific modules diff --git a/libports/run/lwip_lx.run b/libports/run/lwip_lx.run index 0bfa66a6c..c42e7985b 100644 --- a/libports/run/lwip_lx.run +++ b/libports/run/lwip_lx.run @@ -42,6 +42,11 @@ set config { + + + + + } @@ -54,7 +59,7 @@ install_config $config set boot_modules { core init timer nic_drv - ld.lib.so libc.lib.so libc_log.lib.so lwip.lib.so test-lwip_httpsrv + ld.lib.so libc.lib.so lwip.lib.so test-lwip_httpsrv } build_boot_image $boot_modules diff --git a/libports/run/moon.run b/libports/run/moon.run index 34b3cf242..0ebc06f05 100644 --- a/libports/run/moon.run +++ b/libports/run/moon.run @@ -28,13 +28,18 @@ install_config { + + + + + } build_boot_image { core init timer test-moon - ld.lib.so libc.lib.so libc_log.lib.so libm.lib.so + ld.lib.so libc.lib.so libm.lib.so } append qemu_args " -nographic -m 64 " diff --git a/libports/run/mupdf.run b/libports/run/mupdf.run index df44b46ff..17bda29de 100644 --- a/libports/run/mupdf.run +++ b/libports/run/mupdf.run @@ -61,6 +61,14 @@ append config { + + + + + + + + } @@ -83,7 +91,7 @@ if {![file exist bin/test.pdf]} { set boot_modules { core init ld.lib.so timer mupdf - libc.lib.so libm.lib.so libc_log.lib.so libc_rom.lib.so + libc.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 test.pdf diff --git a/libports/run/network_test.inc b/libports/run/network_test.inc index 0cca42ce9..9d5bba897 100644 --- a/libports/run/network_test.inc +++ b/libports/run/network_test.inc @@ -81,6 +81,9 @@ append config { + + + } append_if $use_nic_bridge config { @@ -147,7 +150,7 @@ install_config $config # generic modules set boot_modules { core init timer - ld.lib.so libc.lib.so lwip.lib.so libc_log.lib.so + ld.lib.so libc.lib.so lwip.lib.so } lappend_if $use_nic_bridge boot_modules nic_bridge diff --git a/libports/run/pthread.run b/libports/run/pthread.run index 61caff38c..bdc69089c 100644 --- a/libports/run/pthread.run +++ b/libports/run/pthread.run @@ -21,13 +21,18 @@ install_config { + + + + + } build_boot_image { core init test-pthread - ld.lib.so libc.lib.so libc_log.lib.so pthread.lib.so + ld.lib.so libc.lib.so pthread.lib.so } append qemu_args " -nographic -m 64 " diff --git a/libports/run/python.run b/libports/run/python.run index 970beb5c9..5a6e830c1 100644 --- a/libports/run/python.run +++ b/libports/run/python.run @@ -41,6 +41,24 @@ set config {