From 5f32a00affba17c43de181888fda973f573a42a7 Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 30 Sep 2025 05:42:43 -0300 Subject: [PATCH 1/2] Fix the server config scope and improve dev config --- config/dev.toml | 26 +++++++++++++++++++++----- config/net.toml | 1 + config/server.toml | 2 -- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/config/dev.toml b/config/dev.toml index c3fa5bf94..2e7e40e50 100644 --- a/config/dev.toml +++ b/config/dev.toml @@ -14,7 +14,7 @@ prompt = false dev-redox = {} [[files]] -path = "/home/user/test.rs" +path = "/home/user/hello-redox/test.rs" data = """ fn main() { println!("Hello, Redox!"); @@ -22,7 +22,7 @@ fn main() { """ [[files]] -path = "/home/user/test.c" +path = "/home/user/hello-redox/test.c" data = """ #include @@ -32,7 +32,7 @@ int main(void) { """ [[files]] -path = "/home/user/test.cpp" +path = "/home/user/hello-redox/test.cpp" data = """ #include @@ -43,13 +43,29 @@ int main() """ [[files]] -path = "/home/user/test.py" +path = "/home/user/hello-redox/test.py" data = """ print("Hello, Redox!") """ [[files]] -path = "/home/user/test.lua" +path = "/home/user/hello-redox/test.lua" data = """ print("Hello, Redox!") """ + +[[files]] +path = "/home/user/hello-redox/test.js" +data = """ +console.log("Hello Redox"); +""" + +[[files]] +path = "/home/user/hello-redox/test.java" +data = """ +public class Java { + public static void main(String[] args) { + System.out.println("Hello Redox"); + } +} +""" diff --git a/config/net.toml b/config/net.toml index a6a472e37..87497b760 100644 --- a/config/net.toml +++ b/config/net.toml @@ -5,6 +5,7 @@ include = ["base.toml"] # Package settings [packages] +netdb = {} netutils = {} ## Network init diff --git a/config/server.toml b/config/server.toml index e5dd11790..d4ead4413 100644 --- a/config/server.toml +++ b/config/server.toml @@ -21,10 +21,8 @@ git = {} installer = {} ion = {} kibi = {} -netdb = {} pkgutils = {} redoxfs = {} -resist = {} [[files]] path = "/usr/lib/init.d/30_console" From db8641a1094a345c29826d9d1b105f5f581bed5f Mon Sep 17 00:00:00 2001 From: Ribbon Date: Tue, 30 Sep 2025 06:52:00 -0300 Subject: [PATCH 2/2] Use hell-redox recipe --- config/dev.toml | 58 +------------------------------------------------ 1 file changed, 1 insertion(+), 57 deletions(-) diff --git a/config/dev.toml b/config/dev.toml index 2e7e40e50..8f92fb2cc 100644 --- a/config/dev.toml +++ b/config/dev.toml @@ -12,60 +12,4 @@ prompt = false # Package settings [packages] dev-redox = {} - -[[files]] -path = "/home/user/hello-redox/test.rs" -data = """ -fn main() { - println!("Hello, Redox!"); -} -""" - -[[files]] -path = "/home/user/hello-redox/test.c" -data = """ -#include - -int main(void) { - printf("Hello, Redox!\\n"); -} -""" - -[[files]] -path = "/home/user/hello-redox/test.cpp" -data = """ -#include - -int main() -{ - std::cout << "Hello, Redox!" << std::endl; -} -""" - -[[files]] -path = "/home/user/hello-redox/test.py" -data = """ -print("Hello, Redox!") -""" - -[[files]] -path = "/home/user/hello-redox/test.lua" -data = """ -print("Hello, Redox!") -""" - -[[files]] -path = "/home/user/hello-redox/test.js" -data = """ -console.log("Hello Redox"); -""" - -[[files]] -path = "/home/user/hello-redox/test.java" -data = """ -public class Java { - public static void main(String[] args) { - System.out.println("Hello Redox"); - } -} -""" +hello-redox = {}