From 1912a1ed198bcbdd7898de9bd383f125f95e88c1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 19 Sep 2025 15:01:33 -0600 Subject: [PATCH 01/42] Update submodules --- cookbook | 2 +- relibc | 2 +- rust | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook b/cookbook index ad5c95233..1816f94f9 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit ad5c9523350ae3640acf9fb80a1d37ac05a3c893 +Subproject commit 1816f94f9805a35a9a7085aa52e46635cfbe638c diff --git a/relibc b/relibc index 2f0d5eb97..9fa3eceae 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 2f0d5eb970337f595128505d1435a1086f998600 +Subproject commit 9fa3eceaebd97986d23b3dc20b8be027577600f0 diff --git a/rust b/rust index 675042b53..22a51d1af 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 675042b53266e5fb2e1933355782f098c5406e3a +Subproject commit 22a51d1af8939897d8142a8d2b54d2611ce031cd From 4c8267ee477e3b12905fecf486ccc2674f4dd038 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 19 Sep 2025 15:01:57 -0600 Subject: [PATCH 02/42] Update jeremy configs --- config/i686/jeremy.toml | 2 ++ config/x86_64/jeremy.toml | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/config/i686/jeremy.toml b/config/i686/jeremy.toml index d76b88d7c..4c0c08c4c 100644 --- a/config/i686/jeremy.toml +++ b/config/i686/jeremy.toml @@ -9,6 +9,8 @@ filesystem_size = 4000 # Package settings [packages] +rustpython = "ignore" # https://github.com/Alexhuszagh/rust-lexical/issues/218 + # apps cosmic-text = {} pixelcannon = {} diff --git a/config/x86_64/jeremy.toml b/config/x86_64/jeremy.toml index 931599743..dc8eef32e 100644 --- a/config/x86_64/jeremy.toml +++ b/config/x86_64/jeremy.toml @@ -14,10 +14,10 @@ filesystem_size = 8192 cosmic-player = {} cosmic-reader = {} #cosmic-settings = {} # requires recvmsg/sendmsg -cosmic-store = {} +#cosmic-store = {} # requires recvmsg/sendmsg cosmic-term = {} cosmic-text = {} -qemu = {} +#qemu = {} # not building schismtracker = {} # cli @@ -56,13 +56,14 @@ winit = {} autoconf = {} automake = {} cargo = {} +cookbook = {} gcc13 = {} gnu-binutils = {} gnu-make = {} nasm = {} patch = {} pkg-config = {} -#rust = {} +rust = {} #rustpython = {} # games @@ -71,7 +72,7 @@ eduke32 = {} flycast = {} freeciv = {} gigalomania = {} -love = {} +#love = {} # not building mednafen = {} mgba = {} openjazz = {} @@ -86,8 +87,8 @@ rs-nes = {} # need game for testing rust64 = {} # need roms rustual-boy = {} # need game for testing scummvm = {} # need game for testing -sm64ex = {} -spacecadetpinball = {} +#sm64ex = {} # not building +#spacecadetpinball = {} # not building #syobonaction = {} #vice = {} # broken on new toolchain #vvvvvv = {} # cannot find -lgcc_s From 86fba41a91f274687a4be7fd36c3632382d8c24d Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Sun, 21 Sep 2025 16:11:55 +0000 Subject: [PATCH 03/42] Add gdbgui that works for native build --- mk/config.mk | 3 +++ mk/repo.mk | 19 +++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mk/config.mk b/mk/config.mk index e625b1a57..a96bb1954 100644 --- a/mk/config.mk +++ b/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) diff --git a/mk/repo.mk b/mk/repo.mk index dfbcacfe4..b617f1e5f 100644 --- a/mk/repo.mk +++ b/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 From 378172ec40ab98565b0af9ff5c52ee3e90823497 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 21 Sep 2025 21:05:14 -0600 Subject: [PATCH 04/42] Update cookbook and relibc --- cookbook | 2 +- relibc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index 1816f94f9..26908fd5f 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 1816f94f9805a35a9a7085aa52e46635cfbe638c +Subproject commit 26908fd5f305f10313093c78e7ffdc40723cd6fb diff --git a/relibc b/relibc index 9fa3eceae..6110a7704 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 9fa3eceaebd97986d23b3dc20b8be027577600f0 +Subproject commit 6110a77044c8509f404cdb97eab5a0e2da08617b From 8495a070d3a9241c5841bbaa321c673d7258738f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 21 Sep 2025 21:15:03 -0600 Subject: [PATCH 05/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 26908fd5f..16b65fdad 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 26908fd5f305f10313093c78e7ffdc40723cd6fb +Subproject commit 16b65fdadb5cb41c3bed3cdb25c4294f38b6c66f From 784dbffa0cedbf9be8bb604a4f50c23d8fe0c84a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 21 Sep 2025 21:18:29 -0600 Subject: [PATCH 06/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 16b65fdad..dd0f30a61 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 16b65fdadb5cb41c3bed3cdb25c4294f38b6c66f +Subproject commit dd0f30a61ec3ab658270b08edbf3904620ee0206 From a48565251950e4bb11190ea8d74814897edca18e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 22 Sep 2025 11:36:04 -0600 Subject: [PATCH 07/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index dd0f30a61..59e0a2c91 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit dd0f30a61ec3ab658270b08edbf3904620ee0206 +Subproject commit 59e0a2c91fa81723fc6ebb0b1aaa31cd10ee4e88 From fdca3856ba2117d8aadc6495705512d3dba3c659 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 25 Sep 2025 09:51:15 -0600 Subject: [PATCH 08/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 59e0a2c91..f379d330b 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 59e0a2c91fa81723fc6ebb0b1aaa31cd10ee4e88 +Subproject commit f379d330b9afc8d85f9c58e9d101a67e59d71fd6 From f8d4486f77c66230d422c9badac0eef338d03749 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Fri, 26 Sep 2025 07:55:24 +0000 Subject: [PATCH 09/42] Add server demo and add more server packages to CI --- config/x86_64/ci.toml | 19 ++++++++++++++-- config/x86_64/server-demo.toml | 41 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 config/x86_64/server-demo.toml diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index 04ea65ecd..b12346541 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -27,6 +27,7 @@ base-initfs = {} bash = {} binutils = {} bootloader = {} +bzip2 = {} ca-certificates = {} cairo = {} #cairodemo = {} # linking errors @@ -94,22 +95,29 @@ kernel = {} kibi = {} lci = {} libc-bench = {} +libavif = {} +libedit = {} libffi = {} libgcc = {} libgmp = {} libiconv = {} +libicu = {} libjpeg = {} libogg = {} +libonig = {} liborbital = {} libpng = {} libstdcxx = {} libsodium = {} libvorbis = {} +libwebp = {} libxkbcommon = {} +libuuid = {} libxml2 = {} llvm18 = {} lsd = {} lua54 = {} +lz4 = {} #mdp = {} # gcc hangs mednafen = {} mesa = {} @@ -128,10 +136,13 @@ neverball = {} #newlib = {} # obsolete #newlibtest = {} # obsolete nghttp2 = {} +nginx = {} #nushell = {} # needs cargo update onefetch = {} openjazz = {} +openssh = {} openssl1 = {} +openssl3 = {} openttd = {} openttd-opengfx = {} openttd-openmsx = {} @@ -154,6 +165,7 @@ patchelf = {} pcre = {} perg = {} periodictable = {} +php84 = {} #perl5 = {} # ctermid, tempnam, ttyname pixelcannon = {} #pixman = {} # depends on glib which does not build @@ -164,7 +176,7 @@ pop-icon-theme = {} #powerline = {} # dirs prboom = {} procedural-wallpapers-rs = {} -#python37 = {} # getaddrinfo +python312 = {} #qemu = {} # can be built, but not working readline = {} redoxerd = {} @@ -179,6 +191,7 @@ resist = {} ripgrep = {} rodioplay = {} rs-nes = {} +rsync = {} rust = {} rust64 = {} #rust-cairo = {} # linking errors @@ -207,7 +220,7 @@ simple-http-server = {} smith = {} sodium = {} sopwith = {} -#openssh = {} +sqlite3 = {} strace = {} #syobonaction = {} # linking errors terminfo = {} @@ -224,5 +237,7 @@ vttest = {} #webrender = {} # unwind #wesnoth = {} winit = {} +xxhash = {} xz = {} zlib = {} +zstd = {} diff --git a/config/x86_64/server-demo.toml b/config/x86_64/server-demo.toml new file mode 100644 index 000000000..9e06f9fbb --- /dev/null +++ b/config/x86_64/server-demo.toml @@ -0,0 +1,41 @@ +# Configuration for server stack demonstration + +include = ["../server.toml"] + +# General settings +[general] +# Filesystem size in MiB +filesystem_size = 2048 + +# Package settings +[packages] +# Daemons +openssh = {} +nginx = {} + +# Backends +php84 = {} +luajit = {} +python312 = {} +# go = {} +# zig = {} + +# Tools +nano = {} +neovim = {} +rsync = {} +vim = {} +sqlite3 = {} +# tmux = {} +# htop = {} + +# Content +website = {} + +[users.nobody] +password = "" +shell = "/usr/bin/ion" #TODO: nologin? + +[users.nginx] +password = "" +shell = "/usr/bin/ion" #TODO: nologin? From 650fa1af93946b5dcd0acbe1740d7d19d4b958e0 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Fri, 26 Sep 2025 06:34:22 -0300 Subject: [PATCH 10/42] Add a section for tracking issues filter on CONTRIBUTING --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 427fd5123..5dc315f80 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -172,6 +172,12 @@ You can use the following GitLab label filters to know our development prioritie - [Medium-priority](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=medium-priority) - [Low-priority](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=low-priority) +## Roadmap + +We use tracking issues for the goals in our roadmap, you can see them in the filter below: + +- [Tracking issues](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=tracking%20issue) + ## RFCs For more significant changes that affect Redox's architecture, we use the [Request for Comments](https://gitlab.redox-os.org/redox-os/rfcs) repository. From 769ebff8a090688702ff587d25e2b1f4d2a9e8a2 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Sat, 27 Sep 2025 02:41:38 +0700 Subject: [PATCH 11/42] Add server demo scripts --- config/base.toml | 6 ++ config/x86_64/ci.toml | 1 + config/x86_64/server-demo.toml | 160 ++++++++++++++++++++++++++++++++- 3 files changed, 166 insertions(+), 1 deletion(-) diff --git a/config/base.toml b/config/base.toml index a4e705605..8f2e64e18 100644 --- a/config/base.toml +++ b/config/base.toml @@ -162,6 +162,12 @@ data = "" directory = true mode = 0o755 +[[files]] +path = "/var/run" +data = "" +directory = true +mode = 0o755 + [[files]] path = "/var/tmp" data = "" diff --git a/config/x86_64/ci.toml b/config/x86_64/ci.toml index b12346541..a1d61ca86 100644 --- a/config/x86_64/ci.toml +++ b/config/x86_64/ci.toml @@ -35,6 +35,7 @@ cairo = {} cargo = {} cleye = {} #cmatrix = {} # needs ncursesw now +composer = {} contain = {} coreutils = {} cosmic-edit = {} diff --git a/config/x86_64/server-demo.toml b/config/x86_64/server-demo.toml index 9e06f9fbb..42d7c5bff 100644 --- a/config/x86_64/server-demo.toml +++ b/config/x86_64/server-demo.toml @@ -5,7 +5,7 @@ include = ["../server.toml"] # General settings [general] # Filesystem size in MiB -filesystem_size = 2048 +filesystem_size = 4096 # Package settings [packages] @@ -15,6 +15,7 @@ nginx = {} # Backends php84 = {} +composer = {} luajit = {} python312 = {} # go = {} @@ -32,6 +33,134 @@ sqlite3 = {} # Content website = {} +[[files]] +path = "/home/user/public_html/index.php" +data = """ + php /bin/composer install +""" + +[[files]] +postinstall = true +data = "" +path = "/etc/nginx/conf.d" +directory = true + +[[files]] +postinstall = true +path = "/etc/nginx/nginx.conf" +data = """ +user nginx; +worker_processes auto; +error_log /var/log/nginx/error.log; +pid /var/run/nginx.pid; + +events { + worker_connections 1024; +} +http { + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + access_log /var/log/nginx/access.log main; + + include mime.types; + include fastcgi.conf; + default_type application/octet-stream; + + include /etc/nginx/conf.d/*.conf; +} +""" + +[[files]] +postinstall = true +path = "/etc/nginx/conf.d/localhost.conf" +data = """ +server { + listen 80; + server_name localhost; + root /usr/share/website; + + location / { + index index.html index.htm; + } +} +""" + +[[files]] +postinstall = true +path = "/etc/nginx/conf.d/php-www.conf" +data = """ +server { + listen 8081; + server_name localhost; + root /home/user/public_html; + + index index.php index.html index.htm; + + location / { + try_files $uri $uri/ =404; + } + + location ~ \\.php$ { + include fastcgi_params; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } +} +""" + +[[files]] +postinstall = true +path = "/etc/php/84/php-fpm.conf" +data = """ + +include=/etc/php/84/php-fpm.d/*.conf +""" + +[[files]] +postinstall = true +path = "/etc/php/84/php-fpm.d/www.conf" +data = """ +[www] +user = user +group = user +listen = 127.0.0.1:9000 +pm = static +pm.max_children = 1 +""" + +[[files]] +postinstall = true +path = "/etc/ssh/sshd_config" +data = """ +Port 22 +AddressFamily inet +AuthorizedKeysFile .ssh/authorized_keys +PermitRootLogin yes +PasswordAuthentication yes +PermitEmptyPasswords yes +Subsystem sftp /usr/libexec/sftp-server +""" + [users.nobody] password = "" shell = "/usr/bin/ion" #TODO: nologin? @@ -39,3 +168,32 @@ shell = "/usr/bin/ion" #TODO: nologin? [users.nginx] password = "" shell = "/usr/bin/ion" #TODO: nologin? + +[[files]] +path = "/home/user/server.sh" +data = """ +#!/usr/bin/env bash + +/bin/sshd -D & +nginx -g "daemon off;" & +php-fpm --nodaemonize & +""" + +[[files]] +path = "/home/user/Welcome.txt" +data = """ +############################################################################## +# Welcome to Redox Server Demo! +# +# This is a quick demonstration of Redox used as server stack. +# At the moment we support SSH, NGINX, Python, PHP. There's more to come +# +# This server demo is insecure by design, we encourage you to get familiar into +# basics of server security if you wish to use this as a production server. +# +# To start the daemon, run +# > sudo bash server.sh +# +# The server will start port 22 (ssh), 80 (static web) and 8080 (php) +############################################################################## +""" From b25dd79ede09599f0a498d266390b63b7aa76fd3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 26 Sep 2025 15:54:05 -0600 Subject: [PATCH 12/42] Update installer and redoxfs --- installer | 2 +- redoxfs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer b/installer index 01a3adb66..69de3d62a 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 01a3adb66269648732dbb8e130130d8ca2d3e23f +Subproject commit 69de3d62a11fd79132b44930b19d971d791d3bb5 diff --git a/redoxfs b/redoxfs index 0cb6f3cad..84288a2f5 160000 --- a/redoxfs +++ b/redoxfs @@ -1 +1 @@ -Subproject commit 0cb6f3cad583f7b0fd958094f35187f49077f154 +Subproject commit 84288a2f5dd35d7d64bf3c0aba063f9f81ff48c2 From d11ad40381e51cbcea517d108830249a19418baa Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 26 Sep 2025 16:01:20 -0600 Subject: [PATCH 13/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index f379d330b..58fc70fc7 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit f379d330b9afc8d85f9c58e9d101a67e59d71fd6 +Subproject commit 58fc70fc7e9df1160658f9974a760230bdf83d1e From 6a80549ce5085403dfec68f74091a962ca4d7975 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 26 Sep 2025 20:31:38 -0600 Subject: [PATCH 14/42] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 6110a7704..f35ddf0ec 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 6110a77044c8509f404cdb97eab5a0e2da08617b +Subproject commit f35ddf0ec1c21742c51b6072cda0267d28b0a066 From e2a06bbb54adf5d317e3456934c30345fa07bf4c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 27 Sep 2025 08:16:03 -0600 Subject: [PATCH 15/42] Update rust --- rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust b/rust index 22a51d1af..db7efe3cc 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit 22a51d1af8939897d8142a8d2b54d2611ce031cd +Subproject commit db7efe3cc0dc066402b758b10456ac5cf3d0bbb3 From 4597c5f0faafd1660ba02b1c5e5176c9c52492ea Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Sun, 28 Sep 2025 04:11:42 +0000 Subject: [PATCH 16/42] Add push recipe combination and more ports to forward on QEMU --- mk/qemu.mk | 8 ++++++-- mk/repo.mk | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/mk/qemu.mk b/mk/qemu.mk index b9740e619..688526a9e 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -200,9 +200,13 @@ else ifneq ($(bridge),) QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 else ifeq ($(net),redir) - # port 8080 and 8083 - webservers + # port 8022 - ssh + # port 8080-8083 - webservers # port 64126 - our gdbserver implementation - QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126$(EXTRANETARGS) + FWD_PORTS := 8081 8082 8083 64126 + FWD_FLAGS := hostfwd=tcp::8022-:22,hostfwd=tcp::8080-:80 + FWD_FLAGS2 := $(foreach p,$(FWD_PORTS),,hostfwd=tcp::$(p)-:$(p)) + QEMUFLAGS += -netdev user,id=net0,$(FWD_FLAGS)$(subst $(eval ) ,,$(FWD_FLAGS2))$(EXTRANETARGS) else ifeq ($(net),windows) QEMUFLAGS+=-netdev user,id=net0$(EXTRANETARGS) else diff --git a/mk/repo.mk b/mk/repo.mk index b617f1e5f..5535bfb9c 100644 --- a/mk/repo.mk +++ b/mk/repo.mk @@ -166,6 +166,35 @@ else $(MAKE) f.$* endif +# Invoke repo.sh and push for one of more targets separated by comma +rp.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) make $@ +else + $(MAKE) r.$* + $(MAKE) p.$* +endif + +# Invoke clean.sh, repo.sh and push for one of more targets separated by comma +crp.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) make $@ +else + $(MAKE) c.$* + $(MAKE) r.$* + $(MAKE) p.$* +endif + +# Invoke unfetch.sh. clean.sh, repo.sh and push for one of more targets separated by comma +ucrp.%: $(FSTOOLS_TAG) FORCE +ifeq ($(PODMAN_BUILD),1) + $(PODMAN_RUN) make $@ +else + $(MAKE) u.$* + $(MAKE) c.$* + $(MAKE) r.$* + $(MAKE) p.$* +endif export DEBUG_BIN?= From 7b535f108d7ab91f9a254d1be3d65e5d7b0ae434 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Sun, 28 Sep 2025 10:33:54 -0300 Subject: [PATCH 17/42] Small improvement on CONTRIBUTING --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5dc315f80..23aeaeaed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -165,7 +165,7 @@ For those who want to contribute to the Redox GUI, our GUI strategy has recently ## Priorities -You can use the following GitLab label filters to know our development priorities on the moment: +You can use the following GitLab issue label filters to know our development priorities on the moment: - [Critical](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=critical) - [High-priority](https://gitlab.redox-os.org/groups/redox-os/-/issues/?label_name[]=high-priority) From dbbe14a1570e7516d2f919859f4b7b3c24cc6bf8 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 08:54:45 -0600 Subject: [PATCH 18/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 58fc70fc7..2050bb106 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 58fc70fc7e9df1160658f9974a760230bdf83d1e +Subproject commit 2050bb106b3f1ae7488a4f43326d836d49b9dc8e From 22b9c9004bffd968b12a9719b0dca38c4f3cad73 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 09:00:24 -0600 Subject: [PATCH 19/42] Add terminfo to i686 CI --- config/i686/ci.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/i686/ci.toml b/config/i686/ci.toml index e67944146..66828b9c2 100644 --- a/config/i686/ci.toml +++ b/config/i686/ci.toml @@ -41,6 +41,7 @@ redoxfs = {} relibc = {} resist = {} smith = {} +terminfo = {} userutils = {} uutils = {} #vim = {} # conflicting types From dbb6d1b1bdec15ad70b46e847a99fdb3e236da98 Mon Sep 17 00:00:00 2001 From: "Wildan Mubarok (CI)" Date: Sun, 28 Sep 2025 15:56:22 +0000 Subject: [PATCH 20/42] CI: Update cookbook submodule to latest update-cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 2050bb106..10ffbb1e0 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 2050bb106b3f1ae7488a4f43326d836d49b9dc8e +Subproject commit 10ffbb1e0318cc64b1e148e886db1610aafb2a60 From a8773d403d863cc0daf092c597bafa374222aeae Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Sun, 28 Sep 2025 17:02:36 +0000 Subject: [PATCH 21/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 10ffbb1e0..497470833 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 10ffbb1e0318cc64b1e148e886db1610aafb2a60 +Subproject commit 497470833878bf52aac0fe90b4b77c8c970640b4 From 803736aad220428a9cb81a0c5a8b1acf820a3650 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 12:37:36 -0600 Subject: [PATCH 22/42] Install python3.12 in container --- podman/redox-base-containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 82f70db74..1ea1fee81 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -68,6 +68,7 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \ python3-dev \ python3-mako \ python3-venv \ + python3.12 \ rsync \ ruby \ scons \ From 82a4161ac745df64a9aff7d3fb872fdcf30b729e Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 12:41:57 -0600 Subject: [PATCH 23/42] Revert "Install python3.12 in container" This reverts commit 803736aad220428a9cb81a0c5a8b1acf820a3650. --- podman/redox-base-containerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 1ea1fee81..82f70db74 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -68,7 +68,6 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \ python3-dev \ python3-mako \ python3-venv \ - python3.12 \ rsync \ ruby \ scons \ From 2e1325c130714941f7328401af47b59d90d505fd Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 12:43:58 -0600 Subject: [PATCH 24/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 497470833..b5daccaed 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 497470833878bf52aac0fe90b4b77c8c970640b4 +Subproject commit b5daccaed122456cf9dbec8e3523e3f47e490d22 From 415dd40b5c78a2810fd6bf1e29be3e43f3d9ac9d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 12:51:07 -0600 Subject: [PATCH 25/42] Fix whitespace in containerfile --- podman/redox-base-containerfile | 152 ++++++++++++++++---------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/podman/redox-base-containerfile b/podman/redox-base-containerfile index 82f70db74..682dd7c40 100644 --- a/podman/redox-base-containerfile +++ b/podman/redox-base-containerfile @@ -9,79 +9,79 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \ && chown -R root:root /home \ && apt-get update \ && apt-get install -y --no-install-recommends \ - ant \ - appstream \ - appstream-compose \ - autoconf \ - autoconf2.69 \ - automake \ - autopoint \ - bison \ - bsdextrautils \ - build-essential \ - clang \ - cmake \ - curl \ - dos2unix \ - doxygen \ - expect \ - file \ - flex \ - fuse3 \ - g++ \ - genisoimage \ - git \ - git-lfs \ - gperf \ - gtk-doc-tools \ - help2man \ - intltool \ - libc6-dev-i386 \ - libexpat-dev \ - libfontconfig1-dev \ - libfuse3-dev \ - libgdk-pixbuf2.0-bin \ - libglib2.0-dev-bin \ - libgmp-dev \ - libhtml-parser-perl \ - libjpeg-dev \ - libmpfr-dev \ - libparse-yapp-perl \ - libpng-dev \ - libsdl1.2-dev \ - libsdl2-ttf-dev \ - llvm \ - lua5.4 \ - lzip \ - m4 \ - make \ - meson \ - nasm \ - ninja-build \ - patch \ - patchelf \ - perl \ - pkg-config \ - po4a \ - protobuf-compiler \ - python3 \ - python3-dev \ - python3-mako \ - python3-venv \ - rsync \ - ruby \ - scons \ - ssh \ - syslinux-utils \ - texinfo \ - unifdef \ - unzip \ - wget \ - xdg-utils \ - xfonts-utils \ - xorg-dev \ - xutils-dev \ - xxd \ - zip \ - zlib1g-dev \ - zstd + ant \ + appstream \ + appstream-compose \ + autoconf \ + autoconf2.69 \ + automake \ + autopoint \ + bison \ + bsdextrautils \ + build-essential \ + clang \ + cmake \ + curl \ + dos2unix \ + doxygen \ + expect \ + file \ + flex \ + fuse3 \ + g++ \ + genisoimage \ + git \ + git-lfs \ + gperf \ + gtk-doc-tools \ + help2man \ + intltool \ + libc6-dev-i386 \ + libexpat-dev \ + libfontconfig1-dev \ + libfuse3-dev \ + libgdk-pixbuf2.0-bin \ + libglib2.0-dev-bin \ + libgmp-dev \ + libhtml-parser-perl \ + libjpeg-dev \ + libmpfr-dev \ + libparse-yapp-perl \ + libpng-dev \ + libsdl1.2-dev \ + libsdl2-ttf-dev \ + llvm \ + lua5.4 \ + lzip \ + m4 \ + make \ + meson \ + nasm \ + ninja-build \ + patch \ + patchelf \ + perl \ + pkg-config \ + po4a \ + protobuf-compiler \ + python3 \ + python3-dev \ + python3-mako \ + python3-venv \ + rsync \ + ruby \ + scons \ + ssh \ + syslinux-utils \ + texinfo \ + unifdef \ + unzip \ + wget \ + xdg-utils \ + xfonts-utils \ + xorg-dev \ + xutils-dev \ + xxd \ + zip \ + zlib1g-dev \ + zstd From 9145ae073d46d3abd7ba7f28f941639dee61a2d1 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 12:51:15 -0600 Subject: [PATCH 26/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index b5daccaed..69573f5bd 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit b5daccaed122456cf9dbec8e3523e3f47e490d22 +Subproject commit 69573f5bd4ad8d692a3a2669185a1b979356b029 From 047ab0959c980d25b2728a10900d8d56c193d5a3 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 13:14:49 -0600 Subject: [PATCH 27/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 69573f5bd..942c3ea4d 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 69573f5bd4ad8d692a3a2669185a1b979356b029 +Subproject commit 942c3ea4daa2ef5a471b6169cceeea7f674890f2 From 9b6c6a3023008704634dfb75f960c30975fcfe6d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 28 Sep 2025 13:48:04 -0600 Subject: [PATCH 28/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 942c3ea4d..edb56a115 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 942c3ea4daa2ef5a471b6169cceeea7f674890f2 +Subproject commit edb56a11533743a6daa4cf48b25d258fa5e0b6b0 From 431200dd42515a2f9fc9fc5f6a6ab1f68471c82c Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 29 Sep 2025 17:09:28 -0600 Subject: [PATCH 29/42] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index f35ddf0ec..d39fe6c9f 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit f35ddf0ec1c21742c51b6072cda0267d28b0a066 +Subproject commit d39fe6c9fbb3296ce58cd3625cd51c02ef678dae From 4e1db89e42943794b57817dd04cfeb0cd08ef355 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 29 Sep 2025 17:46:37 -0600 Subject: [PATCH 30/42] config/x11: more debugging and compile glib schemas at boot --- config/x11.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/x11.toml b/config/x11.toml index 6326e6f5a..cf48ecbf8 100644 --- a/config/x11.toml +++ b/config/x11.toml @@ -33,6 +33,9 @@ xterm = {} path = "/usr/lib/init.d/20_xenv" data = """ export DISPLAY :0 +export G_MESSAGES_DEBUG all +export LD_DEBUG all +glib-compile-schemas /usr/share/glib-2.0/schemas/ """ [[files]] From 32742f1d9ffecc93f5e7f6daf7fd8b522ba9679f Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 30 Sep 2025 12:49:49 -0600 Subject: [PATCH 31/42] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index d39fe6c9f..43b0f235c 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit d39fe6c9fbb3296ce58cd3625cd51c02ef678dae +Subproject commit 43b0f235ca43a95c91b42f2781f482809f1babe4 From 155bcb2ff24ed916eeb09c0f5bc967dd9775a4ee Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Wed, 1 Oct 2025 08:06:33 +0000 Subject: [PATCH 32/42] Install C++ header on prefix --- mk/prefix.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 2aefc0fe3..7d7cc548b 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -215,8 +215,8 @@ else --without-headers \ --with-linker-hash-style=gnu \ && \ - $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc && \ - $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc DESTDIR="$(ROOT)/$@.partial" + $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \ + $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial" rm -rf "$<-freestanding-build" cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" From 2eddba85ce39a6d3ba0296e8e1a34219fa586e23 Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Thu, 2 Oct 2025 13:43:11 +0000 Subject: [PATCH 33/42] Submodule update --- cookbook | 2 +- installer | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook b/cookbook index edb56a115..1685d393a 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit edb56a11533743a6daa4cf48b25d258fa5e0b6b0 +Subproject commit 1685d393a1a32bf7fbbbd5647089ab465a487300 diff --git a/installer b/installer index 69de3d62a..97dd77918 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit 69de3d62a11fd79132b44930b19d971d791d3bb5 +Subproject commit 97dd77918e7027c6c57d537b7eb732bbd22739af From e3e151a369428eb9a86836c597792e996bb5fb4b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 2 Oct 2025 13:08:23 -0600 Subject: [PATCH 34/42] x11: set webkit debug variable --- config/x11.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/x11.toml b/config/x11.toml index cf48ecbf8..0fab62709 100644 --- a/config/x11.toml +++ b/config/x11.toml @@ -35,6 +35,7 @@ data = """ export DISPLAY :0 export G_MESSAGES_DEBUG all export LD_DEBUG all +export WEBKIT_DEBUG all glib-compile-schemas /usr/share/glib-2.0/schemas/ """ From 94645ec4a0f235cb59ab03216bd2f13df1d3b0fe Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 2 Oct 2025 13:21:59 -0600 Subject: [PATCH 35/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 1685d393a..079e0af2e 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 1685d393a1a32bf7fbbbd5647089ab465a487300 +Subproject commit 079e0af2e2d6b013fb638bb1290e9cecd933ba97 From 00be8094b141af259055366e05e5ca7bc0491f9b Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 3 Oct 2025 10:41:06 -0600 Subject: [PATCH 36/42] Revert "Install C++ header on prefix" This reverts commit 155bcb2ff24ed916eeb09c0f5bc967dd9775a4ee. --- mk/prefix.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/prefix.mk b/mk/prefix.mk index 7d7cc548b..2aefc0fe3 100644 --- a/mk/prefix.mk +++ b/mk/prefix.mk @@ -215,8 +215,8 @@ else --without-headers \ --with-linker-hash-style=gnu \ && \ - $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc all-target-libstdc++-v3 && \ - $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc install-target-libstdc++-v3 DESTDIR="$(ROOT)/$@.partial" + $(MAKE) -j `$(NPROC)` all-gcc all-target-libgcc && \ + $(MAKE) -j `$(NPROC)` install-gcc install-target-libgcc DESTDIR="$(ROOT)/$@.partial" rm -rf "$<-freestanding-build" cd "$@.partial" && $(PREFIX_STRIP) touch "$@.partial" From 9e29ed935da1cb29db2a8adbc86c969a4e294321 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 4 Oct 2025 07:54:25 -0600 Subject: [PATCH 37/42] Update rust toolchain --- relibc | 2 +- rust | 2 +- rust-toolchain.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/relibc b/relibc index 43b0f235c..bb42c1292 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 43b0f235ca43a95c91b42f2781f482809f1babe4 +Subproject commit bb42c12921896eba78a18b278c8dd776b9d9994c diff --git a/rust b/rust index db7efe3cc..687c5fa2c 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit db7efe3cc0dc066402b758b10456ac5cf3d0bbb3 +Subproject commit 687c5fa2c385b8d169fdf95424f755588f95e174 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 65eb22714..306bdf6fc 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "nightly-2025-01-12" +channel = "nightly-2025-10-03" components = ["rust-src", "rustfmt", "clippy"] profile = "minimal" From e2eafc0bc1d712ab90b3caf5a8f0db788381c2b5 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 4 Oct 2025 07:57:22 -0600 Subject: [PATCH 38/42] Update cookbook --- cookbook | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook b/cookbook index 079e0af2e..ae06273f8 160000 --- a/cookbook +++ b/cookbook @@ -1 +1 @@ -Subproject commit 079e0af2e2d6b013fb638bb1290e9cecd933ba97 +Subproject commit ae06273f81ac0eb488c8b8b5d85f5deb38df72cc From ee346cc1407e3db686fe6c78b0256a9ce47b515a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 4 Oct 2025 08:01:13 -0600 Subject: [PATCH 39/42] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index bb42c1292..9528c7163 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit bb42c12921896eba78a18b278c8dd776b9d9994c +Subproject commit 9528c7163b0b9919e33b64f162d2c94abc07ef20 From a0382d1329578b0d201ddd76c441232bc0a17850 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 4 Oct 2025 08:05:57 -0600 Subject: [PATCH 40/42] Update relibc --- relibc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relibc b/relibc index 9528c7163..7ed934a01 160000 --- a/relibc +++ b/relibc @@ -1 +1 @@ -Subproject commit 9528c7163b0b9919e33b64f162d2c94abc07ef20 +Subproject commit 7ed934a01d2ac8ab603b6dc24e918d8197192068 From 35704814c1ffc5adc5035b5de4fc19495f1297e9 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 4 Oct 2025 09:01:54 -0600 Subject: [PATCH 41/42] Update custom riscv64gc target for new nightly --- targets/riscv64gc-unknown-redox.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/riscv64gc-unknown-redox.json b/targets/riscv64gc-unknown-redox.json index bf46961c4..97d191578 100644 --- a/targets/riscv64gc-unknown-redox.json +++ b/targets/riscv64gc-unknown-redox.json @@ -37,5 +37,5 @@ "target-family": [ "unix" ], - "target-pointer-width": "64" + "target-pointer-width": 64 } From bdc6e1e102b9d1279a3852aef36a193db239b8f2 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 4 Oct 2025 09:03:19 -0600 Subject: [PATCH 42/42] Add custom i686 target --- targets/i686-unknown-redox.json | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 targets/i686-unknown-redox.json diff --git a/targets/i686-unknown-redox.json b/targets/i686-unknown-redox.json new file mode 100644 index 000000000..889e1eeb9 --- /dev/null +++ b/targets/i686-unknown-redox.json @@ -0,0 +1,49 @@ +{ + "arch": "x86", + "cpu": "pentiumpro", + "crt-objects-fallback": "false", + "crt-static-allows-dylibs": true, + "crt-static-default": true, + "crt-static-respected": true, + "data-layout": "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-i128:128-f64:32:64-f80:32-n8:16:32-S128", + "dynamic-linking": true, + "env": "relibc", + "has-rpath": true, + "has-thread-local": true, + "late-link-args": { + "gnu-cc": [ + "-lgcc" + ], + "gnu-lld-cc": [ + "-lgcc" + ] + }, + "linker-flavor": "gnu-cc", + "llvm-target": "i686-unknown-redox", + "max-atomic-width": 64, + "metadata": { + "description": null, + "host_tools": null, + "std": null, + "tier": null + }, + "os": "redox", + "plt-by-default": false, + "position-independent-executables": true, + "pre-link-args": { + "gnu-cc": [ + "-m32" + ], + "gnu-lld-cc": [ + "-m32" + ] + }, + "relro-level": "full", + "stack-probes": { + "kind": "call" + }, + "target-family": [ + "unix" + ], + "target-pointer-width": 32 +}