Merge branch 'servo' into 'master'

servo

See merge request redox-os/redox!1641

config/x86_64/servo.toml

@@ -0,0 +1,54 @@
+# Default build system configuration
+
+include = ["../x11.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 15000
+
+# Package settings
+[packages]
+# example = {}
+servo = {}
+libxcursor = {}
+
+[[files]]
+path = "/usr/bin/orbital-x11"
+data = """
+#!/usr/bin/env bash
+
+set -ex
+
+export DISPLAY=:0
+echo "Starting X server on display ${DISPLAY}..."
+X "${DISPLAY}" -verbose 6 &
+X_PID=$!
+
+# Wait for X to be ready
+sleep 3
+
+# Check if X is running
+if ! kill -0 $X_PID 2>/dev/null; then
+    echo "X server failed to start!"
+    exit 1
+fi
+
+echo "Starting window manager..."
+twm &
+
+echo "Starting xterm..."
+xterm &
+#also, half of debug options in debug help do not exist any more.
+
+# Try to force X11 backend for Servo
+echo "Starting servo with X11 backend..."
+export WINIT_UNIX_BACKEND=x11
+export LD_DEBUG=all
+export RUST_LOG=trace
+export RUST_BACKTRACE=full
+export WEBRENDER_DEBUG=1
+DISPLAY=:0 /usr/servo/servo --debug disable-share-style-cache,dump-stacking-context-tree,dump-flow-tree,dump-rule-tree,dump-style-tree,gc-profile,profile-script-events,relayout-event,trace-layout,wr-stats &
+"""

cookbook

@@ -1 +1 @@
-Subproject commit 1816f94f9805a35a9a7085aa52e46635cfbe638c
+Subproject commit 59e0a2c91fa81723fc6ebb0b1aaa31cd10ee4e88

mk/config.mk

@@ -72,6 +72,9 @@ endif
 ifeq ($(REPO_DEBUG),1)
 	export COOKBOOK_NOSTRIP=true
 	export COOKBOOK_DEBUG=true
+#TODO: https://gitlab.redox-os.org/redox-os/relibc/-/issues/226
+#	export PROFILE=debug
+#	export RUSTCFLAGS="-Cdebuginfo=2"
 endif
 
 UNAME := $(shell uname)

mk/repo.mk

@@ -169,11 +169,12 @@ endif
 
 export DEBUG_BIN?=
 
-# Debug a recipe with gdbgui inside podman, for example: debug.drivers-initfs DEBUG_BIN=pcid
-# Please set REPO_DEBUG=1 to your .config to enable debug symbols and run `make cr.recipe rebuild`
-# Also, before opening gdbgui at http://localhost:5000, start qemu with `make qemu gdb=yes`
-# Experimental and may not work if ARCH is different with what podman is running
+# Debug a statically linked program with gdbgui, for example: debug.drivers-initfs DEBUG_BIN=pcid
+# Enable debug symbols with `REPO_DEBUG=1 make cr.recipe rebuild`, make sure `file` outputs "debug_info, not stripped"
+# Open http://localhost:5000/dashboard, start QEMU with `make qemu kvm=no QEMU_SMP=1 gdb=yes` before opening a session
+# Experimental, may not work if ARCH is different with what host is running
 debug.%: $(FSTOOLS_TAG) FORCE
+ifeq ($(PODMAN_BUILD),1)
 	@cd cookbook/$(shell make find.$* | grep ^recipes) && \
 		export RECIPE_STAGE=target/$(TARGET)/stage && \
 		export BIN_PATH=$$(find $$RECIPE_STAGE -type f -name "$(DEBUG_BIN)" -or -type f -name "$*") && \
@@ -186,3 +187,13 @@ debug.%: $(FSTOOLS_TAG) FORCE
 		redox-kernel-debug --gdb-cmd "gdb -ex 'set confirm off' \
 			-ex 'add-symbol-file /binary' \
 			-ex 'target remote host.containers.internal:1234'"
+else
+	@cd cookbook/$(shell make find.$* | grep ^recipes) && \
+		export RECIPE_STAGE=target/$(TARGET)/stage && \
+		export BIN_PATH=$$(find $$RECIPE_STAGE -type f -name "$(DEBUG_BIN)" -or -type f -name "$*") && \
+		file $$BIN_PATH 2> /dev/null || ( echo "Binary is not found, please set DEBUG_BIN" && exit 1 ) && \
+		echo "Opening gdbgui for debugging $* with binary '$$BIN_PATH'" && echo "----------" && \
+		gdbgui.pex --gdb-cmd "gdb -ex 'set confirm off' \
+			-ex 'add-symbol-file $$BIN_PATH' \
+			-ex 'target remote localhost:1234'"
+endif

relibc

@@ -1 +1 @@
-Subproject commit 9fa3eceaebd97986d23b3dc20b8be027577600f0
+Subproject commit 6110a77044c8509f404cdb97eab5a0e2da08617b