noux_gdb: adapt to libc VFS

Fixes #1150.
This commit is contained in:
Christian Prochaska 2014-05-20 17:23:09 +02:00 committed by Norman Feske
parent 039e333d2b
commit 15e231d733
1 changed files with 14 additions and 7 deletions

View File

@ -24,7 +24,6 @@ set build_components {
drivers/framebuffer drivers/pci drivers/input drivers/usb drivers/framebuffer drivers/pci drivers/input drivers/usb
server/terminal server/terminal_crosslink server/terminal server/terminal_crosslink
app/gdb_monitor app/gdb_monitor
test/gdb_monitor
} }
lappend_if [have_spec gpio] build_components drivers/gpio lappend_if [have_spec gpio] build_components drivers/gpio
@ -42,7 +41,6 @@ set gdb_target_binaries {
test-gdb_monitor test-gdb_monitor
ld.lib.so ld.lib.so
libc.lib.so libc.lib.so
libc_log.lib.so
} }
lappend gdb_target_binaries ${gdb_target_binary_name} lappend gdb_target_binaries ${gdb_target_binary_name}
@ -136,10 +134,19 @@ append config {
<service name="Terminal"><child name="terminal_gdb"/></service> <service name="Terminal"><child name="terminal_gdb"/></service>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>
<config> } <config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc> }
append config " append config "
<target name=\"${gdb_target_binary_name}\"/> " <target name=\"${gdb_target_binary_name}\"> "
append config { append config {
<config>
<libc stdout="/dev/log" stderr="/dev/log">
<vfs> <dir name="dev"> <log/> </dir> </vfs>
</libc>
</config>
</target>
<preserve name="RAM" quantum="5M"/> <preserve name="RAM" quantum="5M"/>
</config> </config>
</start> </start>
@ -150,14 +157,14 @@ append config {
<if-arg key="label" value=""/><child name="terminal_noux"/> <if-arg key="label" value=""/><child name="terminal_noux"/>
</service> </service>
<service name="Terminal"> <service name="Terminal">
<if-arg key="label" value="noux(terminal_fs)"/><child name="terminal_gdb"/> <if-arg key="label" value="/dev/gdb"/><child name="terminal_gdb"/>
</service> </service>
<any-service><parent/><any-child/></any-service> <any-service><parent/><any-child/></any-service>
</route> </route>
<config> <config>
<fstab> <fstab>
<tar name="gdb.tar" at="/"/> <tar name="gdb.tar" at="/"/>
<dir name="dev"><terminal name="gdb"/></dir> <dir name="dev"><terminal name="gdb" label="/dev/gdb"/></dir>
<dir name="gdb"> } <dir name="gdb"> }
append config " append config "
<tar name=\"${gdb_target_binary_name}.tar\"/> <tar name=\"${gdb_target_binary_name}.tar\"/>
@ -202,7 +209,7 @@ install_config $config
set boot_modules { set boot_modules {
core init timer ld.lib.so noux terminal terminal_crosslink core init timer ld.lib.so noux terminal terminal_crosslink
libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so expat.lib.so libc.lib.so libm.lib.so libc_noux.lib.so ncurses.lib.so expat.lib.so
libc_lock_pipe.lib.so libc_log.lib.so libc_terminal.lib.so libc_lock_pipe.lib.so libc_terminal.lib.so
gdb_monitor test-gdb_monitor gdb_monitor test-gdb_monitor
gdb.tar test-gdb_monitor.tar test-gdb_monitor-src.tar gdb.tar test-gdb_monitor.tar test-gdb_monitor-src.tar
} }