Merge branch 'upstream-rustc' into 'master'

Draft: Add config to install upstream rustc

See merge request redox-os/redox!1643

config/aarch64/tests.toml

@@ -0,0 +1,14 @@
+# Configuration for testing
+
+include = ["../tests.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 10000
+
+# Package settings
+[packages]
+# example = {}

config/dev.toml

@@ -12,44 +12,4 @@ prompt = false
 # Package settings
 [packages]
 dev-redox = {}
-
-[[files]]
-path = "/home/user/test.rs"
-data = """
-fn main() {
-    println!("Hello, Redox!");
-}
-"""
-
-[[files]]
-path = "/home/user/test.c"
-data = """
-#include <stdio.h>
-
-int main(void) {
-	printf("Hello, Redox!\\n");
-}
-"""
-
-[[files]]
-path = "/home/user/test.cpp"
-data = """
-#include <iostream>
-
-int main()
-{
-   std::cout << "Hello, Redox!" << std::endl;
-}
-"""
-
-[[files]]
-path = "/home/user/test.py"
-data = """
-print("Hello, Redox!")
-"""
-
-[[files]]
-path = "/home/user/test.lua"
-data = """
-print("Hello, Redox!")
-"""
+hello-redox = {}

config/i686/tests.toml

@@ -0,0 +1,14 @@
+# Configuration for testing
+
+include = ["../tests.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 10000
+
+# Package settings
+[packages]
+# example = {}

config/net.toml

@@ -5,6 +5,7 @@ include = ["base.toml"]
 
 # Package settings
 [packages]
+netdb = {}
 netutils = {}
 
 ## Network init

config/riscv64gc/tests.toml

@@ -0,0 +1,14 @@
+# Configuration for testing
+
+include = ["../tests.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 10000
+
+# Package settings
+[packages]
+# example = {}

config/server.toml

@@ -21,10 +21,8 @@ git = {}
 installer = {}
 ion = {}
 kibi = {}
-netdb = {}
 pkgutils = {}
 redoxfs = {}
-resist = {}
 
 [[files]]
 path = "/usr/lib/init.d/30_console"

config/tests.toml

@@ -0,0 +1,22 @@
+# Configuration for testing
+
+include = ["server.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 10000
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+acid = {}
+resist = {}
+relibc-tests = {}
+os-test = {}
+openposixtestsuite = {}
+redox-posix-tests = {}
+vttest = {}
+benchmarks = {}
+hello-redox = {}

config/x86_64/tests.toml

@@ -0,0 +1,14 @@
+# Configuration for testing
+
+include = ["../tests.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 10000
+
+# Package settings
+[packages]
+# example = {}

mk/config.mk

@@ -11,6 +11,8 @@ ARCH?=$(HOST_ARCH)
 BOARD?=
 ## Enable to use binary prefix (much faster)
 PREFIX_BINARY?=1
+## Enable to use up-to-date rust compiler (experimental, only available to Tier 2 targets)
+EXPERIMENTAL_PREFIX_USE_UPSTREAM_RUST_COMPILER?=0
 ## Enable to use binary packages (much faster)
 REPO_BINARY?=0
 ## Name of the configuration to include in the image name e.g. desktop or server

mk/prefix.mk

@@ -5,9 +5,11 @@ PREFIX=prefix/$(TARGET)
 PREFIX_INSTALL=$(PREFIX)/sysroot/
 PREFIX_PATH=$(ROOT)/$(PREFIX_INSTALL)/bin
 
+GNU_HOST=$(HOST_ARCH)-unknown-linux-gnu
 BINUTILS_BRANCH=redox-2.43.1
 GCC_BRANCH=redox-13.2.0
 LIBTOOL_VERSION=2.5.4
+UPSTREAM_RUSTC_VERSION="2025-10-03"
 
 export PREFIX_RUSTFLAGS=-L $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib
 export RUSTUP_TOOLCHAIN=$(ROOT)/$(PREFIX_INSTALL)
@@ -123,7 +125,53 @@ else
 	touch "$@"
 endif
 
-ifeq ($(PREFIX_BINARY),1)
+# -----------------------------------------------------
+ifeq ($(EXPERIMENTAL_PREFIX_USE_UPSTREAM_RUST_COMPILER),1)
+
+$(PREFIX)/gcc-install.tar.gz:
+	mkdir -p "$(@D)"
+	wget -cO $@.partial "https://static.redox-os.org/toolchain/$(TARGET)/gcc-install.tar.gz"
+	mv $@.partial $@
+
+$(PREFIX)/rustc-install.tar.xz:
+	mkdir -p "$(@D)"
+	wget -O $@.partial "https://static.rust-lang.org/dist/$(UPSTREAM_RUSTC_VERSION)/rustc-nightly-$(GNU_HOST).tar.xz"
+	mv $@.partial $@
+
+$(PREFIX)/cargo-install.tar.xz:
+	mkdir -p "$(@D)"
+	wget -O $@.partial "https://static.rust-lang.org/dist/$(UPSTREAM_RUSTC_VERSION)/cargo-nightly-$(GNU_HOST).tar.xz"
+	mv $@.partial $@
+
+$(PREFIX)/rust-std-host-install.tar.xz:
+	mkdir -p "$(@D)"
+	wget -O $@.partial "https://static.rust-lang.org/dist/$(UPSTREAM_RUSTC_VERSION)/rust-std-nightly-$(GNU_HOST).tar.xz"
+	mv $@.partial $@
+
+$(PREFIX)/rust-std-target-install.tar.xz:
+	mkdir -p "$(@D)"
+	wget -O $@.partial "https://static.rust-lang.org/dist/$(UPSTREAM_RUSTC_VERSION)/rust-std-nightly-$(GNU_TARGET).tar.xz"
+	mv $@.partial $@
+
+$(PREFIX)/rust-src-install.tar.xz:
+	mkdir -p "$(@D)"
+	wget -O $@.partial "https://static.rust-lang.org/dist/$(UPSTREAM_RUSTC_VERSION)/rust-src-nightly.tar.xz"
+	mv $@.partial $@
+
+$(PREFIX)/rust-install: $(PREFIX)/gcc-install.tar.gz $(PREFIX)/rustc-install.tar.xz $(PREFIX)/cargo-install.tar.xz $(PREFIX)/rust-std-host-install.tar.xz $(PREFIX)/rust-std-target-install.tar.xz $(PREFIX)/rust-src-install.tar.xz
+	rm -rf "$@.partial" "$@"
+	mkdir -p "$@.partial"
+	tar --extract --file "$(PREFIX)/gcc-install.tar.gz" -C "$@.partial" || true
+	tar --extract --file "$(PREFIX)/rustc-install.tar.xz" -C "$@.partial" rustc-nightly-$(GNU_HOST)/rustc/ --strip-components=2
+	tar --extract --file "$(PREFIX)/cargo-install.tar.xz" --directory "$@.partial" cargo-nightly-$(GNU_HOST)/cargo/ --strip-components=2
+	tar --extract --file "$(PREFIX)/rust-std-host-install.tar.xz" --directory "$@.partial" rust-std-nightly-$(GNU_HOST)/rust-std-$(GNU_HOST)/ --strip-components=2
+	tar --extract --file "$(PREFIX)/rust-std-target-install.tar.xz" --directory "$@.partial" rust-std-nightly-$(GNU_TARGET)/rust-std-$(GNU_TARGET)/ --strip-components=2
+	tar --extract --file "$(PREFIX)/rust-src-install.tar.xz" --directory "$@.partial" rust-src-nightly/rust-src/ --strip-components=2
+	touch "$@.partial"
+	mv "$@.partial" "$@"
+
+# ---------------------------------------------------
+else ifeq ($(PREFIX_BINARY),1)
 
 $(PREFIX)/rust-install.tar.gz:
 	mkdir -p "$(@D)"
@@ -138,6 +186,7 @@ $(PREFIX)/rust-install: $(PREFIX)/rust-install.tar.gz
 	touch "$@.partial"
 	mv "$@.partial" "$@"
 
+# ---------------------------------------------------
 else
 
 $(ROOT)/rust/configure: