Unify dev variants and use dev-redox meta-package

config/aarch64/dev-redox.toml

@@ -1,20 +0,0 @@
-# Configuration for Redox development
-
-include = ["../dev-redox.toml"]
-
-# Override the default settings here
-
-# General settings
-[general]
-# Filesystem size in MiB
-# filesystem_size = 1024
-
-# Package settings
-[packages]
-# see ci.toml for error reasons
-gdbserver = "ignore"
-gnu-binutils = "ignore"
-mesa = "ignore"
-mesa-glu = "ignore"
-mpc = "ignore"
-strace = "ignore"

config/aarch64/dev.toml

@@ -1,4 +1,4 @@
-# Configuration for non-Redox development
+# Configuration for development
 
 include = ["../dev.toml"]
 

config/dev-redox.toml

@@ -1,73 +0,0 @@
-# Configuration for Redox development
-
-include = ["desktop.toml"]
-
-# General settings
-[general]
-# Filesystem size in MiB
-filesystem_size = 20000
-# Do not prompt if settings are not defined
-prompt = false
-
-# Package settings
-[packages]
-dev-essential = {}
-redox-tests = {}
-exampled = {}
-gdbserver = {}
-libgmp = {}
-libiconv = {}
-liborbital = {}
-libsodium = {}
-libxml2 = {}
-llvm18 = {}
-ncurses = {}
-nghttp2 = {}
-openssl1 = {}
-orbclient = {}
-pcre = {}
-ripgrep = {}
-terminfo = {}
-xz = {}
-zlib = {}
-
-[[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!")
-"""

config/dev.toml

@@ -1,14 +1,55 @@
-# Configuration for non-Redox development
+# Configuration for development
 
 include = ["desktop.toml"]
 
 # General settings
 [general]
 # Filesystem size in MiB
-filesystem_size = 10000
+filesystem_size = 20000
 # Do not prompt if settings are not defined
 prompt = false
 
 # Package settings
 [packages]
-dev-essential = {}
+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!")
+"""

config/i686/dev-redox.toml

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

config/i686/dev.toml

@@ -1,4 +1,4 @@
-# Configuration for non-Redox development
+# Configuration for development
 
 include = ["../dev.toml"]
 

config/x86_64/dev-redox.toml

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

config/x86_64/dev.toml

@@ -1,4 +1,4 @@
-# Configuration for non-Redox development
+# Configuration for development
 
 include = ["../dev.toml"]