Merge branch 'gdbserver' into 'master'

Add gdbserver + fix net=redir

See merge request redox-os/redox!1240

config/desktop.toml

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

cookbook

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

mk/qemu.mk

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