live-bootstrap

commit: 19b41d22f4a0be824aef34658ede8b40657aa2f8
parent d6d000aa0abc99f397110742b1aaeda0aafda202
Author: fosslinux <fosslinux@aussies.space>
Date:   Thu, 17 Dec 2020 11:25:36 +1100

Move everything into sysa

Diffstat:
M
.gitmodules
4
++--
D
blynn-compiler-oriansj
1
-
D
mescc-tools-seed
1
-
M
rootfs.sh
16
++++++++++------
R
blynn-compiler-extras/go.kaem -> sysa/blynn-compiler-extras/go.kaem
0

R
blynn-compiler-extras/kaem.patch -> sysa/blynn-compiler-extras/kaem.patch
0

A
sysa/blynn-compiler-oriansj
1
+
A
sysa/mescc-tools-seed
1
+

8 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "mescc-tools-seed"]
-	path = mescc-tools-seed
+	path = sysa/mescc-tools-seed
 	url = https://github.com/oriansj/mescc-tools-seed/
 [submodule "bootstrap-seeds"]
 	path = bootstrap-seeds
 	url = https://github.com/oriansj/bootstrap-seeds
 [submodule "blynn-compiler-oriansj"]
-	path = blynn-compiler-oriansj
+	path = sysa/blynn-compiler-oriansj
 	url = https://github.com/oriansj/blynn-compiler
diff --git a/blynn-compiler-oriansj b/blynn-compiler-oriansj
@@ -1 +0,0 @@
-Subproject commit aa5b62d7358fa0a1b45730c190a15ca3a8408c2c
diff --git a/mescc-tools-seed b/mescc-tools-seed
@@ -1 +0,0 @@
-Subproject commit 8a87a7689b9f92c218c2d6d519a3e61867a717db
diff --git a/rootfs.sh b/rootfs.sh
@@ -1,18 +1,20 @@
 #!/bin/bash
 set -ex
 
+pushd sysa
+
+# SYSTEM A
+
 # Setup tmp 
 mkdir -p tmp/
 sudo mount -t tmpfs -o size=8G tmpfs tmp
 
-# Now copy everything over
-
 # base: mescc-tools-seed
 cp -r mescc-tools-seed/x86/* tmp
 cp -r mescc-tools-seed/{M2-Planet,mes-m2,mescc-tools} tmp/
-cp bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/init
-cp bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/
-cp -r bootstrap-seeds tmp/
+cp ../bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/init
+cp ../bootstrap-seeds/POSIX/x86/kaem-optional-seed tmp/
+cp -r ../bootstrap-seeds tmp/
 mkdir tmp/bin
 
 # blynn-compiler
@@ -35,7 +37,9 @@ qemu-system-x86_64 -enable-kvm \
     -m 16G \
     -nographic \
     -no-reboot \
-    -kernel ../kernel -initrd initramfs.igz -append console=ttyS0,kernel.panic=2
+    -kernel ../../kernel -initrd initramfs.igz -append console=ttyS0,kernel.panic=2
 
 # Cleanup
 sudo umount tmp
+
+popd
diff --git a/blynn-compiler-extras/go.kaem b/sysa/blynn-compiler-extras/go.kaem
diff --git a/blynn-compiler-extras/kaem.patch b/sysa/blynn-compiler-extras/kaem.patch
diff --git a/sysa/blynn-compiler-oriansj b/sysa/blynn-compiler-oriansj
@@ -0,0 +1 @@
+Subproject commit aa5b62d7358fa0a1b45730c190a15ca3a8408c2c
diff --git a/sysa/mescc-tools-seed b/sysa/mescc-tools-seed
@@ -0,0 +1 @@
+Subproject commit 8a87a7689b9f92c218c2d6d519a3e61867a717db