vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'gdbserver' into 'master'

Browse source 
Add gdbserver + fix net=redir

See merge request redox-os/redox!1240
This commit is contained in:
Jeremy Soller 2020-06-19 12:01:19 +00:00
commit d07d1a2b05
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/desktop.toml
View file

@ -45,6 +45,7 @@ findutils = {}
#games = {} #games = {}
#gawk = {} #gawk = {}
#gcc = {} #gcc = {}
gdbserver = {}
#gears = {} #gears = {}
#generaluser-gs = {} #generaluser-gs = {}
#gettext = {} #gettext = {}

2
cookbook

@ -1 +1 @@
Subproject commit b51cb6b4e7252991b626ef780e2cdf488582ad86 Subproject commit e1cd72b7759b446228b76b25c3bea97d5ce0bf21

7
mk/qemu.mk
View file

@ -20,12 +20,15 @@ ifeq ($(net),no)
else else
ifneq ($(bridge),) ifneq ($(bridge),)
QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0 QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0
else
ifeq ($(net),redir)
# port 8080 and 8083 - webservers
# port 64126 - our gdbserver implementation
QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126 -device e1000,netdev=net0,id=nic0
else else
QEMUFLAGS+=-netdev user,id=net0 -device e1000,netdev=net0 \ QEMUFLAGS+=-netdev user,id=net0 -device e1000,netdev=net0 \
-object filter-dump,id=f1,netdev=net0,file=build/network.pcap -object filter-dump,id=f1,netdev=net0,file=build/network.pcap
endif endif
ifeq ($(net),redir)
QEMUFLAGS+=-redir tcp:8023::8023 -redir tcp:8080::8080
endif endif
endif endif
ifeq ($(vga),no) ifeq ($(vga),no)