From 462971242a77d98e7e3c9ac213fe84ecfe97de2d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sun, 7 Sep 2025 20:07:48 -0600 Subject: [PATCH] Normalize riscv64 config with aarch64 --- config/riscv64gc/demo.toml | 36 ++------------------------- config/riscv64gc/desktop-minimal.toml | 29 +++------------------ config/riscv64gc/desktop.toml | 29 +++------------------ config/riscv64gc/jeremy.toml | 36 ++------------------------- config/riscv64gc/server.toml | 6 ++--- 5 files changed, 15 insertions(+), 121 deletions(-) diff --git a/config/riscv64gc/demo.toml b/config/riscv64gc/demo.toml index 7d58679f3..1f6e59b5e 100644 --- a/config/riscv64gc/demo.toml +++ b/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"] diff --git a/config/riscv64gc/desktop-minimal.toml b/config/riscv64gc/desktop-minimal.toml index 7d58679f3..d5872d0d6 100644 --- a/config/riscv64gc/desktop-minimal.toml +++ b/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 = {} diff --git a/config/riscv64gc/desktop.toml b/config/riscv64gc/desktop.toml index 7d58679f3..e4e9fa6bc 100644 --- a/config/riscv64gc/desktop.toml +++ b/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 = {} diff --git a/config/riscv64gc/jeremy.toml b/config/riscv64gc/jeremy.toml index 7d58679f3..f3d8c0abc 100644 --- a/config/riscv64gc/jeremy.toml +++ b/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"] diff --git a/config/riscv64gc/server.toml b/config/riscv64gc/server.toml index bcdb3af01..01f518228 100644 --- a/config/riscv64gc/server.toml +++ b/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 = {} \ No newline at end of file +# example = {}