From 96044654b015d28c6ccc624cfbb339abf7991001 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 4 Jan 2024 13:43:32 -0700 Subject: [PATCH] Template for dev --- config/dev.toml | 27 +++++++++++++++ config/i686/dev.toml | 79 +----------------------------------------- config/server.toml | 1 + config/x86_64/dev.toml | 79 +----------------------------------------- 4 files changed, 30 insertions(+), 156 deletions(-) create mode 100644 config/dev.toml diff --git a/config/dev.toml b/config/dev.toml new file mode 100644 index 0000000..6c16473 --- /dev/null +++ b/config/dev.toml @@ -0,0 +1,27 @@ +# Configuration for development, includes cargo and rustc + +include = ["desktop.toml"] + +# General settings +[general] +# Filesystem size in MiB +filesystem_size = 2048 +# Do not prompt if settings are not defined +prompt = false + +# Package settings +[packages] +cargo = {} +crates-io-index = {} +gcc13 = {} +gnu-binutils = {} +gnu-make = {} +rust = {} + +[[files]] +path = "/home/user/example.rs" +data = """ +fn main() { + println!("Hello, Redox!"); +} +""" diff --git a/config/i686/dev.toml b/config/i686/dev.toml index cc16080..d5186d7 100644 --- a/config/i686/dev.toml +++ b/config/i686/dev.toml @@ -1,80 +1,3 @@ # Configuration for development, includes cargo and rustc -include = ["../net.toml"] - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 2048 -# Do not prompt if settings are not defined -prompt = false - -# Package settings -[packages] -audiod = {} -bash = {} -bootloader = {} -ca-certificates = {} -contain = {} -coreutils = {} -diffutils = {} -extrautils = {} -findutils = {} -installer = {} -installer-gui = {} -ion = {} -netdb = {} -netsurf = {} -orbdata = {} -orbital = {} -orbterm = {} -orbutils = {} -pkgutils = {} -redoxfs = {} -relibc = {} -resist = {} -smith = {} -userutils = {} -uutils = {} - -# CLI programs - -curl = {} -git = {} -terminfo = {} -vim = {} - - -# Development tools -cargo = {} -crates-io-index = {} -gcc13 = {} -gnu-binutils = {} -gnu-make = {} -rust = {} - -[[files]] -path = "/home/user/example.rs" -data = """ -fn main() { - println!("Hello, Redox!"); -} -""" - -[[files]] -path = "/etc/init.d/20_orbital" -data = """ -audiod -orbital orblogin launcher -""" - -[[files]] -path = "/etc/init.d/30_console" -data = """ -getty 2 -getty debug: -J -""" - -[[files]] -path = "/etc/pkg.d/50_redox" -data = "https://static.redox-os.org/pkg" +include = ["../dev.toml"] diff --git a/config/server.toml b/config/server.toml index 244347f..0219416 100644 --- a/config/server.toml +++ b/config/server.toml @@ -27,6 +27,7 @@ redoxfs = {} relibc = {} resist = {} smith = {} +terminfo = {} userutils = {} uutils = {} vim = {} diff --git a/config/x86_64/dev.toml b/config/x86_64/dev.toml index cc16080..d5186d7 100644 --- a/config/x86_64/dev.toml +++ b/config/x86_64/dev.toml @@ -1,80 +1,3 @@ # Configuration for development, includes cargo and rustc -include = ["../net.toml"] - -# General settings -[general] -# Filesystem size in MiB -filesystem_size = 2048 -# Do not prompt if settings are not defined -prompt = false - -# Package settings -[packages] -audiod = {} -bash = {} -bootloader = {} -ca-certificates = {} -contain = {} -coreutils = {} -diffutils = {} -extrautils = {} -findutils = {} -installer = {} -installer-gui = {} -ion = {} -netdb = {} -netsurf = {} -orbdata = {} -orbital = {} -orbterm = {} -orbutils = {} -pkgutils = {} -redoxfs = {} -relibc = {} -resist = {} -smith = {} -userutils = {} -uutils = {} - -# CLI programs - -curl = {} -git = {} -terminfo = {} -vim = {} - - -# Development tools -cargo = {} -crates-io-index = {} -gcc13 = {} -gnu-binutils = {} -gnu-make = {} -rust = {} - -[[files]] -path = "/home/user/example.rs" -data = """ -fn main() { - println!("Hello, Redox!"); -} -""" - -[[files]] -path = "/etc/init.d/20_orbital" -data = """ -audiod -orbital orblogin launcher -""" - -[[files]] -path = "/etc/init.d/30_console" -data = """ -getty 2 -getty debug: -J -""" - -[[files]] -path = "/etc/pkg.d/50_redox" -data = "https://static.redox-os.org/pkg" +include = ["../dev.toml"]