From c0f03a28e99fd41356e81445648b509713233fa1 Mon Sep 17 00:00:00 2001
From: Christian Prochaska <christian.prochaska@genode-labs.com>
Date: Mon, 29 Apr 2019 16:52:31 +0200
Subject: [PATCH] gdb_monitor: use terminal VFS plugin

... instead of the deprecated libc terminal plugin.

Fixes #3318
---
 repos/ports/run/debug_nitpicker.run           | 4 ++--
 repos/ports/run/gdb_monitor.run               | 4 ++--
 repos/ports/run/gdb_monitor_interactive.run   | 4 ++--
 repos/ports/run/gdb_monitor_target_config.run | 4 ++--
 repos/ports/run/noux_gdb.run                  | 4 ++--
 repos/ports/src/app/gdb_monitor/target.mk     | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run
index 73df10249a..7195e04c59 100644
--- a/repos/ports/run/debug_nitpicker.run
+++ b/repos/ports/run/debug_nitpicker.run
@@ -80,7 +80,7 @@ set config {
 				</config>
 			</target>
 			<preserve name="RAM" quantum="2M"/>
-			<vfs> <dir name="dev"> <log/> </dir> </vfs>
+			<vfs> <dir name="dev"> <log/> <terminal/> </dir> </vfs>
 			<libc stdout="/dev/log" stderr="/dev/log"/>
 		</config>
 	</start>
@@ -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 vfs.lib.so libc_pipe.lib.so libc_terminal.lib.so
+	ld.lib.so libc.lib.so vfs.lib.so libc_pipe.lib.so
 	uart_drv
 	gdb_monitor gdbserver_platform.lib.so
 	nitpicker pointer scout
diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run
index 177e6a58db..1ece2db2fa 100644
--- a/repos/ports/run/gdb_monitor.run
+++ b/repos/ports/run/gdb_monitor.run
@@ -75,7 +75,7 @@ set config {
 				</config>
 			</target>
 			<preserve name="RAM" quantum="4M"/>
-			<vfs> <dir name="dev"> <log/> </dir> </vfs>
+			<vfs> <dir name="dev"> <log/> <terminal/> </dir> </vfs>
 			<libc stdout="/dev/log" stderr="/dev/log"/>
 		</config>
 	</start>
@@ -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 vfs.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
 	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 c13e12e868..59535d549d 100644
--- a/repos/ports/run/gdb_monitor_interactive.run
+++ b/repos/ports/run/gdb_monitor_interactive.run
@@ -63,7 +63,7 @@ set config {
 				</config>
 			</target>
 			<preserve name="RAM" quantum="4M"/>
-			<vfs> <dir name="dev"> <log/> </dir> </vfs>
+			<vfs> <dir name="dev"> <log/> <terminal/> </dir> </vfs>
 			<libc stdout="/dev/log" stderr="/dev/log"/>
 		</config>
 	</start>
@@ -85,7 +85,7 @@ proc binary_name_gdbserver_platform_lib_so { } {
 set boot_modules {
 	core init timer
 	ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
-	libc_pipe.lib.so libc_terminal.lib.so
+	libc_pipe.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 2d5e4df21c..0ed988b5b0 100644
--- a/repos/ports/run/gdb_monitor_target_config.run
+++ b/repos/ports/run/gdb_monitor_target_config.run
@@ -63,7 +63,7 @@ set config {
 				</config>
 			</target>
 			<preserve name="RAM" quantum="3M"/>
-			<vfs> <dir name="dev"> <log/> </dir> </vfs>
+			<vfs> <dir name="dev"> <log/> <terminal/> </dir> </vfs>
 			<libc stdout="/dev/log" stderr="/dev/log"/>
 		</config>
 	</start>
@@ -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 vfs.lib.so libc_pipe.lib.so libc_terminal.lib.so
+	ld.lib.so libc.lib.so vfs.lib.so libc_pipe.lib.so
 	uart_drv
 	gdb_monitor gdbserver_platform.lib.so test-gdb_monitor_target_config
 }
diff --git a/repos/ports/run/noux_gdb.run b/repos/ports/run/noux_gdb.run
index ba4f8a50a3..14dead9553 100644
--- a/repos/ports/run/noux_gdb.run
+++ b/repos/ports/run/noux_gdb.run
@@ -121,7 +121,7 @@ append config {
 				<any-service><parent/><any-child/></any-service>
 			</route>
 			<config>
-				<vfs> <dir name="dev"> <log/> </dir> </vfs>
+				<vfs> <dir name="dev"> <log/> <terminal/> </dir> </vfs>
 				<libc stdout="/dev/log" stderr="/dev/log"/> }
 append config "
 				<target name=\"${gdb_target_binary_name}\"> "
@@ -198,7 +198,7 @@ proc binary_name_gdbserver_platform_lib_so { } {
 set boot_modules {
 	terminal_crosslink
 	expat.lib.so
-	libc_pipe.lib.so libc_terminal.lib.so
+	libc_pipe.lib.so
 	gdb_monitor gdbserver_platform.lib.so test-gdb_monitor
 	test-gdb_monitor.tar test-gdb_monitor-src.tar
 }
diff --git a/repos/ports/src/app/gdb_monitor/target.mk b/repos/ports/src/app/gdb_monitor/target.mk
index 89ece8bfb6..a7970dcf0a 100644
--- a/repos/ports/src/app/gdb_monitor/target.mk
+++ b/repos/ports/src/app/gdb_monitor/target.mk
@@ -10,7 +10,7 @@ INC_DIR += $(GDB_CONTRIB_DIR)/include \
            $(PRG_DIR)/gdbserver \
            $(PRG_DIR)
 
-LIBS    =  libc libc_terminal libc_pipe \
+LIBS    =  libc libc_pipe \
            gdbserver_platform gdbserver_libc_support
 
 SRC_C   =  event-loop.c \