From 7b6dfcc76c485818b629c6ef549ea100b834a69a Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 31 Jul 2025 01:33:13 -0300 Subject: [PATCH 1/4] Update and cleanup the dev variants --- config/dev-redox.toml | 17 ++++++++ config/dev.toml | 95 +------------------------------------------ 2 files changed, 19 insertions(+), 93 deletions(-) diff --git a/config/dev-redox.toml b/config/dev-redox.toml index 745aac654..e19568f47 100644 --- a/config/dev-redox.toml +++ b/config/dev-redox.toml @@ -13,6 +13,23 @@ prompt = false [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" diff --git a/config/dev.toml b/config/dev.toml index d9dc01155..d6ea38736 100644 --- a/config/dev.toml +++ b/config/dev.toml @@ -5,101 +5,10 @@ include = ["desktop.toml"] # General settings [general] # Filesystem size in MiB -filesystem_size = 20000 +filesystem_size = 10000 # Do not prompt if settings are not defined prompt = false # Package settings [packages] -acid = {} -autoconf = {} -automake = {} -cargo = {} -crates-io-index = {} -exampled = {} -gcc13 = {} -gdbserver = {} -gnu-binutils = {} -gnu-grep = {} -gnu-make = {} -libffi = {} -libgmp = {} -libiconv = {} -libjpeg = {} -libogg = {} -liborbital = {} -libpng = {} -libsodium = {} -libvorbis = {} -libxml2 = {} -llvm18 = {} -lua54 = {} -mesa = {} -mesa-glu = {} -nasm = {} -ncurses = {} -nghttp2 = {} -openssl1 = {} -orbclient = {} -patch = {} -pcre = {} -pkg-config = {} -resist = {} -ripgrep = {} -rust = {} -sdl-gfx = {} -sdl1 = {} -sdl1-image = {} -sdl1-mixer = {} -sdl1-ttf = {} -sdl2 = {} -sdl2-gears = {} -sdl2-image = {} -sdl2-mixer = {} -sdl2-ttf = {} -sed = {} -strace = {} -terminfo = {} -xz = {} -zlib = {} - -[[files]] -path = "/home/user/test.rs" -data = """ -fn main() { - println!("Hello, Redox!"); -} -""" - -[[files]] -path = "/home/user/test.c" -data = """ -#include - -int main(void) { - printf("Hello, Redox!\\n"); -} -""" - -[[files]] -path = "/home/user/test.cpp" -data = """ -#include - -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!") -""" +dev-essential = {} From 77710268533559db6f2d43489cb070a466abd1ef Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 31 Jul 2025 01:39:22 -0300 Subject: [PATCH 2/4] Update the dev.toml description comment --- config/dev.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dev.toml b/config/dev.toml index d6ea38736..e19e6d346 100644 --- a/config/dev.toml +++ b/config/dev.toml @@ -1,4 +1,4 @@ -# Configuration for development +# Configuration for non-Redox development include = ["desktop.toml"] From f6e9a6c951cd7f2e11783e9bf4df34e8a67afc8a Mon Sep 17 00:00:00 2001 From: Ribbon Date: Thu, 31 Jul 2025 01:41:31 -0300 Subject: [PATCH 3/4] Update the dev.toml description comments --- config/aarch64/dev.toml | 2 +- config/i686/dev.toml | 2 +- config/x86_64/dev.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml index ce6a482d6..fc248b744 100644 --- a/config/aarch64/dev.toml +++ b/config/aarch64/dev.toml @@ -1,4 +1,4 @@ -# Configuration for development +# Configuration for non-Redox development include = ["../dev.toml"] diff --git a/config/i686/dev.toml b/config/i686/dev.toml index ecd30849a..5234e1b3c 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -1,4 +1,4 @@ -# Configuration for development +# Configuration for non-Redox development include = ["../dev.toml"] diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index ecd30849a..5234e1b3c 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -1,4 +1,4 @@ -# Configuration for development +# Configuration for non-Redox development include = ["../dev.toml"] From 40af79ddeeacd952c52f1b123215dffe062d2102 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Fri, 1 Aug 2025 12:08:37 -0300 Subject: [PATCH 4/4] Unify dev variants and use dev-redox meta-package --- config/aarch64/dev-redox.toml | 20 ---------- config/aarch64/dev.toml | 2 +- config/dev-redox.toml | 73 ----------------------------------- config/dev.toml | 47 ++++++++++++++++++++-- config/i686/dev-redox.toml | 14 ------- config/i686/dev.toml | 2 +- config/x86_64/dev-redox.toml | 14 ------- config/x86_64/dev.toml | 2 +- 8 files changed, 47 insertions(+), 127 deletions(-) delete mode 100644 config/aarch64/dev-redox.toml delete mode 100644 config/dev-redox.toml delete mode 100644 config/i686/dev-redox.toml delete mode 100644 config/x86_64/dev-redox.toml diff --git a/config/aarch64/dev-redox.toml b/config/aarch64/dev-redox.toml deleted file mode 100644 index 89bba21e9..000000000 --- a/config/aarch64/dev-redox.toml +++ /dev/null @@ -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" diff --git a/config/aarch64/dev.toml b/config/aarch64/dev.toml index fc248b744..ce6a482d6 100644 --- a/config/aarch64/dev.toml +++ b/config/aarch64/dev.toml @@ -1,4 +1,4 @@ -# Configuration for non-Redox development +# Configuration for development include = ["../dev.toml"] diff --git a/config/dev-redox.toml b/config/dev-redox.toml deleted file mode 100644 index e19568f47..000000000 --- a/config/dev-redox.toml +++ /dev/null @@ -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 - -int main(void) { - printf("Hello, Redox!\\n"); -} -""" - -[[files]] -path = "/home/user/test.cpp" -data = """ -#include - -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!") -""" diff --git a/config/dev.toml b/config/dev.toml index e19e6d346..c3fa5bf94 100644 --- a/config/dev.toml +++ b/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 + +int main(void) { + printf("Hello, Redox!\\n"); +} +""" + +[[files]] +path = "/home/user/test.cpp" +data = """ +#include + +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!") +""" diff --git a/config/i686/dev-redox.toml b/config/i686/dev-redox.toml deleted file mode 100644 index 655a72b2f..000000000 --- a/config/i686/dev-redox.toml +++ /dev/null @@ -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 = {} \ No newline at end of file diff --git a/config/i686/dev.toml b/config/i686/dev.toml index 5234e1b3c..ecd30849a 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -1,4 +1,4 @@ -# Configuration for non-Redox development +# Configuration for development include = ["../dev.toml"] diff --git a/config/x86_64/dev-redox.toml b/config/x86_64/dev-redox.toml deleted file mode 100644 index 655a72b2f..000000000 --- a/config/x86_64/dev-redox.toml +++ /dev/null @@ -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 = {} \ No newline at end of file diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index 5234e1b3c..ecd30849a 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -1,4 +1,4 @@ -# Configuration for non-Redox development +# Configuration for development include = ["../dev.toml"]