Merge branch 'add-mold-package' into 'master'

Add the mold linker in the Podman container

See merge request redox-os/redox!1589

config/riscv64gc/demo.toml

@@ -1,35 +1,3 @@
-# Minimal network configuration
+# Configuration for demonstration
 
-include = ["../minimal-net.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-
-# Package settings
-[packages]
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
-
-[[files]]
-path = "/usr/lib/init.d/20_orbital"
-data = """
-export VT 3
-orbital orblogin launcher
-unset VT
-"""
-
-# Override console config to not switch to VT 2
-[[files]]
-path = "/usr/lib/init.d/30_console"
-data = """
-getty 2
-getty /scheme/debug/no-preserve -J
-"""
+include = ["desktop.toml"]

config/riscv64gc/desktop-minimal.toml

@@ -1,35 +1,14 @@
-# Minimal network configuration
+# Minimal desktop configuration
 
-include = ["../minimal-net.toml"]
+include = ["../desktop-minimal.toml"]
 
 # Override the default settings here
 
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 256
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
-
-[[files]]
-path = "/usr/lib/init.d/20_orbital"
-data = """
-export VT 3
-orbital orblogin launcher
-unset VT
-"""
-
-# Override console config to not switch to VT 2
-[[files]]
-path = "/usr/lib/init.d/30_console"
-data = """
-getty 2
-getty /scheme/debug/no-preserve -J
-"""
+# example = {}

config/riscv64gc/desktop.toml

@@ -1,35 +1,14 @@
-# Minimal network configuration
+# Default build system configuration
 
-include = ["../minimal-net.toml"]
+include = ["../desktop.toml"]
 
 # Override the default settings here
 
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 256
+# filesystem_size = 1024
 
 # Package settings
 [packages]
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
-
-[[files]]
-path = "/usr/lib/init.d/20_orbital"
-data = """
-export VT 3
-orbital orblogin launcher
-unset VT
-"""
-
-# Override console config to not switch to VT 2
-[[files]]
-path = "/usr/lib/init.d/30_console"
-data = """
-getty 2
-getty /scheme/debug/no-preserve -J
-"""
+# example = {}

config/riscv64gc/jeremy.toml

@@ -1,35 +1,3 @@
-# Minimal network configuration
+# Configuration for Jeremy Soller
 
-include = ["../minimal-net.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 256
-
-# Package settings
-[packages]
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils-background = {}
-orbutils-launcher = {}
-orbutils-orblogin = {}
-
-[[files]]
-path = "/usr/lib/init.d/20_orbital"
-data = """
-export VT 3
-orbital orblogin launcher
-unset VT
-"""
-
-# Override console config to not switch to VT 2
-[[files]]
-path = "/usr/lib/init.d/30_console"
-data = """
-getty 2
-getty /scheme/debug/no-preserve -J
-"""
+include = ["desktop.toml"]

config/riscv64gc/server.toml

@@ -1,6 +1,6 @@
-# Minimal network configuration
+# Server configuration
 
-include = ["../minimal-net.toml"]
+include = ["../server.toml"]
 
 # Override the default settings here
 
@@ -11,4 +11,4 @@ include = ["../minimal-net.toml"]
 
 # Package settings
 [packages]
-# example = {}
+# example = {}

config/server.toml

@@ -11,7 +11,7 @@ filesystem_size = 512
 [packages]
 bash = {}
 ca-certificates = {}
-contain = {}
+#contain = {} # needs to update dependencies
 coreutils = {}
 curl = {}
 diffutils = {}

cookbook

@@ -1 +1 @@
-Subproject commit 00ff0c5ff92e4fd78378604785b9278e7d26e5a4
+Subproject commit 554893f862bba7162bda40e34c39e6e8aad87cae

podman/redox-base-containerfile

@@ -56,6 +56,7 @@ RUN useradd --create-home --no-log-init --uid _UID_ poduser \
 		m4 \
 		make \
 		meson \
+		mold \
 		nasm \
 		ninja-build \
 		patch \

relibc

@@ -1 +1 @@
-Subproject commit e291a2527a9e0f18703a50880b68310e43780e81
+Subproject commit 2f0d5eb970337f595128505d1435a1086f998600