commit: d12d0e0f9c8f53b02621304b7214d24e39f8dac0
parent d1fea647ee5a23b9b34b22e10800e66746b511b6
Author: Dor Askayo <dor.askayo@gmail.com>
Date: Fri, 20 May 2022 19:48:18 +0300
Make bootstrap.cfg available during early bootstrap
Diffstat:
| M | sysa/after.kaem | 83 | ++++--------------------------------------------------------------------------- |
| A | sysa/run.kaem | 92 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
2 files changed, 96 insertions(+), 79 deletions(-)
diff --git a/sysa/after.kaem b/sysa/after.kaem
@@ -3,6 +3,7 @@
# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
# SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
#
# SPDX-License-Identifier: GPL-3.0-or-later
@@ -19,11 +20,6 @@ libdir=${prefix}/lib
incdir=${prefix}/include
TMPDIR=/tmp # tmpdir is needed for patch to work
-# Environmental variables needed for mes
-NYACC_PKG=nyacc-1.00.2
-MES_PKG=mes-0.24
-MES_PREFIX=${sysa}/${MES_PKG}/build/${MES_PKG}
-GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sysa}/${MES_PKG}/build/${NYACC_PKG}/module
mkdir -p ${prefix} ${bindir} ${libdir} ${incdir} ${TMPDIR}
# Remove remaining dependencies on /bin (stage0-posix directory)
@@ -61,78 +57,7 @@ PATH=${bindir}
cd ${sysa}
-# mes
-pkg=${MES_PKG}
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
+catm run2.kaem bootstrap.cfg run.kaem
+chmod +x run2.kaem
-# tcc 0.9.26
-pkg="tcc-0.9.26"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-libdir=${libdir}/mes
-
-# make
-pkg="make-3.80"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# gzip
-pkg="gzip-1.2.4"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# tar
-pkg="tar-1.12"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# sed
-pkg="sed-4.0.9"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# patch
-pkg="patch-2.5.9"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# bzip2
-pkg="bzip2-1.0.8"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# tcc 0.9.27
-pkg="tcc-0.9.27"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# coreutils
-pkg="coreutils-5.0"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# heirloom-devtools
-pkg="heirloom-devtools-070527"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-# bash
-pkg="bash-2.05b"
-cd ${pkg}
-kaem --file ${pkg}.kaem
-cd ..
-
-exec bash run.sh
+kaem --file run2.kaem
diff --git a/sysa/run.kaem b/sysa/run.kaem
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -ex
+
+# Environmental variables needed for mes
+NYACC_PKG=nyacc-1.00.2
+MES_PKG=mes-0.24
+MES_PREFIX=${sysa}/${MES_PKG}/build/${MES_PKG}
+GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sysa}/${MES_PKG}/build/${NYACC_PKG}/module
+
+# mes
+pkg=${MES_PKG}
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# tcc 0.9.26
+pkg="tcc-0.9.26"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+libdir=${libdir}/mes
+
+# make
+pkg="make-3.80"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# gzip
+pkg="gzip-1.2.4"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# tar
+pkg="tar-1.12"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# sed
+pkg="sed-4.0.9"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# patch
+pkg="patch-2.5.9"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# bzip2
+pkg="bzip2-1.0.8"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# tcc 0.9.27
+pkg="tcc-0.9.27"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# coreutils
+pkg="coreutils-5.0"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# heirloom-devtools
+pkg="heirloom-devtools-070527"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+# bash
+pkg="bash-2.05b"
+cd ${pkg}
+kaem --file ${pkg}.kaem
+cd ..
+
+exec bash run.sh
