Support distinct filesystem configs for each architecture

Makefile

@@ -32,7 +32,7 @@ pull:
 
 update:
 	cd cookbook && ./update.sh \
-		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
+		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../$(FILESYSTEM_CONFIG))"
 	cargo update --manifest-path cookbook/pkgutils/Cargo.toml
 	cargo update --manifest-path installer/Cargo.toml
 	cargo update --manifest-path redoxfs/Cargo.toml
@@ -41,7 +41,7 @@ update:
 fetch:
 	cargo build --manifest-path cookbook/Cargo.toml --release
 	cd cookbook && ./fetch.sh \
-		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../filesystem.toml)"
+		"$$(cargo run --manifest-path ../installer/Cargo.toml -- --list-packages -c ../$(FILESYSTEM_CONFIG))"
 
 # Cross compiler recipes
 include mk/prefix.mk

config/i686/desktop.toml

@@ -0,0 +1,194 @@
+# Default desktop configuration
+
+# General settings
+[general]
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+audiod = {}
+bootloader = {}
+bootstrap = {}
+ca-certificates = {}
+contain = {}
+coreutils = {}
+#dash = {} # relibc issues?
+diffutils = {}
+drivers = {}
+escalated = {}
+extrautils = {}
+findutils = {}
+#gdbserver = {} # needs updated redox_syscall
+gnu-make = {}
+initfs = {}
+installer = {}
+ion = {}
+ipcd = {}
+kernel = {}
+netdb = {}
+netstack = {}
+#netsurf = {} # openssl issues
+netutils = {}
+orbdata = {}
+orbital = {}
+orbterm = {}
+orbutils = {}
+pkgutils = {}
+ptyd = {}
+redoxfs = {}
+relibc = {}
+resist = {}
+smith = {}
+#strace = {} # needs updated redox_syscall
+terminfo = {}
+userutils = {}
+uutils = {}
+#vim = {} # relibc issues?
+
+# User settings
+[users.root]
+password = "password"
+uid = 0
+gid = 0
+name = "root"
+home = "/root"
+
+[users.user]
+# Password is unset
+password = ""
+
+[[files]]
+path = "/etc/init.d/00_base"
+data = """
+ipcd
+ptyd
+pcid /etc/pcid.d/
+escalated
+"""
+
+[[files]]
+path = "/etc/init.d/10_net"
+data = """
+smolnetd
+dnsd
+dhcpd -b
+"""
+
+[[files]]
+path = "/etc/init.d/20_orbital"
+data = """
+audiod
+orbital display:3/activate orblogin launcher
+"""
+
+[[files]]
+path = "/etc/init.d/30_console"
+data = """
+getty display:2
+getty debug: -J
+"""
+
+[[files]]
+path = "/etc/net/dns"
+data = """
+208.67.222.222
+"""
+
+[[files]]
+path = "/etc/net/ip"
+data = """
+10.0.2.15
+"""
+
+[[files]]
+path = "/etc/net/ip_router"
+data = """
+10.0.2.2
+"""
+
+[[files]]
+path = "/etc/net/ip_subnet"
+data = """
+255.255.255.0
+"""
+
+[[files]]
+path = "/etc/net/mac"
+data = """
+54-52-00-ab-cd-ef
+"""
+
+[[files]]
+path = "/etc/pkg.d/50_redox"
+data = "https://static.redox-os.org/pkg"
+
+[[files]]
+path = "/etc/redox-release"
+data = "0.7.0"
+
+[[files]]
+path = "/etc/group"
+data = """
+root;0;root
+user;1000;user
+sudo;1;user
+"""
+
+[[files]]
+path = "/etc/hostname"
+data = """
+redox
+"""
+
+[[files]]
+path = "/usr/bin"
+data = "../bin"
+symlink = true
+
+[[files]]
+path = "/usr/games"
+data = "../games"
+symlink = true
+
+[[files]]
+path = "/usr/include"
+data = "../include"
+symlink = true
+
+[[files]]
+path = "/usr/lib"
+data = "../lib"
+symlink = true
+
+[[files]]
+path = "/usr/share"
+data = "../share"
+symlink = true
+
+[[files]]
+path = "/tmp"
+data = ""
+directory= true
+# 0o1777
+mode = 1023
+
+[[files]]
+path = "/dev/null"
+data = "null:"
+symlink = true
+
+[[files]]
+path = "/dev/random"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/urandom"
+data = "rand:"
+symlink = true
+
+[[files]]
+path = "/dev/zero"
+data = "zero:"
+symlink = true

filesystem.toml

@@ -1 +0,0 @@
-config/desktop.toml

mk/config.mk

@@ -7,6 +7,8 @@ ARCH?=x86_64
 INSTALLER_FLAGS?=--cookbook=cookbook
 ## Enabled to use binary prefix (much faster)
 PREFIX_BINARY?=1
+## Select filesystem config
+FILESYSTEM_CONFIG?=config/$(ARCH)/desktop.toml
 ## Filesystem size in MB (256 is the default)
 FILESYSTEM_SIZE?=256
 ## Flags to pass to redoxfs-mkfs. Add --encrypt to set up disk encryption

mk/filesystem.mk

@@ -1,4 +1,4 @@
-build/filesystem.bin: prefix filesystem.toml
+build/filesystem.bin: prefix $(FILESYSTEM_CONFIG)
 	$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
 	$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
 	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
@@ -13,8 +13,8 @@ build/filesystem.bin: prefix filesystem.toml
 	redoxfs/target/release/redoxfs $@.partial build/filesystem/
 	sleep 2
 	pgrep redoxfs
-	$(INSTALLER) -c filesystem.toml build/filesystem/
+	$(INSTALLER) -c $(FILESYSTEM_CONFIG) build/filesystem/
-	cp -v filesystem.toml build/filesystem/filesystem.toml
+	cp -v $(FILESYSTEM_CONFIG) build/filesystem/filesystem.toml
 	mkdir -pv build/filesystem/pkg
 	cp -v cookbook/build/id_ed25519.pub.toml build/filesystem/pkg/id_ed25519.pub.toml
 	sync