aarch64: WIP basic initfs and filesystem build

3 files changed, 43 insertions, 36 deletions

diff --git a/aarch64.sh b/aarch64.sh
index 6a51d31..ad82228 100755
--- a/aarch64.sh
+++ b/aarch64.sh
@@ -66,6 +66,7 @@ touch kernel
 touch kernel/src/arch/aarch64/init/pre_kstart/early_init.S
 make build/kernel
 make build/initfs.tag
+make build/filesystem.bin
 
 mkimage \
 	-A arm64 \
diff --git a/config/desktop.toml b/config/desktop.toml
index bbce92f..9986bc1 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -8,7 +8,7 @@ prompt = false
 # Package settings
 [packages]
 #acid = {}
-audiod = {}
+# audiod = {}
 #autoconf = {}
 #automake = {}
 #bash = {}
@@ -19,23 +19,23 @@ ca-certificates = {}
 #cargo = {}
 #cleye = {}
 #cmatrix = {}
-contain = {}
-coreutils = {}
+# contain = {}
+# coreutils = {}
 #cpal = {}
 #curl = {}
-dash = {}
+# dash = {}
 #diffutils = {}
 #dosbox = {}
-drivers = {}
+# drivers = {}
 #drivers-041 = {}
 #duktape = {}
 #eduke32 = {}
 #exampled = {}
 #expat = {}
-extrautils = {}
+# extrautils = {}
 #fd = {}
 #ffmpeg = {}
-findutils = {}
+# findutils = {}
 #freeciv = {}
 #freedoom = {}
 #freeglut = {}
@@ -45,7 +45,7 @@ findutils = {}
 #games = {}
 #gawk = {}
 #gcc = {}
-gdbserver = {}
+# gdbserver = {}
 #gears = {}
 #generaluser-gs = {}
 #gettext = {}
@@ -85,14 +85,14 @@ logd = {}
 #ncdu = {}
 #ncurses = {}
 #ncursesw = {}
-netdb = {}
-netstack = {}
-netsurf = {}
-netutils = {}
+# netdb = {}
+# netstack = {}
+# netsurf = {}
+# netutils = {}
 #neverball = {}
 #newlib = {}
 #newlibtest = {}
-#nulld = {}
+nulld = {}
 #openjazz = {}
 #openssl = {}
 #openttd = {}
@@ -100,10 +100,10 @@ netutils = {}
 #openttd-openmsx = {}
 #openttd-opensfx = {}
 #orbclient = {}
-orbdata = {}
-orbital = {}
-orbterm = {}
-orbutils = {}
+# orbdata = {}
+# orbital = {}
+# orbterm = {}
+# orbutils = {}
 #osdemo = {}
 #pastel = {}
 #patch = {}
@@ -113,13 +113,13 @@ orbutils = {}
 #perl = {}
 #pixelcannon = {}
 #pixman = {}
-pkgutils = {}
+# pkgutils = {}
 #powerline = {}
 #prboom = {}
 ptyd = {}
 #python = {}
 #qemu = {}
-#randd = {}
+randd = {}
 #readline = {} # ncurses
 redoxfs = {}
 #redox-fatfs = {}
@@ -147,24 +147,24 @@ redoxfs = {}
 #sed = {}
 #servo = {}
 #shellstorm = {}
-smith = {}
+# smith = {}
 #sodium = {}
 #sopwith = {}
 #ssh = {}
-strace = {}
+# strace = {}
 #syobonaction = {}
 #terminfo = {}
 #termplay = {}
 #timidity = {}
 #ttf-hack = {}
-userutils = {}
-uutils = {}
+# userutils = {}
+# uutils = {}
 #vim = {}
 #vttest = {}
 #webrender = {}
 #winit = {}
 #xz = {}
-#zerod = {}
+zerod = {}
 #zlib = {}
 
 # User settings
@@ -185,28 +185,28 @@ data = """
 ipcd
 logd
 ptyd
-pcid /etc/pcid.d/
+# pcid /etc/pcid.d/
 """
 
 [[files]]
 path = "/etc/init.d/10_net"
 data = """
-smolnetd
-dnsd
-dhcpd -b
+# smolnetd
+# dnsd
+# dhcpd -b
 """
 
 [[files]]
 path = "/etc/init.d/20_orbital"
 data = """
-audiod
-orbital display:3/activate orblogin launcher
+# audiod
+# orbital display:3/activate orblogin launcher
 """
 
 [[files]]
 path = "/etc/init.d/30_console"
 data = """
-getty display:2
+# getty display:2
 getty debug: -J
 """
 
diff --git a/initfs.toml b/initfs.toml
index ede7113..6e06bb0 100644
--- a/initfs.toml
+++ b/initfs.toml
@@ -13,7 +13,7 @@ nulld = {}
 #pciids = {}
 ramfs = {}
 randd = {}
-#redoxfs = {}
+redoxfs = {}
 zerod = {}
 
 [[files]]
@@ -21,15 +21,21 @@ path="/etc/init.rc"
 data="""
 export PATH /bin
 export TMPDIR /tmp
+stdio debug:
+echo Post stdio!
 nulld
+echo Post nulld!
 zerod
+echo Post zerod!
 randd
-vesad T T G
-stdio display:1
-ps2d us
+echo Post randd!
+# vesad T T G
+# ps2d us
 ramfs logging
-pcid /etc/pcid/initfs.toml
+echo Post ramfs!
+# pcid /etc/pcid/initfs.toml
 redoxfs --uuid $REDOXFS_UUID file $REDOXFS_BLOCK
+echo Post redoxfs!
 cd file:
 export PATH file:/bin
 run.d /etc/init.d