From 620e10d4be33d7c7cde5bdbb4680885333da70e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Tue, 28 Dec 2021 11:51:15 +0000
Subject: [PATCH] Update stage0-posix.

---
 sysa.py                       |  5 +----
 sysa/{run.kaem => after.kaem} | 30 +++++++++++++++---------------
 sysa/after.kaem.amd64         |  9 ---------
 sysa/after.kaem.x86           |  9 ---------
 sysa/stage0-posix/src         |  2 +-
 5 files changed, 17 insertions(+), 38 deletions(-)
 rename sysa/{run.kaem => after.kaem} (77%)
 delete mode 100644 sysa/after.kaem.amd64
 delete mode 100644 sysa/after.kaem.x86

diff --git a/sysa.py b/sysa.py
index ab5bd25..67eab56 100755
--- a/sysa.py
+++ b/sysa.py
@@ -78,12 +78,9 @@ class SysA(SysGeneral):
         shutil.copy2(kaem_optional_seed, os.path.join(self.tmp_dir, 'init'))
 
         # stage0-posix hook to continue running live-bootstrap
-        shutil.copy2(os.path.join(self.sys_dir, f"after.kaem.{self.arch}"),
+        shutil.copy2(os.path.join(self.sys_dir, 'after.kaem'),
                      os.path.join(self.tmp_dir, 'after.kaem'))
 
-        shutil.copy2(os.path.join(self.sys_dir, 'run.kaem'),
-                     os.path.join(self.tmp_dir, 'run.kaem'))
-
     def after(self):
         """
         Prepare sources in /after directory.
diff --git a/sysa/run.kaem b/sysa/after.kaem
similarity index 77%
rename from sysa/run.kaem
rename to sysa/after.kaem
index 3f1816e..be8888b 100755
--- a/sysa/run.kaem
+++ b/sysa/after.kaem
@@ -8,7 +8,7 @@
 
 set -ex
 
-PATH=/${STAGE0_ARCH}/bin
+PATH=/${ARCH_DIR}/bin
 
 # Set commonly used variables
 sources=/after
@@ -27,20 +27,20 @@ mkdir ${prefix} ${bindir} ${libdir} ${incdir} ${tmpdir}
 cd ${prefix}
 
 # Remove remaining dependencies on /bin (stage0-posix directory)
-cp /${STAGE0_ARCH}/bin/blood-elf bin/blood-elf
-cp /${STAGE0_ARCH}/bin/catm bin/catm
-cp /${STAGE0_ARCH}/bin/chmod bin/chmod
-cp /${STAGE0_ARCH}/bin/get_machine bin/get_machine
-cp /${STAGE0_ARCH}/bin/hex2 bin/hex2
-cp /${STAGE0_ARCH}/bin/kaem bin/kaem
-cp /${STAGE0_ARCH}/bin/match bin/match
-cp /${STAGE0_ARCH}/bin/M1 bin/M1
-cp /${STAGE0_ARCH}/bin/M2-Planet bin/M2-Planet
-cp /${STAGE0_ARCH}/bin/mkdir bin/mkdir
-cp /${STAGE0_ARCH}/bin/sha256sum bin/sha256sum
-cp /${STAGE0_ARCH}/bin/ungz bin/ungz
-cp /${STAGE0_ARCH}/bin/untar bin/untar
-cp /${STAGE0_ARCH}/bin/cp bin/cp
+cp /${ARCH_DIR}/bin/blood-elf bin/blood-elf
+cp /${ARCH_DIR}/bin/catm bin/catm
+cp /${ARCH_DIR}/bin/chmod bin/chmod
+cp /${ARCH_DIR}/bin/get_machine bin/get_machine
+cp /${ARCH_DIR}/bin/hex2 bin/hex2
+cp /${ARCH_DIR}/bin/kaem bin/kaem
+cp /${ARCH_DIR}/bin/match bin/match
+cp /${ARCH_DIR}/bin/M1 bin/M1
+cp /${ARCH_DIR}/bin/M2-Planet bin/M2-Planet
+cp /${ARCH_DIR}/bin/mkdir bin/mkdir
+cp /${ARCH_DIR}/bin/sha256sum bin/sha256sum
+cp /${ARCH_DIR}/bin/ungz bin/ungz
+cp /${ARCH_DIR}/bin/untar bin/untar
+cp /${ARCH_DIR}/bin/cp bin/cp
 
 chmod 755 bin/blood-elf
 chmod 755 bin/catm
diff --git a/sysa/after.kaem.amd64 b/sysa/after.kaem.amd64
deleted file mode 100644
index cec8e3f..0000000
--- a/sysa/after.kaem.amd64
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-ARCH=amd64
-STAGE0_ARCH=AMD64
-exec /${STAGE0_ARCH}/bin/kaem --verbose --file run.kaem
diff --git a/sysa/after.kaem.x86 b/sysa/after.kaem.x86
deleted file mode 100644
index d2c07eb..0000000
--- a/sysa/after.kaem.x86
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-ARCH=x86
-STAGE0_ARCH=x86
-exec /${ARCH}/bin/kaem --verbose --file run.kaem
diff --git a/sysa/stage0-posix/src b/sysa/stage0-posix/src
index 02c08da..649b6a5 160000
--- a/sysa/stage0-posix/src
+++ b/sysa/stage0-posix/src
@@ -1 +1 @@
-Subproject commit 02c08dabcc4409023db5acc8f0191a1a31b8b7d0
+Subproject commit 649b6a555822d83a4cdc8a6d41dc8d9f34a0dec1