diff --git a/.gitignore b/.gitignore index 125eaad..8908b92 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,6 @@ tmp/ kernel -sysa/distfiles/ -sysc/distfiles/ +distfiles/ __pycache__ -sysa/bootstrap.cfg +steps/bootstrap.cfg diff --git a/.gitmodules b/.gitmodules index 942e4ed..e3b6883 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,6 @@ # SPDX-FileCopyrightText: 2021 fosslinux # # SPDX-License-Identifier: MIT - -[submodule "sysa/stage0-posix/src"] - path = sysa/stage0-posix/src - url = https://github.com/oriansj/stage0-posix/ +[submodule "seed/stage0-posix"] + path = seed/stage0-posix + url = https://github.com/oriansj/stage0-posix diff --git a/download-distfiles.sh b/download-distfiles.sh index 7b08e34..e4c12b9 100755 --- a/download-distfiles.sh +++ b/download-distfiles.sh @@ -20,27 +20,18 @@ download_source() { echo "${checksum} ${dest_path}" | sha256sum -c } -download_for_sys() { - local sysdir="${1}" - local distfiles="${sysdir}/distfiles" - - mkdir -p "${distfiles}" - - local entry - for entry in "${sysdir}"/*; do - [ -e "${entry}/sources" ] || continue - - local line - # shellcheck disable=SC2162 - while read line; do - # This is intentional - we want to split out ${line} into separate arguments. - # shellcheck disable=SC2086 - download_source "${distfiles}" ${line} - done < "${entry}/sources" - done -} - set -e + cd "$(dirname "$(readlink -f "$0")")" -download_for_sys sysa -download_for_sys sysc +mkdir -p distfiles + +for entry in steps/*; do + [ -e "${entry}/sources" ] || continue + + # shellcheck disable=SC2162 + while read line; do + # This is intentional - we want to split out ${line} into separate arguments. + # shellcheck disable=SC2086 + download_source distfiles ${line} + done < "${entry}/sources" +done diff --git a/sysa/after-preseeded.kaem b/seed/after.kaem similarity index 55% rename from sysa/after-preseeded.kaem rename to seed/after.kaem index 61dea2d..79c6f61 100755 --- a/sysa/after-preseeded.kaem +++ b/seed/after.kaem @@ -9,17 +9,7 @@ set -ex -# Set commonly used variables -sysa=/sysa -DISTFILES=/sysa/distfiles -PREFIX=/usr -BINDIR=${PREFIX}/bin -LIBDIR=${PREFIX}/lib/mes -INCDIR=${PREFIX}/include/mes -SRCDIR=${PREFIX}/src -TMPDIR=/tmp # tmpdir is needed for patch to work -PATH=${BINDIR} +PATH=/${ARCH_DIR}/bin -cd ${sysa} - -exec bash run.sh +catm seed-full.kaem /steps/env seed.kaem +kaem --file seed-full.kaem diff --git a/seed/preseeded.kaem b/seed/preseeded.kaem new file mode 100755 index 0000000..1c51d6f --- /dev/null +++ b/seed/preseeded.kaem @@ -0,0 +1,4 @@ +#!/bin/sh + +/script-generator /steps/manifest +/usr/bin/kaem --file /preseed-jump.kaem diff --git a/sysa/script-generator.c b/seed/script-generator.c similarity index 100% rename from sysa/script-generator.c rename to seed/script-generator.c diff --git a/sysa/after.kaem b/seed/seed.kaem similarity index 81% rename from sysa/after.kaem rename to seed/seed.kaem index bd1a96d..68ae36a 100755 --- a/sysa/after.kaem +++ b/seed/seed.kaem @@ -9,20 +9,11 @@ set -ex +mkdir -p ${PREFIX} ${BINDIR} ${LIBDIR} ${INCDIR} ${SRCDIR} ${TMPDIR} /dev + +# Temporarily change PATH PATH=/${ARCH_DIR}/bin -# Set commonly used variables -sysa=/sysa -DISTFILES=/sysa/distfiles -PREFIX=/usr -BINDIR=${PREFIX}/bin -LIBDIR=${PREFIX}/lib -INCDIR=${PREFIX}/include/mes -SRCDIR=${PREFIX}/src -TMPDIR=/tmp # tmpdir is needed for patch to work - -mkdir -p ${PREFIX} ${BINDIR} ${LIBDIR} ${INCDIR} ${SRCDIR} ${TMPDIR} - # Remove remaining dependencies on /bin (stage0-posix directory) cp /${ARCH_DIR}/bin/blood-elf ${BINDIR}/blood-elf cp /${ARCH_DIR}/bin/catm ${BINDIR}/catm @@ -63,10 +54,14 @@ chmod 755 ${BINDIR}/replace chmod 755 ${BINDIR}/rm PATH=${BINDIR} +M2LIBC_PATH=/M2libc -cd ${sysa} +# mes envars +NYACC_PKG=nyacc-1.00.2 +MES_PKG=mes-0.25 +MES_PREFIX=${SRCDIR}/${MES_PKG}/build/${MES_PKG} +GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${SRCDIR}/${MES_PKG}/build/${NYACC_PKG}/module -catm run2.kaem bootstrap.cfg run.kaem -chmod 755 run2.kaem - -kaem --file run2.kaem +M2-Mesoplanet --architecture ${ARCH} -f script-generator.c -o script-generator +./script-generator /steps/manifest +kaem --file /steps/0.sh diff --git a/sysa/stage0-posix/src b/seed/stage0-posix similarity index 100% rename from sysa/stage0-posix/src rename to seed/stage0-posix diff --git a/sysa/SHA256SUMS.pkgs b/steps/SHA256SUMS.pkgs similarity index 100% rename from sysa/SHA256SUMS.pkgs rename to steps/SHA256SUMS.pkgs diff --git a/sysa/autoconf-2.52/autoconf-2.52.sh b/steps/autoconf-2.52/pass1.sh similarity index 100% rename from sysa/autoconf-2.52/autoconf-2.52.sh rename to steps/autoconf-2.52/pass1.sh diff --git a/sysa/autoconf-2.52/sources b/steps/autoconf-2.52/sources similarity index 100% rename from sysa/autoconf-2.52/sources rename to steps/autoconf-2.52/sources diff --git a/sysa/autoconf-2.53/autoconf-2.53.sh b/steps/autoconf-2.53/pass1.sh similarity index 100% rename from sysa/autoconf-2.53/autoconf-2.53.sh rename to steps/autoconf-2.53/pass1.sh diff --git a/sysa/autoconf-2.53/patches/autoconf_252.patch b/steps/autoconf-2.53/patches/autoconf_252.patch similarity index 100% rename from sysa/autoconf-2.53/patches/autoconf_252.patch rename to steps/autoconf-2.53/patches/autoconf_252.patch diff --git a/sysa/autoconf-2.53/sources b/steps/autoconf-2.53/sources similarity index 100% rename from sysa/autoconf-2.53/sources rename to steps/autoconf-2.53/sources diff --git a/sysa/autoconf-2.54/autoconf-2.54.sh b/steps/autoconf-2.54/pass1.sh similarity index 100% rename from sysa/autoconf-2.54/autoconf-2.54.sh rename to steps/autoconf-2.54/pass1.sh diff --git a/sysa/autoconf-2.54/sources b/steps/autoconf-2.54/sources similarity index 100% rename from sysa/autoconf-2.54/sources rename to steps/autoconf-2.54/sources diff --git a/sysa/autoconf-2.55/autoconf-2.55.sh b/steps/autoconf-2.55/pass1.sh similarity index 100% rename from sysa/autoconf-2.55/autoconf-2.55.sh rename to steps/autoconf-2.55/pass1.sh diff --git a/sysa/autoconf-2.55/sources b/steps/autoconf-2.55/sources similarity index 100% rename from sysa/autoconf-2.55/sources rename to steps/autoconf-2.55/sources diff --git a/sysa/autoconf-2.57/autoconf-2.57.sh b/steps/autoconf-2.57/pass1.sh similarity index 100% rename from sysa/autoconf-2.57/autoconf-2.57.sh rename to steps/autoconf-2.57/pass1.sh diff --git a/sysa/autoconf-2.57/sources b/steps/autoconf-2.57/sources similarity index 100% rename from sysa/autoconf-2.57/sources rename to steps/autoconf-2.57/sources diff --git a/sysa/autoconf-2.59/autoconf-2.59.sh b/steps/autoconf-2.59/pass1.sh similarity index 100% rename from sysa/autoconf-2.59/autoconf-2.59.sh rename to steps/autoconf-2.59/pass1.sh diff --git a/sysa/autoconf-2.59/sources b/steps/autoconf-2.59/sources similarity index 100% rename from sysa/autoconf-2.59/sources rename to steps/autoconf-2.59/sources diff --git a/sysa/autoconf-2.61/autoconf-2.61.sh b/steps/autoconf-2.61/pass1.sh similarity index 100% rename from sysa/autoconf-2.61/autoconf-2.61.sh rename to steps/autoconf-2.61/pass1.sh diff --git a/sysa/autoconf-2.61/sources b/steps/autoconf-2.61/sources similarity index 100% rename from sysa/autoconf-2.61/sources rename to steps/autoconf-2.61/sources diff --git a/sysa/autoconf-2.64/autoconf-2.64.sh b/steps/autoconf-2.64/pass1.sh similarity index 100% rename from sysa/autoconf-2.64/autoconf-2.64.sh rename to steps/autoconf-2.64/pass1.sh diff --git a/sysa/autoconf-2.64/sources b/steps/autoconf-2.64/sources similarity index 100% rename from sysa/autoconf-2.64/sources rename to steps/autoconf-2.64/sources diff --git a/sysa/autoconf-2.69/autoconf-2.69.sh b/steps/autoconf-2.69/pass1.sh similarity index 100% rename from sysa/autoconf-2.69/autoconf-2.69.sh rename to steps/autoconf-2.69/pass1.sh diff --git a/sysa/autoconf-2.69/sources b/steps/autoconf-2.69/sources similarity index 100% rename from sysa/autoconf-2.69/sources rename to steps/autoconf-2.69/sources diff --git a/sysc/autoconf-2.71/autoconf-2.71.sh b/steps/autoconf-2.71/pass1.sh similarity index 100% rename from sysc/autoconf-2.71/autoconf-2.71.sh rename to steps/autoconf-2.71/pass1.sh diff --git a/sysc/autoconf-2.71/sources b/steps/autoconf-2.71/sources similarity index 100% rename from sysc/autoconf-2.71/sources rename to steps/autoconf-2.71/sources diff --git a/sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh b/steps/autoconf-archive-2021.02.19/pass1.sh similarity index 100% rename from sysc/autoconf-archive-2021.02.19/autoconf-archive-2021.02.19.sh rename to steps/autoconf-archive-2021.02.19/pass1.sh diff --git a/sysc/autoconf-archive-2021.02.19/sources b/steps/autoconf-archive-2021.02.19/sources similarity index 100% rename from sysc/autoconf-archive-2021.02.19/sources rename to steps/autoconf-archive-2021.02.19/sources diff --git a/sysc/autogen-5.18.16/autogen-5.18.16.sh b/steps/autogen-5.18.16/pass1.sh similarity index 100% rename from sysc/autogen-5.18.16/autogen-5.18.16.sh rename to steps/autogen-5.18.16/pass1.sh diff --git a/sysc/autogen-5.18.16/sources b/steps/autogen-5.18.16/sources similarity index 100% rename from sysc/autogen-5.18.16/sources rename to steps/autogen-5.18.16/sources diff --git a/sysa/automake-1.10.3/automake-1.10.3.sh b/steps/automake-1.10.3/pass1.sh similarity index 100% rename from sysa/automake-1.10.3/automake-1.10.3.sh rename to steps/automake-1.10.3/pass1.sh diff --git a/sysa/automake-1.10.3/patches/aclocal_glob.patch b/steps/automake-1.10.3/patches/aclocal_glob.patch similarity index 100% rename from sysa/automake-1.10.3/patches/aclocal_glob.patch rename to steps/automake-1.10.3/patches/aclocal_glob.patch diff --git a/sysa/automake-1.10.3/sources b/steps/automake-1.10.3/sources similarity index 100% rename from sysa/automake-1.10.3/sources rename to steps/automake-1.10.3/sources diff --git a/sysa/automake-1.11.2/automake-1.11.2.sh b/steps/automake-1.11.2/pass1.sh similarity index 100% rename from sysa/automake-1.11.2/automake-1.11.2.sh rename to steps/automake-1.11.2/pass1.sh diff --git a/sysa/automake-1.11.2/patches/aclocal_glob.patch b/steps/automake-1.11.2/patches/aclocal_glob.patch similarity index 100% rename from sysa/automake-1.11.2/patches/aclocal_glob.patch rename to steps/automake-1.11.2/patches/aclocal_glob.patch diff --git a/sysa/automake-1.11.2/sources b/steps/automake-1.11.2/sources similarity index 100% rename from sysa/automake-1.11.2/sources rename to steps/automake-1.11.2/sources diff --git a/sysa/automake-1.15.1/automake-1.15.1.sh b/steps/automake-1.15.1/pass1.sh similarity index 100% rename from sysa/automake-1.15.1/automake-1.15.1.sh rename to steps/automake-1.15.1/pass1.sh diff --git a/sysa/automake-1.15.1/patches/aclocal_glob.patch b/steps/automake-1.15.1/patches/aclocal_glob.patch similarity index 100% rename from sysa/automake-1.15.1/patches/aclocal_glob.patch rename to steps/automake-1.15.1/patches/aclocal_glob.patch diff --git a/sysa/automake-1.15.1/patches/bootstrap.patch b/steps/automake-1.15.1/patches/bootstrap.patch similarity index 100% rename from sysa/automake-1.15.1/patches/bootstrap.patch rename to steps/automake-1.15.1/patches/bootstrap.patch diff --git a/sysa/automake-1.15.1/patches/shellcheck-bypass.patch b/steps/automake-1.15.1/patches/shellcheck-bypass.patch similarity index 100% rename from sysa/automake-1.15.1/patches/shellcheck-bypass.patch rename to steps/automake-1.15.1/patches/shellcheck-bypass.patch diff --git a/sysa/automake-1.15.1/sources b/steps/automake-1.15.1/sources similarity index 100% rename from sysa/automake-1.15.1/sources rename to steps/automake-1.15.1/sources diff --git a/sysc/automake-1.16.3/automake-1.16.3.sh b/steps/automake-1.16.3/pass1.sh similarity index 100% rename from sysc/automake-1.16.3/automake-1.16.3.sh rename to steps/automake-1.16.3/pass1.sh diff --git a/sysc/automake-1.16.3/sources b/steps/automake-1.16.3/sources similarity index 100% rename from sysc/automake-1.16.3/sources rename to steps/automake-1.16.3/sources diff --git a/sysa/automake-1.6.3/stage1.sh b/steps/automake-1.6.3/pass1.sh similarity index 100% rename from sysa/automake-1.6.3/stage1.sh rename to steps/automake-1.6.3/pass1.sh diff --git a/sysa/automake-1.6.3/stage2.sh b/steps/automake-1.6.3/pass2.sh similarity index 100% rename from sysa/automake-1.6.3/stage2.sh rename to steps/automake-1.6.3/pass2.sh diff --git a/sysa/automake-1.6.3/sources b/steps/automake-1.6.3/sources similarity index 100% rename from sysa/automake-1.6.3/sources rename to steps/automake-1.6.3/sources diff --git a/sysa/automake-1.7.8/automake-1.7.8.sh b/steps/automake-1.7.8/pass1.sh similarity index 100% rename from sysa/automake-1.7.8/automake-1.7.8.sh rename to steps/automake-1.7.8/pass1.sh diff --git a/sysa/automake-1.7.8/sources b/steps/automake-1.7.8/sources similarity index 100% rename from sysa/automake-1.7.8/sources rename to steps/automake-1.7.8/sources diff --git a/sysa/automake-1.7/automake-1.7.sh b/steps/automake-1.7/pass1.sh similarity index 100% rename from sysa/automake-1.7/automake-1.7.sh rename to steps/automake-1.7/pass1.sh diff --git a/sysa/automake-1.7/sources b/steps/automake-1.7/sources similarity index 100% rename from sysa/automake-1.7/sources rename to steps/automake-1.7/sources diff --git a/sysa/automake-1.8.5/automake-1.8.5.sh b/steps/automake-1.8.5/pass1.sh similarity index 100% rename from sysa/automake-1.8.5/automake-1.8.5.sh rename to steps/automake-1.8.5/pass1.sh diff --git a/sysa/automake-1.8.5/sources b/steps/automake-1.8.5/sources similarity index 100% rename from sysa/automake-1.8.5/sources rename to steps/automake-1.8.5/sources diff --git a/sysa/automake-1.9.6/automake-1.9.6.sh b/steps/automake-1.9.6/pass1.sh similarity index 100% rename from sysa/automake-1.9.6/automake-1.9.6.sh rename to steps/automake-1.9.6/pass1.sh diff --git a/sysa/automake-1.9.6/sources b/steps/automake-1.9.6/sources similarity index 100% rename from sysa/automake-1.9.6/sources rename to steps/automake-1.9.6/sources diff --git a/sysa/bash-2.05b/bash-2.05b.checksums b/steps/bash-2.05b/bash-2.05b.checksums similarity index 100% rename from sysa/bash-2.05b/bash-2.05b.checksums rename to steps/bash-2.05b/bash-2.05b.checksums diff --git a/sysa/bash-2.05b/mk/builtins.mk b/steps/bash-2.05b/mk/builtins.mk similarity index 100% rename from sysa/bash-2.05b/mk/builtins.mk rename to steps/bash-2.05b/mk/builtins.mk diff --git a/sysa/bash-2.05b/mk/common.mk b/steps/bash-2.05b/mk/common.mk similarity index 100% rename from sysa/bash-2.05b/mk/common.mk rename to steps/bash-2.05b/mk/common.mk diff --git a/sysa/bash-2.05b/mk/main.mk b/steps/bash-2.05b/mk/main.mk similarity index 100% rename from sysa/bash-2.05b/mk/main.mk rename to steps/bash-2.05b/mk/main.mk diff --git a/sysa/bash-2.05b/bash-2.05b.kaem b/steps/bash-2.05b/pass1.kaem similarity index 100% rename from sysa/bash-2.05b/bash-2.05b.kaem rename to steps/bash-2.05b/pass1.kaem diff --git a/sysa/bash-2.05b/bash-2.05b.sh b/steps/bash-2.05b/pass2.sh similarity index 100% rename from sysa/bash-2.05b/bash-2.05b.sh rename to steps/bash-2.05b/pass2.sh diff --git a/sysa/bash-2.05b/patches/dev-tty.patch b/steps/bash-2.05b/patches/dev-tty.patch similarity index 100% rename from sysa/bash-2.05b/patches/dev-tty.patch rename to steps/bash-2.05b/patches/dev-tty.patch diff --git a/sysa/bash-2.05b/patches/extern.patch b/steps/bash-2.05b/patches/extern.patch similarity index 100% rename from sysa/bash-2.05b/patches/extern.patch rename to steps/bash-2.05b/patches/extern.patch diff --git a/sysa/bash-2.05b/patches/locale.patch b/steps/bash-2.05b/patches/locale.patch similarity index 100% rename from sysa/bash-2.05b/patches/locale.patch rename to steps/bash-2.05b/patches/locale.patch diff --git a/sysa/bash-2.05b/patches/mes-libc.patch b/steps/bash-2.05b/patches/mes-libc.patch similarity index 100% rename from sysa/bash-2.05b/patches/mes-libc.patch rename to steps/bash-2.05b/patches/mes-libc.patch diff --git a/sysa/bash-2.05b/patches/missing-defines.patch b/steps/bash-2.05b/patches/missing-defines.patch similarity index 100% rename from sysa/bash-2.05b/patches/missing-defines.patch rename to steps/bash-2.05b/patches/missing-defines.patch diff --git a/sysa/bash-2.05b/patches/size.patch b/steps/bash-2.05b/patches/size.patch similarity index 100% rename from sysa/bash-2.05b/patches/size.patch rename to steps/bash-2.05b/patches/size.patch diff --git a/sysa/bash-2.05b/patches/tinycc.patch b/steps/bash-2.05b/patches/tinycc.patch similarity index 100% rename from sysa/bash-2.05b/patches/tinycc.patch rename to steps/bash-2.05b/patches/tinycc.patch diff --git a/sysa/bash-2.05b/sources b/steps/bash-2.05b/sources similarity index 100% rename from sysa/bash-2.05b/sources rename to steps/bash-2.05b/sources diff --git a/sysc/bash-5.2.15/bash-5.2.15.sh b/steps/bash-5.2.15/pass1.sh similarity index 100% rename from sysc/bash-5.2.15/bash-5.2.15.sh rename to steps/bash-5.2.15/pass1.sh diff --git a/sysc/bash-5.2.15/sources b/steps/bash-5.2.15/sources similarity index 100% rename from sysc/bash-5.2.15/sources rename to steps/bash-5.2.15/sources diff --git a/sysa/bc-1.07.1/bc-1.07.1.sh b/steps/bc-1.07.1/pass1.sh similarity index 100% rename from sysa/bc-1.07.1/bc-1.07.1.sh rename to steps/bc-1.07.1/pass1.sh diff --git a/sysa/bc-1.07.1/sources b/steps/bc-1.07.1/sources similarity index 100% rename from sysa/bc-1.07.1/sources rename to steps/bc-1.07.1/sources diff --git a/sysa/binutils-2.30/binutils-2.30.sh b/steps/binutils-2.30/pass1.sh similarity index 100% rename from sysa/binutils-2.30/binutils-2.30.sh rename to steps/binutils-2.30/pass1.sh diff --git a/sysa/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch b/steps/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch similarity index 100% rename from sysa/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch rename to steps/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch diff --git a/sysa/binutils-2.30/patches/new-gettext.patch b/steps/binutils-2.30/patches/new-gettext.patch similarity index 100% rename from sysa/binutils-2.30/patches/new-gettext.patch rename to steps/binutils-2.30/patches/new-gettext.patch diff --git a/sysa/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch b/steps/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch similarity index 100% rename from sysa/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch rename to steps/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch diff --git a/sysa/binutils-2.30/sources b/steps/binutils-2.30/sources similarity index 100% rename from sysa/binutils-2.30/sources rename to steps/binutils-2.30/sources diff --git a/sysc/binutils-2.38/pass1.sh b/steps/binutils-2.38/pass1.sh similarity index 100% rename from sysc/binutils-2.38/pass1.sh rename to steps/binutils-2.38/pass1.sh diff --git a/sysc/binutils-2.38/pass2.sh b/steps/binutils-2.38/pass2.sh similarity index 100% rename from sysc/binutils-2.38/pass2.sh rename to steps/binutils-2.38/pass2.sh diff --git a/sysc/binutils-2.38/patches/libiberty-add-missing-config-directory-reference.patch b/steps/binutils-2.38/patches/libiberty-add-missing-config-directory-reference.patch similarity index 100% rename from sysc/binutils-2.38/patches/libiberty-add-missing-config-directory-reference.patch rename to steps/binutils-2.38/patches/libiberty-add-missing-config-directory-reference.patch diff --git a/sysc/binutils-2.38/patches/new-gettext.patch b/steps/binutils-2.38/patches/new-gettext.patch similarity index 100% rename from sysc/binutils-2.38/patches/new-gettext.patch rename to steps/binutils-2.38/patches/new-gettext.patch diff --git a/sysc/binutils-2.38/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch b/steps/binutils-2.38/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch similarity index 100% rename from sysc/binutils-2.38/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch rename to steps/binutils-2.38/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch diff --git a/sysc/binutils-2.38/sources b/steps/binutils-2.38/sources similarity index 100% rename from sysc/binutils-2.38/sources rename to steps/binutils-2.38/sources diff --git a/sysc/bison-2.3/import-gnulib.sh b/steps/bison-2.3/import-gnulib.sh similarity index 100% rename from sysc/bison-2.3/import-gnulib.sh rename to steps/bison-2.3/import-gnulib.sh diff --git a/sysc/bison-2.3/bison-2.3.sh b/steps/bison-2.3/pass1.sh similarity index 100% rename from sysc/bison-2.3/bison-2.3.sh rename to steps/bison-2.3/pass1.sh diff --git a/sysc/bison-2.3/patches/autover-mismatch.patch b/steps/bison-2.3/patches/autover-mismatch.patch similarity index 100% rename from sysc/bison-2.3/patches/autover-mismatch.patch rename to steps/bison-2.3/patches/autover-mismatch.patch diff --git a/sysc/bison-2.3/patches/fopen-safer.patch b/steps/bison-2.3/patches/fopen-safer.patch similarity index 100% rename from sysc/bison-2.3/patches/fopen-safer.patch rename to steps/bison-2.3/patches/fopen-safer.patch diff --git a/sysc/bison-2.3/patches/gnulib-fix.patch b/steps/bison-2.3/patches/gnulib-fix.patch similarity index 100% rename from sysc/bison-2.3/patches/gnulib-fix.patch rename to steps/bison-2.3/patches/gnulib-fix.patch diff --git a/sysc/bison-2.3/patches/our-bison.patch b/steps/bison-2.3/patches/our-bison.patch similarity index 100% rename from sysc/bison-2.3/patches/our-bison.patch rename to steps/bison-2.3/patches/our-bison.patch diff --git a/sysc/bison-2.3/sources b/steps/bison-2.3/sources similarity index 100% rename from sysc/bison-2.3/sources rename to steps/bison-2.3/sources diff --git a/sysa/bison-3.4.1/files/config.h b/steps/bison-3.4.1/files/config.h similarity index 100% rename from sysa/bison-3.4.1/files/config.h rename to steps/bison-3.4.1/files/config.h diff --git a/sysa/bison-3.4.1/files/configmake.h b/steps/bison-3.4.1/files/configmake.h similarity index 100% rename from sysa/bison-3.4.1/files/configmake.h rename to steps/bison-3.4.1/files/configmake.h diff --git a/sysa/bison-3.4.1/files/parse-gram.c b/steps/bison-3.4.1/files/parse-gram.c similarity index 100% rename from sysa/bison-3.4.1/files/parse-gram.c rename to steps/bison-3.4.1/files/parse-gram.c diff --git a/sysa/bison-3.4.1/files/parse-gram.h b/steps/bison-3.4.1/files/parse-gram.h similarity index 100% rename from sysa/bison-3.4.1/files/parse-gram.h rename to steps/bison-3.4.1/files/parse-gram.h diff --git a/sysa/bison-3.4.1/files/parse-gram.y b/steps/bison-3.4.1/files/parse-gram.y similarity index 100% rename from sysa/bison-3.4.1/files/parse-gram.y rename to steps/bison-3.4.1/files/parse-gram.y diff --git a/sysa/bison-3.4.1/mk/lib.mk b/steps/bison-3.4.1/mk/lib.mk similarity index 100% rename from sysa/bison-3.4.1/mk/lib.mk rename to steps/bison-3.4.1/mk/lib.mk diff --git a/sysa/bison-3.4.1/mk/main.mk b/steps/bison-3.4.1/mk/main.mk similarity index 100% rename from sysa/bison-3.4.1/mk/main.mk rename to steps/bison-3.4.1/mk/main.mk diff --git a/sysa/bison-3.4.1/mk/src.mk b/steps/bison-3.4.1/mk/src.mk similarity index 100% rename from sysa/bison-3.4.1/mk/src.mk rename to steps/bison-3.4.1/mk/src.mk diff --git a/sysa/bison-3.4.1/stage1.sh b/steps/bison-3.4.1/pass1.sh similarity index 100% rename from sysa/bison-3.4.1/stage1.sh rename to steps/bison-3.4.1/pass1.sh diff --git a/sysa/bison-3.4.1/stage2.sh b/steps/bison-3.4.1/pass2.sh similarity index 100% rename from sysa/bison-3.4.1/stage2.sh rename to steps/bison-3.4.1/pass2.sh diff --git a/sysa/bison-3.4.1/stage3.sh b/steps/bison-3.4.1/pass3.sh similarity index 100% rename from sysa/bison-3.4.1/stage3.sh rename to steps/bison-3.4.1/pass3.sh diff --git a/sysa/bison-3.4.1/patches/fseterr.patch b/steps/bison-3.4.1/patches/fseterr.patch similarity index 100% rename from sysa/bison-3.4.1/patches/fseterr.patch rename to steps/bison-3.4.1/patches/fseterr.patch diff --git a/sysa/bison-3.4.1/patches/missing-includes.patch b/steps/bison-3.4.1/patches/missing-includes.patch similarity index 100% rename from sysa/bison-3.4.1/patches/missing-includes.patch rename to steps/bison-3.4.1/patches/missing-includes.patch diff --git a/sysa/bison-3.4.1/sources b/steps/bison-3.4.1/sources similarity index 100% rename from sysa/bison-3.4.1/sources rename to steps/bison-3.4.1/sources diff --git a/sysc/bison-3.4.2/import-gnulib.sh b/steps/bison-3.4.2/import-gnulib.sh similarity index 100% rename from sysc/bison-3.4.2/import-gnulib.sh rename to steps/bison-3.4.2/import-gnulib.sh diff --git a/sysc/bison-3.4.2/bison-3.4.2.sh b/steps/bison-3.4.2/pass1.sh similarity index 100% rename from sysc/bison-3.4.2/bison-3.4.2.sh rename to steps/bison-3.4.2/pass1.sh diff --git a/sysc/bison-3.4.2/patches/gnulib-makefile.patch b/steps/bison-3.4.2/patches/gnulib-makefile.patch similarity index 100% rename from sysc/bison-3.4.2/patches/gnulib-makefile.patch rename to steps/bison-3.4.2/patches/gnulib-makefile.patch diff --git a/sysc/bison-3.4.2/patches/our-bison.patch b/steps/bison-3.4.2/patches/our-bison.patch similarity index 100% rename from sysc/bison-3.4.2/patches/our-bison.patch rename to steps/bison-3.4.2/patches/our-bison.patch diff --git a/sysc/bison-3.4.2/patches/po-files.patch b/steps/bison-3.4.2/patches/po-files.patch similarity index 100% rename from sysc/bison-3.4.2/patches/po-files.patch rename to steps/bison-3.4.2/patches/po-files.patch diff --git a/sysc/bison-3.4.2/sources b/steps/bison-3.4.2/sources similarity index 100% rename from sysc/bison-3.4.2/sources rename to steps/bison-3.4.2/sources diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.checksums b/steps/bzip2-1.0.8/bzip2-1.0.8.checksums similarity index 100% rename from sysa/bzip2-1.0.8/bzip2-1.0.8.checksums rename to steps/bzip2-1.0.8/bzip2-1.0.8.checksums diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem b/steps/bzip2-1.0.8/pass1.kaem similarity index 100% rename from sysa/bzip2-1.0.8/bzip2-1.0.8.kaem rename to steps/bzip2-1.0.8/pass1.kaem diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.sh b/steps/bzip2-1.0.8/pass2.sh similarity index 100% rename from sysa/bzip2-1.0.8/bzip2-1.0.8.sh rename to steps/bzip2-1.0.8/pass2.sh diff --git a/sysa/bzip2-1.0.8/patches/coreutils.patch b/steps/bzip2-1.0.8/patches/coreutils.patch similarity index 100% rename from sysa/bzip2-1.0.8/patches/coreutils.patch rename to steps/bzip2-1.0.8/patches/coreutils.patch diff --git a/sysa/bzip2-1.0.8/patches/mes-libc.patch b/steps/bzip2-1.0.8/patches/mes-libc.patch similarity index 100% rename from sysa/bzip2-1.0.8/patches/mes-libc.patch rename to steps/bzip2-1.0.8/patches/mes-libc.patch diff --git a/sysa/bzip2-1.0.8/sources b/steps/bzip2-1.0.8/sources similarity index 100% rename from sysa/bzip2-1.0.8/sources rename to steps/bzip2-1.0.8/sources diff --git a/sysc/ca-certificates-3.88.1/ca-certificates-3.88.1.sh b/steps/ca-certificates-3.88.1/pass1.sh similarity index 100% rename from sysc/ca-certificates-3.88.1/ca-certificates-3.88.1.sh rename to steps/ca-certificates-3.88.1/pass1.sh diff --git a/sysc/ca-certificates-3.88.1/sources b/steps/ca-certificates-3.88.1/sources similarity index 100% rename from sysc/ca-certificates-3.88.1/sources rename to steps/ca-certificates-3.88.1/sources diff --git a/sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.amd64.checksums b/steps/checksum-transcriber-1.0/checksum-transcriber-1.0.amd64.checksums similarity index 100% rename from sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.amd64.checksums rename to steps/checksum-transcriber-1.0/checksum-transcriber-1.0.amd64.checksums diff --git a/sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.riscv64.checksums b/steps/checksum-transcriber-1.0/checksum-transcriber-1.0.riscv64.checksums similarity index 100% rename from sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.riscv64.checksums rename to steps/checksum-transcriber-1.0/checksum-transcriber-1.0.riscv64.checksums diff --git a/sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.x86.checksums b/steps/checksum-transcriber-1.0/checksum-transcriber-1.0.x86.checksums similarity index 100% rename from sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.x86.checksums rename to steps/checksum-transcriber-1.0/checksum-transcriber-1.0.x86.checksums diff --git a/sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.kaem b/steps/checksum-transcriber-1.0/pass1.kaem similarity index 100% rename from sysa/checksum-transcriber-1.0/checksum-transcriber-1.0.kaem rename to steps/checksum-transcriber-1.0/pass1.kaem diff --git a/sysa/checksum-transcriber-1.0/src/checksum-transcriber.c b/steps/checksum-transcriber-1.0/src/checksum-transcriber.c similarity index 100% rename from sysa/checksum-transcriber-1.0/src/checksum-transcriber.c rename to steps/checksum-transcriber-1.0/src/checksum-transcriber.c diff --git a/sysa/coreutils-5.0/coreutils-5.0.checksums b/steps/coreutils-5.0/coreutils-5.0.checksums similarity index 100% rename from sysa/coreutils-5.0/coreutils-5.0.checksums rename to steps/coreutils-5.0/coreutils-5.0.checksums diff --git a/sysa/coreutils-5.0/mk/main.mk b/steps/coreutils-5.0/mk/main.mk similarity index 100% rename from sysa/coreutils-5.0/mk/main.mk rename to steps/coreutils-5.0/mk/main.mk diff --git a/sysa/coreutils-5.0/mk/pass2.mk b/steps/coreutils-5.0/mk/pass2.mk similarity index 100% rename from sysa/coreutils-5.0/mk/pass2.mk rename to steps/coreutils-5.0/mk/pass2.mk diff --git a/sysa/coreutils-5.0/coreutils-5.0.kaem b/steps/coreutils-5.0/pass1.kaem similarity index 100% rename from sysa/coreutils-5.0/coreutils-5.0.kaem rename to steps/coreutils-5.0/pass1.kaem diff --git a/sysa/coreutils-5.0/coreutils-5.0.sh b/steps/coreutils-5.0/pass2.sh similarity index 100% rename from sysa/coreutils-5.0/coreutils-5.0.sh rename to steps/coreutils-5.0/pass2.sh diff --git a/sysa/coreutils-5.0/patches-musl/touch-dereference.patch b/steps/coreutils-5.0/patches-pass2/touch-dereference.patch similarity index 100% rename from sysa/coreutils-5.0/patches-musl/touch-dereference.patch rename to steps/coreutils-5.0/patches-pass2/touch-dereference.patch diff --git a/sysa/coreutils-5.0/patches-musl/touch-getdate.patch b/steps/coreutils-5.0/patches-pass2/touch-getdate.patch similarity index 100% rename from sysa/coreutils-5.0/patches-musl/touch-getdate.patch rename to steps/coreutils-5.0/patches-pass2/touch-getdate.patch diff --git a/sysa/coreutils-5.0/patches/expr-strcmp.patch b/steps/coreutils-5.0/patches/expr-strcmp.patch similarity index 100% rename from sysa/coreutils-5.0/patches/expr-strcmp.patch rename to steps/coreutils-5.0/patches/expr-strcmp.patch diff --git a/sysa/coreutils-5.0/patches/ls-strcmp.patch b/steps/coreutils-5.0/patches/ls-strcmp.patch similarity index 100% rename from sysa/coreutils-5.0/patches/ls-strcmp.patch rename to steps/coreutils-5.0/patches/ls-strcmp.patch diff --git a/sysa/coreutils-5.0/patches/mbstate.patch b/steps/coreutils-5.0/patches/mbstate.patch similarity index 100% rename from sysa/coreutils-5.0/patches/mbstate.patch rename to steps/coreutils-5.0/patches/mbstate.patch diff --git a/sysa/coreutils-5.0/patches/modechange.patch b/steps/coreutils-5.0/patches/modechange.patch similarity index 100% rename from sysa/coreutils-5.0/patches/modechange.patch rename to steps/coreutils-5.0/patches/modechange.patch diff --git a/sysa/coreutils-5.0/patches/sort-locale.patch b/steps/coreutils-5.0/patches/sort-locale.patch similarity index 100% rename from sysa/coreutils-5.0/patches/sort-locale.patch rename to steps/coreutils-5.0/patches/sort-locale.patch diff --git a/sysa/coreutils-5.0/patches/tac-uint64.patch b/steps/coreutils-5.0/patches/tac-uint64.patch similarity index 100% rename from sysa/coreutils-5.0/patches/tac-uint64.patch rename to steps/coreutils-5.0/patches/tac-uint64.patch diff --git a/sysa/coreutils-5.0/patches/touch-dereference.patch b/steps/coreutils-5.0/patches/touch-dereference.patch similarity index 100% rename from sysa/coreutils-5.0/patches/touch-dereference.patch rename to steps/coreutils-5.0/patches/touch-dereference.patch diff --git a/sysa/coreutils-5.0/patches/touch-getdate.patch b/steps/coreutils-5.0/patches/touch-getdate.patch similarity index 100% rename from sysa/coreutils-5.0/patches/touch-getdate.patch rename to steps/coreutils-5.0/patches/touch-getdate.patch diff --git a/sysa/coreutils-5.0/patches/uniq-fopen.patch b/steps/coreutils-5.0/patches/uniq-fopen.patch similarity index 100% rename from sysa/coreutils-5.0/patches/uniq-fopen.patch rename to steps/coreutils-5.0/patches/uniq-fopen.patch diff --git a/sysa/coreutils-5.0/sources b/steps/coreutils-5.0/sources similarity index 100% rename from sysa/coreutils-5.0/sources rename to steps/coreutils-5.0/sources diff --git a/sysa/coreutils-6.10/mk/main.mk b/steps/coreutils-6.10/mk/main.mk similarity index 100% rename from sysa/coreutils-6.10/mk/main.mk rename to steps/coreutils-6.10/mk/main.mk diff --git a/sysa/coreutils-6.10/coreutils-6.10.sh b/steps/coreutils-6.10/pass1.sh similarity index 100% rename from sysa/coreutils-6.10/coreutils-6.10.sh rename to steps/coreutils-6.10/pass1.sh diff --git a/sysa/coreutils-6.10/sources b/steps/coreutils-6.10/sources similarity index 100% rename from sysa/coreutils-6.10/sources rename to steps/coreutils-6.10/sources diff --git a/sysc/coreutils-8.32/import-gnulib.sh b/steps/coreutils-8.32/import-gnulib.sh similarity index 100% rename from sysc/coreutils-8.32/import-gnulib.sh rename to steps/coreutils-8.32/import-gnulib.sh diff --git a/sysc/coreutils-8.32/coreutils-8.32.sh b/steps/coreutils-8.32/pass1.sh similarity index 100% rename from sysc/coreutils-8.32/coreutils-8.32.sh rename to steps/coreutils-8.32/pass1.sh diff --git a/sysc/coreutils-8.32/patches/force_to_use_nanosleep.patch b/steps/coreutils-8.32/patches/force_to_use_nanosleep.patch similarity index 100% rename from sysc/coreutils-8.32/patches/force_to_use_nanosleep.patch rename to steps/coreutils-8.32/patches/force_to_use_nanosleep.patch diff --git a/sysc/coreutils-8.32/patches/gperf_dependency.patch b/steps/coreutils-8.32/patches/gperf_dependency.patch similarity index 100% rename from sysc/coreutils-8.32/patches/gperf_dependency.patch rename to steps/coreutils-8.32/patches/gperf_dependency.patch diff --git a/sysc/coreutils-8.32/patches/remove_gettext.patch b/steps/coreutils-8.32/patches/remove_gettext.patch similarity index 100% rename from sysc/coreutils-8.32/patches/remove_gettext.patch rename to steps/coreutils-8.32/patches/remove_gettext.patch diff --git a/sysc/coreutils-8.32/sources b/steps/coreutils-8.32/sources similarity index 100% rename from sysc/coreutils-8.32/sources rename to steps/coreutils-8.32/sources diff --git a/sysc/curl-7.88.1/files/sinus.pl b/steps/curl-7.88.1/files/sinus.pl similarity index 100% rename from sysc/curl-7.88.1/files/sinus.pl rename to steps/curl-7.88.1/files/sinus.pl diff --git a/sysc/curl-7.88.1/pass1.sh b/steps/curl-7.88.1/pass1.sh similarity index 100% rename from sysc/curl-7.88.1/pass1.sh rename to steps/curl-7.88.1/pass1.sh diff --git a/sysc/curl-7.88.1/pass2.sh b/steps/curl-7.88.1/pass2.sh similarity index 100% rename from sysc/curl-7.88.1/pass2.sh rename to steps/curl-7.88.1/pass2.sh diff --git a/sysc/curl-7.88.1/patches/help.patch b/steps/curl-7.88.1/patches/help.patch similarity index 100% rename from sysc/curl-7.88.1/patches/help.patch rename to steps/curl-7.88.1/patches/help.patch diff --git a/sysc/curl-7.88.1/patches/timeless-mk-ca-bundle.patch b/steps/curl-7.88.1/patches/timeless-mk-ca-bundle.patch similarity index 100% rename from sysc/curl-7.88.1/patches/timeless-mk-ca-bundle.patch rename to steps/curl-7.88.1/patches/timeless-mk-ca-bundle.patch diff --git a/sysa/curl-7.88.1/sources b/steps/curl-7.88.1/sources similarity index 100% rename from sysa/curl-7.88.1/sources rename to steps/curl-7.88.1/sources diff --git a/sysa/dhcpcd-10.0.1/dhcpcd-10.0.1.sh b/steps/dhcpcd-10.0.1/pass1.sh similarity index 100% rename from sysa/dhcpcd-10.0.1/dhcpcd-10.0.1.sh rename to steps/dhcpcd-10.0.1/pass1.sh diff --git a/sysa/dhcpcd-10.0.1/patches/remove-ctassert.patch b/steps/dhcpcd-10.0.1/patches/remove-ctassert.patch similarity index 100% rename from sysa/dhcpcd-10.0.1/patches/remove-ctassert.patch rename to steps/dhcpcd-10.0.1/patches/remove-ctassert.patch diff --git a/sysa/dhcpcd-10.0.1/sources b/steps/dhcpcd-10.0.1/sources similarity index 100% rename from sysa/dhcpcd-10.0.1/sources rename to steps/dhcpcd-10.0.1/sources diff --git a/sysa/diffutils-2.7/mk/main.mk b/steps/diffutils-2.7/mk/main.mk similarity index 100% rename from sysa/diffutils-2.7/mk/main.mk rename to steps/diffutils-2.7/mk/main.mk diff --git a/sysa/diffutils-2.7/diffutils-2.7.sh b/steps/diffutils-2.7/pass1.sh similarity index 100% rename from sysa/diffutils-2.7/diffutils-2.7.sh rename to steps/diffutils-2.7/pass1.sh diff --git a/sysa/diffutils-2.7/sources b/steps/diffutils-2.7/sources similarity index 100% rename from sysa/diffutils-2.7/sources rename to steps/diffutils-2.7/sources diff --git a/sysc/dist-3.5-236/files/config.sh.in b/steps/dist-3.5-236/files/config.sh.in similarity index 100% rename from sysc/dist-3.5-236/files/config.sh.in rename to steps/dist-3.5-236/files/config.sh.in diff --git a/sysc/dist-3.5-236/files/revision.h b/steps/dist-3.5-236/files/revision.h similarity index 100% rename from sysc/dist-3.5-236/files/revision.h rename to steps/dist-3.5-236/files/revision.h diff --git a/sysc/dist-3.5-236/dist-3.5-236.sh b/steps/dist-3.5-236/pass1.sh similarity index 100% rename from sysc/dist-3.5-236/dist-3.5-236.sh rename to steps/dist-3.5-236/pass1.sh diff --git a/sysc/dist-3.5-236/patches/env.patch b/steps/dist-3.5-236/patches/env.patch similarity index 100% rename from sysc/dist-3.5-236/patches/env.patch rename to steps/dist-3.5-236/patches/env.patch diff --git a/sysc/dist-3.5-236/sources b/steps/dist-3.5-236/sources similarity index 100% rename from sysc/dist-3.5-236/sources rename to steps/dist-3.5-236/sources diff --git a/sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh b/steps/e2fsprogs-1.45.7/pass1.sh similarity index 100% rename from sysa/e2fsprogs-1.45.7/e2fsprogs-1.45.7.sh rename to steps/e2fsprogs-1.45.7/pass1.sh diff --git a/sysa/e2fsprogs-1.45.7/patches/gawk-fix.patch b/steps/e2fsprogs-1.45.7/patches/gawk-fix.patch similarity index 100% rename from sysa/e2fsprogs-1.45.7/patches/gawk-fix.patch rename to steps/e2fsprogs-1.45.7/patches/gawk-fix.patch diff --git a/sysa/e2fsprogs-1.45.7/patches/remove-intl.patch b/steps/e2fsprogs-1.45.7/patches/remove-intl.patch similarity index 100% rename from sysa/e2fsprogs-1.45.7/patches/remove-intl.patch rename to steps/e2fsprogs-1.45.7/patches/remove-intl.patch diff --git a/sysa/e2fsprogs-1.45.7/sources b/steps/e2fsprogs-1.45.7/sources similarity index 100% rename from sysa/e2fsprogs-1.45.7/sources rename to steps/e2fsprogs-1.45.7/sources diff --git a/sysa/ed-1.4/ed-1.4.sh b/steps/ed-1.4/pass1.sh similarity index 100% rename from sysa/ed-1.4/ed-1.4.sh rename to steps/ed-1.4/pass1.sh diff --git a/sysa/ed-1.4/sources b/steps/ed-1.4/sources similarity index 100% rename from sysa/ed-1.4/sources rename to steps/ed-1.4/sources diff --git a/steps/env b/steps/env new file mode 100644 index 0000000..0dca1f9 --- /dev/null +++ b/steps/env @@ -0,0 +1,8 @@ +DISTFILES=/distfiles +PREFIX=/usr +BINDIR=${PREFIX}/bin +LIBDIR=${PREFIX}/lib/mes +INCDIR=${PREFIX}/include/mes +SRCDIR=/steps +TMPDIR=/tmp +PATH=${BINDIR}:/${ARCH}/bin diff --git a/sysc/file-5.44/file-5.44.sh b/steps/file-5.44/pass1.sh similarity index 100% rename from sysc/file-5.44/file-5.44.sh rename to steps/file-5.44/pass1.sh diff --git a/sysc/file-5.44/sources b/steps/file-5.44/sources similarity index 100% rename from sysc/file-5.44/sources rename to steps/file-5.44/sources diff --git a/sysa/findutils-4.2.33/import-gnulib.sh b/steps/findutils-4.2.33/import-gnulib.sh similarity index 100% rename from sysa/findutils-4.2.33/import-gnulib.sh rename to steps/findutils-4.2.33/import-gnulib.sh diff --git a/sysa/findutils-4.2.33/findutils-4.2.33.sh b/steps/findutils-4.2.33/pass1.sh similarity index 100% rename from sysa/findutils-4.2.33/findutils-4.2.33.sh rename to steps/findutils-4.2.33/pass1.sh diff --git a/sysa/findutils-4.2.33/patches/force-getcwd-fallback.patch b/steps/findutils-4.2.33/patches/force-getcwd-fallback.patch similarity index 100% rename from sysa/findutils-4.2.33/patches/force-getcwd-fallback.patch rename to steps/findutils-4.2.33/patches/force-getcwd-fallback.patch diff --git a/sysa/findutils-4.2.33/sources b/steps/findutils-4.2.33/sources similarity index 100% rename from sysa/findutils-4.2.33/sources rename to steps/findutils-4.2.33/sources diff --git a/sysa/fiwix-1.4.0-lb3/fiwix-1.4.0-lb3.checksums b/steps/fiwix-1.4.0-lb3/fiwix-1.4.0-lb3.checksums similarity index 100% rename from sysa/fiwix-1.4.0-lb3/fiwix-1.4.0-lb3.checksums rename to steps/fiwix-1.4.0-lb3/fiwix-1.4.0-lb3.checksums diff --git a/sysa/fiwix-1.4.0-lb3/fiwix-1.4.0-lb3.kaem b/steps/fiwix-1.4.0-lb3/pass1.kaem similarity index 100% rename from sysa/fiwix-1.4.0-lb3/fiwix-1.4.0-lb3.kaem rename to steps/fiwix-1.4.0-lb3/pass1.kaem diff --git a/sysa/fiwix-1.4.0-lb3/sources b/steps/fiwix-1.4.0-lb3/sources similarity index 100% rename from sysa/fiwix-1.4.0-lb3/sources rename to steps/fiwix-1.4.0-lb3/sources diff --git a/sysa/flex-2.5.11/files/scan.lex.l b/steps/flex-2.5.11/files/scan.lex.l similarity index 100% rename from sysa/flex-2.5.11/files/scan.lex.l rename to steps/flex-2.5.11/files/scan.lex.l diff --git a/sysa/flex-2.5.11/mk/main.mk b/steps/flex-2.5.11/mk/main.mk similarity index 100% rename from sysa/flex-2.5.11/mk/main.mk rename to steps/flex-2.5.11/mk/main.mk diff --git a/sysa/flex-2.5.11/flex-2.5.11.sh b/steps/flex-2.5.11/pass1.sh similarity index 100% rename from sysa/flex-2.5.11/flex-2.5.11.sh rename to steps/flex-2.5.11/pass1.sh diff --git a/sysa/flex-2.5.11/patches/scan_l.patch b/steps/flex-2.5.11/patches/scan_l.patch similarity index 100% rename from sysa/flex-2.5.11/patches/scan_l.patch rename to steps/flex-2.5.11/patches/scan_l.patch diff --git a/sysa/flex-2.5.11/patches/yyin.patch b/steps/flex-2.5.11/patches/yyin.patch similarity index 100% rename from sysa/flex-2.5.11/patches/yyin.patch rename to steps/flex-2.5.11/patches/yyin.patch diff --git a/sysa/flex-2.5.11/sources b/steps/flex-2.5.11/sources similarity index 100% rename from sysa/flex-2.5.11/sources rename to steps/flex-2.5.11/sources diff --git a/sysc/flex-2.5.33/flex-2.5.33.sh b/steps/flex-2.5.33/pass1.sh similarity index 100% rename from sysc/flex-2.5.33/flex-2.5.33.sh rename to steps/flex-2.5.33/pass1.sh diff --git a/sysc/flex-2.5.33/sources b/steps/flex-2.5.33/sources similarity index 100% rename from sysc/flex-2.5.33/sources rename to steps/flex-2.5.33/sources diff --git a/sysa/flex-2.6.4/mk/main.mk b/steps/flex-2.6.4/mk/main.mk similarity index 100% rename from sysa/flex-2.6.4/mk/main.mk rename to steps/flex-2.6.4/mk/main.mk diff --git a/sysa/flex-2.6.4/flex-2.6.4.sh b/steps/flex-2.6.4/pass1.sh similarity index 100% rename from sysa/flex-2.6.4/flex-2.6.4.sh rename to steps/flex-2.6.4/pass1.sh diff --git a/sysa/flex-2.6.4/sources b/steps/flex-2.6.4/sources similarity index 100% rename from sysa/flex-2.6.4/sources rename to steps/flex-2.6.4/sources diff --git a/sysa/gawk-3.0.4/mk/main.mk b/steps/gawk-3.0.4/mk/main.mk similarity index 100% rename from sysa/gawk-3.0.4/mk/main.mk rename to steps/gawk-3.0.4/mk/main.mk diff --git a/sysa/gawk-3.0.4/gawk-3.0.4.sh b/steps/gawk-3.0.4/pass1.sh similarity index 100% rename from sysa/gawk-3.0.4/gawk-3.0.4.sh rename to steps/gawk-3.0.4/pass1.sh diff --git a/sysa/gawk-3.0.4/sources b/steps/gawk-3.0.4/sources similarity index 100% rename from sysa/gawk-3.0.4/sources rename to steps/gawk-3.0.4/sources diff --git a/sysc/gc-8.0.4/gc-8.0.4.sh b/steps/gc-8.0.4/pass1.sh similarity index 100% rename from sysc/gc-8.0.4/gc-8.0.4.sh rename to steps/gc-8.0.4/pass1.sh diff --git a/sysc/gc-8.0.4/sources b/steps/gc-8.0.4/sources similarity index 100% rename from sysc/gc-8.0.4/sources rename to steps/gc-8.0.4/sources diff --git a/sysc/gcc-10.4.0/gcc-10.4.0.sh b/steps/gcc-10.4.0/pass1.sh similarity index 100% rename from sysc/gcc-10.4.0/gcc-10.4.0.sh rename to steps/gcc-10.4.0/pass1.sh diff --git a/sysc/gcc-10.4.0/patches/fix-autoreconf.patch b/steps/gcc-10.4.0/patches/fix-autoreconf.patch similarity index 100% rename from sysc/gcc-10.4.0/patches/fix-autoreconf.patch rename to steps/gcc-10.4.0/patches/fix-autoreconf.patch diff --git a/sysc/gcc-10.4.0/patches/includes.patch b/steps/gcc-10.4.0/patches/includes.patch similarity index 100% rename from sysc/gcc-10.4.0/patches/includes.patch rename to steps/gcc-10.4.0/patches/includes.patch diff --git a/sysc/gcc-10.4.0/patches/libgcc-xfmode.patch b/steps/gcc-10.4.0/patches/libgcc-xfmode.patch similarity index 100% rename from sysc/gcc-10.4.0/patches/libgcc-xfmode.patch rename to steps/gcc-10.4.0/patches/libgcc-xfmode.patch diff --git a/sysc/gcc-10.4.0/patches/new-gettext.patch b/steps/gcc-10.4.0/patches/new-gettext.patch similarity index 100% rename from sysc/gcc-10.4.0/patches/new-gettext.patch rename to steps/gcc-10.4.0/patches/new-gettext.patch diff --git a/sysc/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch b/steps/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch similarity index 100% rename from sysc/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch rename to steps/gcc-10.4.0/patches/no-isolate-erroneous-paths-dereference.patch diff --git a/sysc/gcc-10.4.0/sources b/steps/gcc-10.4.0/sources similarity index 100% rename from sysc/gcc-10.4.0/sources rename to steps/gcc-10.4.0/sources diff --git a/sysc/gcc-13.1.0/gcc-13.1.0.sh b/steps/gcc-13.1.0/pass1.sh similarity index 100% rename from sysc/gcc-13.1.0/gcc-13.1.0.sh rename to steps/gcc-13.1.0/pass1.sh diff --git a/sysc/gcc-13.1.0/patches/new-gettext.patch b/steps/gcc-13.1.0/patches/new-gettext.patch similarity index 100% rename from sysc/gcc-13.1.0/patches/new-gettext.patch rename to steps/gcc-13.1.0/patches/new-gettext.patch diff --git a/sysc/gcc-13.1.0/sources b/steps/gcc-13.1.0/sources similarity index 100% rename from sysc/gcc-13.1.0/sources rename to steps/gcc-13.1.0/sources diff --git a/sysa/gcc-4.0.4/pass1.sh b/steps/gcc-4.0.4/pass1.sh similarity index 100% rename from sysa/gcc-4.0.4/pass1.sh rename to steps/gcc-4.0.4/pass1.sh diff --git a/sysa/gcc-4.0.4/pass2.sh b/steps/gcc-4.0.4/pass2.sh similarity index 100% rename from sysa/gcc-4.0.4/pass2.sh rename to steps/gcc-4.0.4/pass2.sh diff --git a/sysa/gcc-4.0.4/sources b/steps/gcc-4.0.4/sources similarity index 100% rename from sysa/gcc-4.0.4/sources rename to steps/gcc-4.0.4/sources diff --git a/sysc/gcc-4.7.4/gcc-4.7.4.sh b/steps/gcc-4.7.4/pass1.sh similarity index 100% rename from sysc/gcc-4.7.4/gcc-4.7.4.sh rename to steps/gcc-4.7.4/pass1.sh diff --git a/sysc/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch b/steps/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch rename to steps/gcc-4.7.4/patches/0001-libitm-fixes-for-musl-support.patch diff --git a/sysc/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch b/steps/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch rename to steps/gcc-4.7.4/patches/0002-fixincludes-update-for-musl-support.patch diff --git a/sysc/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch b/steps/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch rename to steps/gcc-4.7.4/patches/0003-unwind-fix-for-musl.patch diff --git a/sysc/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch b/steps/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch rename to steps/gcc-4.7.4/patches/0004-libstdc-gthr-workaround-for-musl.patch diff --git a/sysc/gcc-4.7.4/patches/0005-musl-libc-config.patch b/steps/gcc-4.7.4/patches/0005-musl-libc-config.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0005-musl-libc-config.patch rename to steps/gcc-4.7.4/patches/0005-musl-libc-config.patch diff --git a/sysc/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch b/steps/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch rename to steps/gcc-4.7.4/patches/0006-add-musl-support-to-gcc.patch diff --git a/sysc/gcc-4.7.4/patches/0007-x86-musl-support.patch b/steps/gcc-4.7.4/patches/0007-x86-musl-support.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0007-x86-musl-support.patch rename to steps/gcc-4.7.4/patches/0007-x86-musl-support.patch diff --git a/sysc/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch b/steps/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch rename to steps/gcc-4.7.4/patches/0008-config-linux.h-add-INCLUDE_DEFAULTS_MUSL_LOCAL.patch diff --git a/sysc/gcc-4.7.4/patches/gcc-10-fself-test.patch b/steps/gcc-4.7.4/patches/gcc-10-fself-test.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/gcc-10-fself-test.patch rename to steps/gcc-4.7.4/patches/gcc-10-fself-test.patch diff --git a/sysc/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch b/steps/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch rename to steps/gcc-4.7.4/patches/gcc-10-libgcc-builtin-macros.patch diff --git a/sysc/gcc-4.7.4/patches/gcc-10-mlong-double.patch b/steps/gcc-4.7.4/patches/gcc-10-mlong-double.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/gcc-10-mlong-double.patch rename to steps/gcc-4.7.4/patches/gcc-10-mlong-double.patch diff --git a/sysc/gcc-4.7.4/patches/remove_gperf_dependency.patch b/steps/gcc-4.7.4/patches/remove_gperf_dependency.patch similarity index 100% rename from sysc/gcc-4.7.4/patches/remove_gperf_dependency.patch rename to steps/gcc-4.7.4/patches/remove_gperf_dependency.patch diff --git a/sysc/gcc-4.7.4/sources b/steps/gcc-4.7.4/sources similarity index 100% rename from sysc/gcc-4.7.4/sources rename to steps/gcc-4.7.4/sources diff --git a/sysc/gettext-0.21/gettext-0.21.sh b/steps/gettext-0.21/pass1.sh similarity index 100% rename from sysc/gettext-0.21/gettext-0.21.sh rename to steps/gettext-0.21/pass1.sh diff --git a/sysc/gettext-0.21/sources b/steps/gettext-0.21/sources similarity index 100% rename from sysc/gettext-0.21/sources rename to steps/gettext-0.21/sources diff --git a/sysc/gmp-6.2.1/gmp-6.2.1.sh b/steps/gmp-6.2.1/pass1.sh similarity index 100% rename from sysc/gmp-6.2.1/gmp-6.2.1.sh rename to steps/gmp-6.2.1/pass1.sh diff --git a/sysc/gmp-6.2.1/sources b/steps/gmp-6.2.1/sources similarity index 100% rename from sysc/gmp-6.2.1/sources rename to steps/gmp-6.2.1/sources diff --git a/sysc/gperf-3.1/gperf-3.1.sh b/steps/gperf-3.1/pass1.sh similarity index 100% rename from sysc/gperf-3.1/gperf-3.1.sh rename to steps/gperf-3.1/pass1.sh diff --git a/sysc/gperf-3.1/sources b/steps/gperf-3.1/sources similarity index 100% rename from sysc/gperf-3.1/sources rename to steps/gperf-3.1/sources diff --git a/sysa/grep-2.4/mk/main.mk b/steps/grep-2.4/mk/main.mk similarity index 100% rename from sysa/grep-2.4/mk/main.mk rename to steps/grep-2.4/mk/main.mk diff --git a/sysa/grep-2.4/sources b/steps/grep-2.4/sources similarity index 100% rename from sysa/grep-2.4/sources rename to steps/grep-2.4/sources diff --git a/sysc/grep-3.7/import-gnulib.sh b/steps/grep-3.7/import-gnulib.sh similarity index 100% rename from sysc/grep-3.7/import-gnulib.sh rename to steps/grep-3.7/import-gnulib.sh diff --git a/sysc/grep-3.7/grep-3.7.sh b/steps/grep-3.7/pass1.sh similarity index 100% rename from sysc/grep-3.7/grep-3.7.sh rename to steps/grep-3.7/pass1.sh diff --git a/sysc/grep-3.7/sources b/steps/grep-3.7/sources similarity index 100% rename from sysc/grep-3.7/sources rename to steps/grep-3.7/sources diff --git a/sysc/guile-3.0.9/import-gnulib-3.0.7.sh b/steps/guile-3.0.9/import-gnulib-3.0.7.sh similarity index 100% rename from sysc/guile-3.0.9/import-gnulib-3.0.7.sh rename to steps/guile-3.0.9/import-gnulib-3.0.7.sh diff --git a/sysc/guile-3.0.9/import-gnulib.sh b/steps/guile-3.0.9/import-gnulib.sh similarity index 100% rename from sysc/guile-3.0.9/import-gnulib.sh rename to steps/guile-3.0.9/import-gnulib.sh diff --git a/sysc/guile-3.0.9/guile-3.0.9.sh b/steps/guile-3.0.9/pass1.sh similarity index 100% rename from sysc/guile-3.0.9/guile-3.0.9.sh rename to steps/guile-3.0.9/pass1.sh diff --git a/sysc/guile-3.0.9/sources b/steps/guile-3.0.9/sources similarity index 100% rename from sysc/guile-3.0.9/sources rename to steps/guile-3.0.9/sources diff --git a/sysa/gzip-1.2.4/files/stat_override.c b/steps/gzip-1.2.4/files/stat_override.c similarity index 100% rename from sysa/gzip-1.2.4/files/stat_override.c rename to steps/gzip-1.2.4/files/stat_override.c diff --git a/sysa/gzip-1.2.4/gzip-1.2.4.checksums b/steps/gzip-1.2.4/gzip-1.2.4.checksums similarity index 100% rename from sysa/gzip-1.2.4/gzip-1.2.4.checksums rename to steps/gzip-1.2.4/gzip-1.2.4.checksums diff --git a/sysa/gzip-1.2.4/mk/main.mk b/steps/gzip-1.2.4/mk/main.mk similarity index 100% rename from sysa/gzip-1.2.4/mk/main.mk rename to steps/gzip-1.2.4/mk/main.mk diff --git a/sysa/gzip-1.2.4/gzip-1.2.4.kaem b/steps/gzip-1.2.4/pass1.kaem similarity index 100% rename from sysa/gzip-1.2.4/gzip-1.2.4.kaem rename to steps/gzip-1.2.4/pass1.kaem diff --git a/sysa/gzip-1.2.4/patches/makecrc-write-to-file.patch b/steps/gzip-1.2.4/patches/makecrc-write-to-file.patch similarity index 100% rename from sysa/gzip-1.2.4/patches/makecrc-write-to-file.patch rename to steps/gzip-1.2.4/patches/makecrc-write-to-file.patch diff --git a/sysa/gzip-1.2.4/patches/removecrc.patch b/steps/gzip-1.2.4/patches/removecrc.patch similarity index 100% rename from sysa/gzip-1.2.4/patches/removecrc.patch rename to steps/gzip-1.2.4/patches/removecrc.patch diff --git a/sysa/gzip-1.2.4/sources b/steps/gzip-1.2.4/sources similarity index 100% rename from sysa/gzip-1.2.4/sources rename to steps/gzip-1.2.4/sources diff --git a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums b/steps/heirloom-devtools-070527/heirloom-devtools-070527.checksums similarity index 100% rename from sysa/heirloom-devtools-070527/heirloom-devtools-070527.checksums rename to steps/heirloom-devtools-070527/heirloom-devtools-070527.checksums diff --git a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem b/steps/heirloom-devtools-070527/pass1.kaem similarity index 100% rename from sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem rename to steps/heirloom-devtools-070527/pass1.kaem diff --git a/sysa/heirloom-devtools-070527/patches/lex_remove_wchar.patch b/steps/heirloom-devtools-070527/patches/lex_remove_wchar.patch similarity index 100% rename from sysa/heirloom-devtools-070527/patches/lex_remove_wchar.patch rename to steps/heirloom-devtools-070527/patches/lex_remove_wchar.patch diff --git a/sysa/heirloom-devtools-070527/patches/yacc_remove_wchar.patch b/steps/heirloom-devtools-070527/patches/yacc_remove_wchar.patch similarity index 100% rename from sysa/heirloom-devtools-070527/patches/yacc_remove_wchar.patch rename to steps/heirloom-devtools-070527/patches/yacc_remove_wchar.patch diff --git a/sysa/heirloom-devtools-070527/sources b/steps/heirloom-devtools-070527/sources similarity index 100% rename from sysa/heirloom-devtools-070527/sources rename to steps/heirloom-devtools-070527/sources diff --git a/sysa/help2man-1.36.4/help2man-1.36.4.sh b/steps/help2man-1.36.4/pass1.sh similarity index 100% rename from sysa/help2man-1.36.4/help2man-1.36.4.sh rename to steps/help2man-1.36.4/pass1.sh diff --git a/sysa/help2man-1.36.4/patches/date.patch b/steps/help2man-1.36.4/patches/date.patch similarity index 100% rename from sysa/help2man-1.36.4/patches/date.patch rename to steps/help2man-1.36.4/patches/date.patch diff --git a/sysa/help2man-1.36.4/sources b/steps/help2man-1.36.4/sources similarity index 100% rename from sysa/help2man-1.36.4/sources rename to steps/help2man-1.36.4/sources diff --git a/sysa/helpers.sh b/steps/helpers.sh similarity index 80% rename from sysa/helpers.sh rename to steps/helpers.sh index b80e205..f12b0ca 100755 --- a/sysa/helpers.sh +++ b/steps/helpers.sh @@ -7,9 +7,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -# shellcheck source=/dev/null -. "${SOURCES}/bootstrap.cfg" - # Get a list of files get_files() { echo "." @@ -82,7 +79,7 @@ _grep() { get_revision() { local pkg=$1 - cd "${SRCDIR}/repo" + cd "/external/repo" # Get revision (n time this package has been built) revision=$( (ls -1 "${pkg}"* 2>/dev/null || true) | wc -l | sed 's/ *//g') } @@ -90,25 +87,21 @@ get_revision() { # Installs binary packages from an earlier run # This is useful to speed up development cycle bin_preseed() { - if [ -d "${SRCDIR}/repo-preseeded" ]; then + if [ -d "/external/repo-preseeded" ]; then get_revision "${pkg}" - cd "${SRCDIR}/repo-preseeded" + cd "/external/repo-preseeded" if [ "${UPDATE_CHECKSUMS}" = "True" ] || src_checksum "${pkg}" $((revision)); then echo "${pkg}: installing prebuilt package." - mv "${pkg}_${revision}"* ../repo || return 1 + mv "${pkg}_${revision}"* /external/repo || return 1 if [[ "${pkg}" == bash-* ]]; then # tar does not like overwriting running bash # shellcheck disable=SC2153 rm -f "${PREFIX}/bin/bash" "${PREFIX}/bin/sh" fi - # shellcheck disable=SC2144 - if [ -f *-repodata ]; then - mv -- *-repodata ../repo - fi - cd "${SRCDIR}/repo" + cd "/external/repo" rm -f /tmp/filelist.txt src_apply "${pkg}" $((revision)) - cd "${SOURCES}" + cd "${SRCDIR}" return 0 fi fi @@ -118,23 +111,26 @@ bin_preseed() { # Common build steps # Build function provides a few common stages with default implementation # that can be overridden on per package basis in the build script. -# build takes three arguments: +# build takes two arguments: # 1) name-version of the package # 2) optionally specify build script. Default is name-version.sh -# 3) directory of patches. Default is patches -# 4) directory to cd into. Default is ${pkg} +# 3) optionally specify directory to cd into build() { pkg=$1 script_name=${2:-${pkg}.sh} - dirname=${4:-${pkg}} + dirname=${3:-${pkg}} # shellcheck disable=SC2015 bin_preseed && return || true # Normal build if preseed fails - cd "${SOURCES}/${pkg}" || (echo "Cannot cd into ${pkg}!"; kill $$) + cd "${SRCDIR}/${pkg}" || (echo "Cannot cd into ${pkg}!"; kill $$) echo "${pkg}: beginning build using script ${script_name}" base_dir="${PWD}" - patch_dir="${base_dir}/${3:-patches}" + if [ -e "${base_dir}/patches-$(basename "${script_name}" .sh)" ]; then + patch_dir="${base_dir}/patches-$(basename "${script_name}" .sh)" + else + patch_dir="${base_dir}/patches" + fi mk_dir="${base_dir}/mk" files_dir="${base_dir}/files" @@ -187,7 +183,7 @@ build() { src_checksum "${pkg}" "${revision}" echo "${pkg}: cleaning up." - rm -rf "${SOURCES}/${pkg}/build" + rm -rf "${SRCDIR}/${pkg}/build" rm -rf "${DESTDIR}" mkdir -p "${DESTDIR}" @@ -196,7 +192,7 @@ build() { echo "${pkg}: build successful" - cd "${SOURCES}" + cd "${SRCDIR}" unset -f src_unpack src_prepare src_configure src_compile src_install src_postprocess unset extract @@ -209,7 +205,7 @@ interpret_source_line() { # Default to basename of url if not given fname="${fname:-$(basename "${url}")}" if ! [ -e "${fname}" ]; then - curl --fail --location "${url}" --output "${fname}" + curl --fail --retry 5 --location "${url}" --output "${fname}" fi echo "${checksum} ${fname}" > "${fname}.sum" sha256sum -c "${fname}.sum" @@ -293,10 +289,12 @@ default_src_unpack() { # Then it copies our custom makefile and any other custom files from files directory. default_src_prepare() { if test -d "${patch_dir}"; then - for p in "${patch_dir}"/*.patch; do - echo "Applying patch: ${p}" - patch -Np0 < "${p}" - done + if ls "${patch_dir}"/*.patch 2>&1 >/dev/null; then + for p in "${patch_dir}"/*.patch; do + echo "Applying patch: ${p}" + patch -Np0 < "${p}" + done + fi fi makefile="${mk_dir}/main.mk" @@ -351,10 +349,10 @@ src_pkg() { reset_timestamp local tar_basename="${pkg}_${revision}.tar" - local dest_tar="/usr/src/repo/${tar_basename}" + local dest_tar="/external/repo/${tar_basename}" local filelist=/tmp/filelist.txt - cd /usr/src/repo + cd /external/repo # If grep is unavailable, then tar --sort is unavailable. # So this does not need a command -v grep. if tar --help | grep ' \-\-sort' >/dev/null 2>&1; then @@ -388,7 +386,7 @@ src_checksum() { if ! [ "$UPDATE_CHECKSUMS" = True ] ; then # We avoid using pipes as that is not supported by initial sha256sum from mescc-tools-extra local checksum_file=/tmp/checksum - _grep "${pkg}_${revision}" "${SOURCES}/SHA256SUMS.pkgs" > "${checksum_file}" || true + _grep "${pkg}_${revision}" "${SRCDIR}/SHA256SUMS.pkgs" > "${checksum_file}" || true # Check there is something in checksum_file if ! [ -s "${checksum_file}" ]; then echo "${pkg}: no checksum stored!" @@ -426,7 +424,7 @@ src_apply() { mv "${PREFIX}/bin/bzip2" "/tmp/bzip2" BZIP2_PREFIX="/tmp/" fi - "${BZIP2_PREFIX}bzip2" -dc "/usr/src/repo/${pkg}_${revision}.tar.bz2" | \ + "${BZIP2_PREFIX}bzip2" -dc "/external/repo/${pkg}_${revision}.tar.bz2" | \ "${TAR_PREFIX}tar" -C / -xpf - rm -f "/tmp/bzip2" "/tmp/tar" } @@ -449,57 +447,3 @@ call() { default() { "default_${build_stage}" } - -# Set modified dates of all files to be 0 unix time. -# Should be called at the end of bootstrapping process. -# This function needs `touch` that supports --no-dereference -# (at least coreutils 8.1). -canonicalise_all_files_timestamp() { - find / -xdev -exec touch --no-dereference -t 197001010000.00 {} + -} - -populate_device_nodes() { - # http://www.linuxfromscratch.org/lfs/view/6.1/chapter06/devices.html - mkdir -p "/dev" - test -c "/dev/null" || (rm -f "/dev/null" && - mknod -m 666 "/dev/null" c 1 3) - test -c "/dev/zero" || mknod -m 666 "/dev/zero" c 1 5 - test -c "/dev/random" || mknod -m 444 "/dev/random" c 1 8 - test -c "/dev/urandom" || mknod -m 444 "/dev/urandom" c 1 9 - - test -c "/dev/ptmx" || mknod -m 666 "/dev/ptmx" c 5 2 - test -c "/dev/tty" || mknod -m 666 "/dev/tty" c 5 0 - - if command -v mount >/dev/null 2>&1; then - test -d "/dev/shm" || (mkdir /dev/shm && mount -t tmpfs tmpfs /dev/shm) - fi - - if [ "${CHROOT}" = False ]; then - test -c "/dev/console" || mknod -m 666 "/dev/console" c 5 1 - fi -} - -sys_transfer() { - local dest=$1 - local sys_sources=$2 - - mkdir -p "${dest}/${PREFIX}/bin" "${dest}/${PREFIX}/src" - - # Bash, Tar and Bzip2 are required to install packages - cp "${PREFIX}/bin/bash" "${PREFIX}/bin/tar" "${PREFIX}/bin/bzip2" "${dest}${PREFIX}/bin/" - - # Transfer misc files - cp "${SOURCES}/helpers.sh" "${SOURCES}/SHA256SUMS.pkgs" "${SOURCES}/bootstrap.cfg" "${dest}/${PREFIX}/src" - - cp -r "${sys_sources}/"* "${dest}/${PREFIX}/src" - cp -f "${sys_sources}/init" "${dest}/" - cp -r "${PREFIX}/src/repo" "${dest}/${PREFIX}/src" - if [ -e "${PREFIX}/src/repo-preseeded" ]; then - cp -r "${PREFIX}/src/repo-preseeded" "${dest}/${PREFIX}/src" - fi - - shift 2 - # Copy additional binaries - set -- "${@/#/${PREFIX}/bin/}" - cp "$@" "${dest}${PREFIX}/bin/" -} diff --git a/steps/improve/clean_ram.sh b/steps/improve/clean_ram.sh new file mode 100755 index 0000000..2ef85cc --- /dev/null +++ b/steps/improve/clean_ram.sh @@ -0,0 +1,11 @@ +# Save because linux deletes all distfiles to save space +cp "${DISTFILES}"/musl-1.2.4.tar.gz /tmp +cp "${DISTFILES}"/curl-7.88.1.tar.bz2 /tmp + +# Clear up some RAM space +grep --no-filename '^build' "${SOURCES}"/run*.sh | grep -v musl-1.2.4 | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do + rm -rf "${SOURCES:?}/${p:?}" +done + +mv /tmp/musl-1.2.4.tar.gz "${DISTFILES}" +mv /tmp/curl-7.88.1.tar.bz2 "${DISTFILES}" diff --git a/steps/improve/finalize_fhs.sh b/steps/improve/finalize_fhs.sh new file mode 100755 index 0000000..2943637 --- /dev/null +++ b/steps/improve/finalize_fhs.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Add the rest of the FHS that we will use and is not created pre-boot +rm -rf /sbin /usr/sbin +for d in bin lib sbin; do + ln -s "usr/${d}" "/${d}" +done +mkdir -p /etc /run /var +test -d /proc || (mkdir /proc && mount -t proc proc /proc) +test -d /sys || (mkdir /sys && mount -t sysfs sysfs /sys) +# Make /tmp a ramdisk (speeds up configure etc significantly) +test -d /tmp || (mkdir /tmp && mount -t tmpfs tmpfs /tmp) +# Add /etc/resolv.conf +echo 'nameserver 1.1.1.1' > /etc/resolv.conf diff --git a/steps/improve/get_network.sh b/steps/improve/get_network.sh new file mode 100755 index 0000000..14efa25 --- /dev/null +++ b/steps/improve/get_network.sh @@ -0,0 +1,13 @@ +#!/bin/sh +dhcpcd --waitip=4 +# Ensure network accessible +timeout=120 +while ! curl example.com >/dev/null 2>&1; do + sleep 1 + # shellcheck disable=SC2219 + let timeout-- + if [ "${timeout}" -le 0 ]; then + echo "Timeout reached for internet to become accessible" + false + fi +done diff --git a/steps/improve/musl_libdir.sh b/steps/improve/musl_libdir.sh new file mode 100755 index 0000000..94a8138 --- /dev/null +++ b/steps/improve/musl_libdir.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +sed -i "/^LIBDIR/d" /steps/env +LIBDIR=${PREFIX}/lib/i386-unknown-linux-musl +echo "LIBDIR=${LIBDIR}" >> /steps/env diff --git a/steps/improve/null_time.sh b/steps/improve/null_time.sh new file mode 100755 index 0000000..1f76394 --- /dev/null +++ b/steps/improve/null_time.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# Set modified dates of all files to be 0 unix time. +# This function needs `touch` that supports --no-dereference +# (at least coreutils 8.1). +find / -xdev -exec touch --no-dereference -t 197001010000.00 {} + diff --git a/steps/improve/populate_device_nodes.sh b/steps/improve/populate_device_nodes.sh new file mode 100755 index 0000000..255727d --- /dev/null +++ b/steps/improve/populate_device_nodes.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# http://www.linuxfromscratch.org/lfs/view/6.1/chapter06/devices.html +mkdir -p "/dev" +test -c "/dev/null" || (rm -f "/dev/null" && + mknod -m 666 "/dev/null" c 1 3) +test -c "/dev/zero" || mknod -m 666 "/dev/zero" c 1 5 +test -c "/dev/random" || mknod -m 444 "/dev/random" c 1 8 +test -c "/dev/urandom" || mknod -m 444 "/dev/urandom" c 1 9 + +test -c "/dev/ptmx" || mknod -m 666 "/dev/ptmx" c 5 2 +test -c "/dev/tty" || mknod -m 666 "/dev/tty" c 5 0 + +test -b "/dev/sda" || mknod -m 600 "/dev/sda" b 8 0 +test -b "/dev/sda1" || mknod -m 600 "/dev/sda1" b 8 1 +test -b "/dev/sda2" || mknod -m 600 "/dev/sda2" b 8 2 +test -b "/dev/sda3" || mknod -m 600 "/dev/sda3" b 8 3 +test -b "/dev/sdb" || mknod -m 600 "/dev/sdb" b 8 16 +test -b "/dev/sdb1" || mknod -m 600 "/dev/sdb1" b 8 17 +test -b "/dev/sdb2" || mknod -m 600 "/dev/sdb2" b 8 18 +test -b "/dev/sdb2" || mknod -m 600 "/dev/sdb3" b 8 19 +test -b "/dev/sdc" || mknod -m 600 "/dev/sdc" b 8 32 +test -b "/dev/sdc1" || mknod -m 600 "/dev/sdc1" b 8 33 +test -b "/dev/sdc2" || mknod -m 600 "/dev/sdc2" b 8 34 +test -b "/dev/sdc3" || mknod -m 600 "/dev/sdc3" b 8 35 + +test -e "/dev/stdout" || ln -s "/proc/self/fd/1" "/dev/stdout" + +if mount --version >/dev/null 2>&1; then + test -d "/dev/shm" || (mkdir /dev/shm && mount -t tmpfs tmpfs /dev/shm) + test -d "/proc" || (mkdir /proc && mount -t proc proc /proc) +fi + +if [ "${CHROOT}" = False ]; then + test -c "/dev/console" || mknod -m 666 "/dev/console" c 5 1 +fi diff --git a/steps/improve/setup_repo.sh b/steps/improve/setup_repo.sh new file mode 100755 index 0000000..7ff678f --- /dev/null +++ b/steps/improve/setup_repo.sh @@ -0,0 +1,2 @@ +#!/bin/sh +mkdir -p /external/repo diff --git a/steps/improve/update_env.sh b/steps/improve/update_env.sh new file mode 100755 index 0000000..14f60b8 --- /dev/null +++ b/steps/improve/update_env.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +unset GUILE_LOAD_PATH + +cat > /steps/env <<- EOF +export PATH=${PREFIX}/bin +PREFIX=${PREFIX} +LIBDIR=${LIBDIR} +DESTDIR=${DESTDIR} +DISTFILES=${DISTFILES} +SRCDIR=${SRCDIR} +MAKEJOBS=-j${JOBS} +export HOME=/tmp +export SOURCE_DATE_EPOCH=0 +export SHELL=/usr/bin/bash +DESTDIR=/tmp/destdir +EOF + +. /steps/env diff --git a/steps/jump/fiwix.sh b/steps/jump/fiwix.sh new file mode 100755 index 0000000..0ceb660 --- /dev/null +++ b/steps/jump/fiwix.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +set -ex + +# Build the ext2 image +make_fiwix_initrd + +# Boot Fiwix +kexec-fiwix diff --git a/steps/jump/linux.sh b/steps/jump/linux.sh new file mode 100755 index 0000000..9088fc3 --- /dev/null +++ b/steps/jump/linux.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +. /steps/bootstrap.cfg + +set -e + +# Perform the actual kexec +if [ "${KERNEL_BOOTSTRAP}" = True ]; then + sync + # We don't use the gen_initramfs_list.sh script because it is so *SLOW* + # This emulates the same thing it does + find / -xdev -type d -printf "dir %p %m %U %G\n" >> /initramfs.list + find / -xdev -type f -printf "file %p %p %m %U %G\n" >> /initramfs.list + find / -xdev -type l -printf "slink %p %l %m %U %G\n" >> /initramfs.list + find / -xdev -type c -or -type b -not -name "ram*" -printf "nod %p %m %U %G %y " -exec stat -c '%Hr %Lr' {} \; >> /initramfs.list + kexec-linux "/dev/ram1" "/boot/linux-4.9.10" "!$(command -v gen_init_cpio) /initramfs.list" +else + mkdir /etc + # kexec time + if [ "${BARE_METAL}" = True ]; then + kexec -l "/boot/linux-4.9.10" \ + --append="root=/dev/sda1 rootfstype=ext3 init=/init rw" + else + kexec -l "/boot/linux-4.9.10" --console-serial \ + --append="console=ttyS0 root=/dev/sda1 rootfstype=ext3 init=/init rw" + fi + kexec -e +fi diff --git a/steps/jump/move_disk.sh b/steps/jump/move_disk.sh new file mode 100755 index 0000000..04c664d --- /dev/null +++ b/steps/jump/move_disk.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -ex + +# Create partition if it doesn't exist +if [ $(($(stat -c "%Lr" "/dev/${DISK}") % 8)) -eq 0 ]; then + echo "Creating partition table..." + echo ";" | sfdisk "/dev/${DISK}" + fdisk -l "/dev/${DISK}" + echo "Creating ext4 partition..." + mkfs.ext4 "/dev/${DISK}1" + DISK="${DISK}1" +fi + +# Mount the partition, move everything into /external +mkdir -p /newroot +mount -t ext4 "/dev/${DISK}" /newroot +mkdir -p /newroot/external +mv /newroot/* /newroot/external/ 2>/dev/null || true # obviously errors trying to move external into itself + +# Switch root +mkdir -p /rootonly +# This doesn't recursively mount - that's why we're able to copy everything over +mount --bind / /rootonly +cp -ar /rootonly/* /newroot/ +umount /rootonly +switch_root /newroot /init diff --git a/sysa/kbd-1.15/kbd-1.15.sh b/steps/kbd-1.15/pass1.sh similarity index 100% rename from sysa/kbd-1.15/kbd-1.15.sh rename to steps/kbd-1.15/pass1.sh diff --git a/sysa/kbd-1.15/patches/fcntl.patch b/steps/kbd-1.15/patches/fcntl.patch similarity index 100% rename from sysa/kbd-1.15/patches/fcntl.patch rename to steps/kbd-1.15/patches/fcntl.patch diff --git a/sysa/kbd-1.15/patches/resizecons.patch b/steps/kbd-1.15/patches/resizecons.patch similarity index 100% rename from sysa/kbd-1.15/patches/resizecons.patch rename to steps/kbd-1.15/patches/resizecons.patch diff --git a/sysa/kbd-1.15/sources b/steps/kbd-1.15/sources similarity index 100% rename from sysa/kbd-1.15/sources rename to steps/kbd-1.15/sources diff --git a/sysa/kexec-fiwix-1.0/kexec-fiwix-1.0.checksums b/steps/kexec-fiwix-1.0/kexec-fiwix-1.0.checksums similarity index 100% rename from sysa/kexec-fiwix-1.0/kexec-fiwix-1.0.checksums rename to steps/kexec-fiwix-1.0/kexec-fiwix-1.0.checksums diff --git a/sysa/kexec-fiwix-1.0/kexec-fiwix-1.0.kaem b/steps/kexec-fiwix-1.0/pass1.kaem similarity index 100% rename from sysa/kexec-fiwix-1.0/kexec-fiwix-1.0.kaem rename to steps/kexec-fiwix-1.0/pass1.kaem diff --git a/sysa/kexec-fiwix-1.0/src/kexec-fiwix.c b/steps/kexec-fiwix-1.0/src/kexec-fiwix.c similarity index 100% rename from sysa/kexec-fiwix-1.0/src/kexec-fiwix.c rename to steps/kexec-fiwix-1.0/src/kexec-fiwix.c diff --git a/sysa/kexec-fiwix-1.0/src/multiboot1.h b/steps/kexec-fiwix-1.0/src/multiboot1.h similarity index 100% rename from sysa/kexec-fiwix-1.0/src/multiboot1.h rename to steps/kexec-fiwix-1.0/src/multiboot1.h diff --git a/sysa/kexec-linux-1.0.0/files/kexec-linux.c b/steps/kexec-linux-1.0.0/files/kexec-linux.c similarity index 98% rename from sysa/kexec-linux-1.0.0/files/kexec-linux.c rename to steps/kexec-linux-1.0.0/files/kexec-linux.c index d19ac58..f6da9b4 100644 --- a/sysa/kexec-linux-1.0.0/files/kexec-linux.c +++ b/steps/kexec-linux-1.0.0/files/kexec-linux.c @@ -25,7 +25,6 @@ int main(int argc, char **argv) { kernel_file_name = argv[2]; initramfs_file_name = argv[3]; - ramdrive_file = fopen(ramdrive_file_name, "wb"); /* Move past where lengths go */ @@ -33,6 +32,7 @@ int main(int argc, char **argv) { fseek(ramdrive_file, length_offset, SEEK_SET); uint32_t last_pos = ftell(ramdrive_file); + /* Write the kernel and initramfs */ if (append_file(ramdrive_file, kernel_file_name)) { fprintf(stderr, "Cannot append kernel '%s'\n", kernel_file_name); exit(1); diff --git a/sysa/kexec-linux-1.0.0/mk/main.mk b/steps/kexec-linux-1.0.0/mk/main.mk similarity index 100% rename from sysa/kexec-linux-1.0.0/mk/main.mk rename to steps/kexec-linux-1.0.0/mk/main.mk diff --git a/sysa/kexec-linux-1.0.0/kexec-linux-1.0.0.sh b/steps/kexec-linux-1.0.0/pass1.sh similarity index 100% rename from sysa/kexec-linux-1.0.0/kexec-linux-1.0.0.sh rename to steps/kexec-linux-1.0.0/pass1.sh diff --git a/sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh b/steps/kexec-tools-2.0.22/pass1.sh similarity index 100% rename from sysa/kexec-tools-2.0.22/kexec-tools-2.0.22.sh rename to steps/kexec-tools-2.0.22/pass1.sh diff --git a/sysa/kexec-tools-2.0.22/patches/bad-gcc-arg.patch b/steps/kexec-tools-2.0.22/patches/bad-gcc-arg.patch similarity index 100% rename from sysa/kexec-tools-2.0.22/patches/bad-gcc-arg.patch rename to steps/kexec-tools-2.0.22/patches/bad-gcc-arg.patch diff --git a/sysa/kexec-tools-2.0.22/sources b/steps/kexec-tools-2.0.22/sources similarity index 100% rename from sysa/kexec-tools-2.0.22/sources rename to steps/kexec-tools-2.0.22/sources diff --git a/sysc/libarchive-3.5.2/libarchive-3.5.2.sh b/steps/libarchive-3.5.2/pass1.sh similarity index 100% rename from sysc/libarchive-3.5.2/libarchive-3.5.2.sh rename to steps/libarchive-3.5.2/pass1.sh diff --git a/sysc/libarchive-3.5.2/sources b/steps/libarchive-3.5.2/sources similarity index 100% rename from sysc/libarchive-3.5.2/sources rename to steps/libarchive-3.5.2/sources diff --git a/sysc/libatomic_ops-7.6.10/libatomic_ops-7.6.10.sh b/steps/libatomic_ops-7.6.10/pass1.sh similarity index 100% rename from sysc/libatomic_ops-7.6.10/libatomic_ops-7.6.10.sh rename to steps/libatomic_ops-7.6.10/pass1.sh diff --git a/sysc/libatomic_ops-7.6.10/sources b/steps/libatomic_ops-7.6.10/sources similarity index 100% rename from sysc/libatomic_ops-7.6.10/sources rename to steps/libatomic_ops-7.6.10/sources diff --git a/sysc/libffi-3.3/libffi-3.3.sh b/steps/libffi-3.3/pass1.sh similarity index 100% rename from sysc/libffi-3.3/libffi-3.3.sh rename to steps/libffi-3.3/pass1.sh diff --git a/sysc/libffi-3.3/sources b/steps/libffi-3.3/sources similarity index 100% rename from sysc/libffi-3.3/sources rename to steps/libffi-3.3/sources diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/steps/libtool-2.2.4/pass1.sh similarity index 100% rename from sysa/libtool-2.2.4/libtool-2.2.4.sh rename to steps/libtool-2.2.4/pass1.sh diff --git a/sysa/libtool-2.2.4/patches/archive-objs-order.patch b/steps/libtool-2.2.4/patches/archive-objs-order.patch similarity index 100% rename from sysa/libtool-2.2.4/patches/archive-objs-order.patch rename to steps/libtool-2.2.4/patches/archive-objs-order.patch diff --git a/sysa/libtool-2.2.4/patches/hostname.patch b/steps/libtool-2.2.4/patches/hostname.patch similarity index 100% rename from sysa/libtool-2.2.4/patches/hostname.patch rename to steps/libtool-2.2.4/patches/hostname.patch diff --git a/sysa/libtool-2.2.4/sources b/steps/libtool-2.2.4/sources similarity index 100% rename from sysa/libtool-2.2.4/sources rename to steps/libtool-2.2.4/sources diff --git a/sysc/libtool-2.4.7/bootstrap-helper.sh b/steps/libtool-2.4.7/bootstrap-helper.sh similarity index 100% rename from sysc/libtool-2.4.7/bootstrap-helper.sh rename to steps/libtool-2.4.7/bootstrap-helper.sh diff --git a/sysc/libtool-2.4.7/import-gnulib.sh b/steps/libtool-2.4.7/import-gnulib.sh similarity index 100% rename from sysc/libtool-2.4.7/import-gnulib.sh rename to steps/libtool-2.4.7/import-gnulib.sh diff --git a/sysc/libtool-2.4.7/libtool-2.4.7.sh b/steps/libtool-2.4.7/pass1.sh similarity index 100% rename from sysc/libtool-2.4.7/libtool-2.4.7.sh rename to steps/libtool-2.4.7/pass1.sh diff --git a/sysc/libtool-2.4.7/patches/hostname.patch b/steps/libtool-2.4.7/patches/hostname.patch similarity index 100% rename from sysc/libtool-2.4.7/patches/hostname.patch rename to steps/libtool-2.4.7/patches/hostname.patch diff --git a/sysc/libtool-2.4.7/sources b/steps/libtool-2.4.7/sources similarity index 100% rename from sysc/libtool-2.4.7/sources rename to steps/libtool-2.4.7/sources diff --git a/sysc/libunistring-0.9.10/libunistring-0.9.10.sh b/steps/libunistring-0.9.10/pass1.sh similarity index 100% rename from sysc/libunistring-0.9.10/libunistring-0.9.10.sh rename to steps/libunistring-0.9.10/pass1.sh diff --git a/sysc/libunistring-0.9.10/sources b/steps/libunistring-0.9.10/sources similarity index 100% rename from sysc/libunistring-0.9.10/sources rename to steps/libunistring-0.9.10/sources diff --git a/sysa/linux-4.9.10/files/config b/steps/linux-4.9.10/files/config similarity index 100% rename from sysa/linux-4.9.10/files/config rename to steps/linux-4.9.10/files/config diff --git a/sysa/linux-4.9.10/linux-4.9.10.sh b/steps/linux-4.9.10/pass1.sh similarity index 88% rename from sysa/linux-4.9.10/linux-4.9.10.sh rename to steps/linux-4.9.10/pass1.sh index 4d0cf62..2339663 100644 --- a/sysa/linux-4.9.10/linux-4.9.10.sh +++ b/steps/linux-4.9.10/pass1.sh @@ -6,14 +6,18 @@ # XXX: Fix package after builder-hex0 src_unpack() { + # Remove all previous source tarballs + mkdir /tmp/keep + for keep in deblob-4.9 ${pkg}.tar.gz musl-1.2.4.tar.gz curl-7.88.1.tar.bz2; do + mv "${DISTFILES}/${keep}" /tmp/keep + done + rm -r "${DISTFILES}/"* + mv /tmp/keep/* "${DISTFILES}" + mkdir "${pkg}" mv "${DISTFILES}/deblob-4.9" "${pkg}/" - # Remove all previous source tarballs - mv "${DISTFILES}/${pkg}.tar.gz" . - rm -r "${DISTFILES:?}/"* - mv "${pkg}.tar.gz" "${DISTFILES}" default || true # Predictable link errors - not a problem - rm -r "${DISTFILES}" # Clear storage space + rm "${DISTFILES}/${pkg}.tar.gz" } generate_autoconf_h() { diff --git a/sysa/linux-4.9.10/patches/bad-asm.patch b/steps/linux-4.9.10/patches/bad-asm.patch similarity index 100% rename from sysa/linux-4.9.10/patches/bad-asm.patch rename to steps/linux-4.9.10/patches/bad-asm.patch diff --git a/sysa/linux-4.9.10/patches/disable-broken-check.patch b/steps/linux-4.9.10/patches/disable-broken-check.patch similarity index 100% rename from sysa/linux-4.9.10/patches/disable-broken-check.patch rename to steps/linux-4.9.10/patches/disable-broken-check.patch diff --git a/sysa/linux-4.9.10/patches/initramfs_list.patch b/steps/linux-4.9.10/patches/initramfs_list.patch similarity index 100% rename from sysa/linux-4.9.10/patches/initramfs_list.patch rename to steps/linux-4.9.10/patches/initramfs_list.patch diff --git a/sysa/linux-4.9.10/patches/linking.patch b/steps/linux-4.9.10/patches/linking.patch similarity index 100% rename from sysa/linux-4.9.10/patches/linking.patch rename to steps/linux-4.9.10/patches/linking.patch diff --git a/sysa/linux-4.9.10/patches/regen.patch b/steps/linux-4.9.10/patches/regen.patch similarity index 100% rename from sysa/linux-4.9.10/patches/regen.patch rename to steps/linux-4.9.10/patches/regen.patch diff --git a/sysa/linux-4.9.10/patches/remove-alternative-asm.patch b/steps/linux-4.9.10/patches/remove-alternative-asm.patch similarity index 100% rename from sysa/linux-4.9.10/patches/remove-alternative-asm.patch rename to steps/linux-4.9.10/patches/remove-alternative-asm.patch diff --git a/sysa/linux-4.9.10/patches/remove-kconfig.patch b/steps/linux-4.9.10/patches/remove-kconfig.patch similarity index 100% rename from sysa/linux-4.9.10/patches/remove-kconfig.patch rename to steps/linux-4.9.10/patches/remove-kconfig.patch diff --git a/sysa/linux-4.9.10/sources b/steps/linux-4.9.10/sources similarity index 100% rename from sysa/linux-4.9.10/sources rename to steps/linux-4.9.10/sources diff --git a/sysa/linux-headers-4.9.10/linux-headers-4.9.10.sh b/steps/linux-headers-4.9.10/pass1.sh similarity index 100% rename from sysa/linux-headers-4.9.10/linux-headers-4.9.10.sh rename to steps/linux-headers-4.9.10/pass1.sh diff --git a/sysa/linux-headers-4.9.10/patches/musl.patch b/steps/linux-headers-4.9.10/patches/musl.patch similarity index 100% rename from sysa/linux-headers-4.9.10/patches/musl.patch rename to steps/linux-headers-4.9.10/patches/musl.patch diff --git a/sysa/linux-headers-4.9.10/patches/winsize.patch b/steps/linux-headers-4.9.10/patches/winsize.patch similarity index 100% rename from sysa/linux-headers-4.9.10/patches/winsize.patch rename to steps/linux-headers-4.9.10/patches/winsize.patch diff --git a/sysa/linux-headers-4.9.10/sources b/steps/linux-headers-4.9.10/sources similarity index 100% rename from sysa/linux-headers-4.9.10/sources rename to steps/linux-headers-4.9.10/sources diff --git a/sysa/lwext4-1.0.0-lb1/config/ext4_config.h b/steps/lwext4-1.0.0-lb1/config/ext4_config.h similarity index 100% rename from sysa/lwext4-1.0.0-lb1/config/ext4_config.h rename to steps/lwext4-1.0.0-lb1/config/ext4_config.h diff --git a/steps/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt b/steps/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt new file mode 100644 index 0000000..337e0e7 --- /dev/null +++ b/steps/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt @@ -0,0 +1,177 @@ +# SPDX-FileCopyrightText: 2023 Richard Masters +# SPDX-License-Identifier: MIT +/usr/bin/blood-elf +/usr/bin/catm +/usr/bin/chmod +/usr/bin/get_machine +/usr/bin/hex2 +/usr/bin/kaem +/usr/bin/match +/usr/bin/M1 +/usr/bin/M2-Mesoplanet +/usr/bin/M2-Planet +/usr/bin/mkdir +/usr/bin/sha256sum +/usr/bin/unbz2 +/usr/bin/ungz +/usr/bin/untar +/usr/bin/cp +/usr/bin/replace +/usr/bin/rm +/usr/bin/checksum-transcriber +/usr/bin/tcc +/usr/bin/tcc-0.9.26 +/usr/bin/kexec-linux +/usr/lib/mes/libc.a +/usr/lib/mes/libgetopt.a +/usr/lib/mes/crt1.o +/usr/lib/mes/crti.o +/usr/lib/mes/crtn.o +/usr/lib/mes/tcc/libtcc1.a +/usr/include/mes/alloca.h +/usr/include/mes/argz.h +/usr/include/mes/ar.h +/usr/include/mes/assert.h +/usr/include/mes/ctype.h +/usr/include/mes/dirent.h +/usr/include/mes/dirstream.h +/usr/include/mes/dlfcn.h +/usr/include/mes/endian.h +/usr/include/mes/errno.h +/usr/include/mes/fcntl.h +/usr/include/mes/features.h +/usr/include/mes/float.h +/usr/include/mes/getopt.h +/usr/include/mes/grp.h +/usr/include/mes/inttypes.h +/usr/include/mes/libgen.h +/usr/include/mes/limits.h +/usr/include/mes/locale.h +/usr/include/mes/math.h +/usr/include/mes/memory.h +/usr/include/mes/pwd.h +/usr/include/mes/setjmp.h +/usr/include/mes/signal.h +/usr/include/mes/stdarg.h +/usr/include/mes/stdbool.h +/usr/include/mes/stddef.h +/usr/include/mes/stdint.h +/usr/include/mes/stdio.h +/usr/include/mes/stdlib.h +/usr/include/mes/stdnoreturn.h +/usr/include/mes/string.h +/usr/include/mes/strings.h +/usr/include/mes/termio.h +/usr/include/mes/time.h +/usr/include/mes/unistd.h +/usr/include/mes/arch/kernel-stat.h +/usr/include/mes/arch/syscall.h +/usr/include/mes/linux/syscall.h +/usr/include/mes/linux/x86/syscall.h +/usr/include/mes/mes/builtins.h +/usr/include/mes/mes/cc.h +/usr/include/mes/mes/config.h +/usr/include/mes/mes/constants.h +/usr/include/mes/mes/lib.h +/usr/include/mes/mes/lib-cc.h +/usr/include/mes/mes/lib-mini.h +/usr/include/mes/mes/mes.h +/usr/include/mes/mes/symbols.h +/usr/include/mes/sys/cdefs.h +/usr/include/mes/sys/dir.h +/usr/include/mes/sys/file.h +/usr/include/mes/sys/ioctl.h +/usr/include/mes/sys/mman.h +/usr/include/mes/sys/param.h +/usr/include/mes/sys/resource.h +/usr/include/mes/sys/select.h +/usr/include/mes/sys/stat.h +/usr/include/mes/sys/timeb.h +/usr/include/mes/sys/time.h +/usr/include/mes/sys/times.h +/usr/include/mes/sys/types.h +/usr/include/mes/sys/ucontext.h +/usr/include/mes/sys/user.h +/usr/include/mes/sys/wait.h +/init +/kaem.run +/external/distfiles/make-3.82.tar.bz2 +/external/distfiles/patch-2.5.9.tar.gz +/external/distfiles/gzip-1.2.4.tar.gz +/external/distfiles/tar-1.12.tar.gz +/external/distfiles/sed-4.0.9.tar.gz +/external/distfiles/bzip2-1.0.8.tar.gz +/external/distfiles/coreutils-5.0.tar.bz2 +/external/distfiles/heirloom-devtools-070527.tar.bz2 +/external/distfiles/bash-2.05b.tar.gz +/external/distfiles/flex-2.5.11.tar.gz +/external/distfiles/tcc-0.9.27.tar.bz2 +/external/distfiles/musl-1.1.24.tar.gz +/external/distfiles/tcc-0.9.27.tar.bz2 +/external/distfiles/musl-1.1.24.tar.gz +/external/distfiles/tcc-0.9.27.tar.bz2 +/external/distfiles/sed-4.0.9.tar.gz +/external/distfiles/bzip2-1.0.8.tar.gz +/external/distfiles/m4-1.4.7.tar.gz +/external/distfiles/flex-2.6.4.tar.gz +/external/distfiles/bison-3.4.1.tar.gz +/external/distfiles/bison-3.4.1.tar.gz +/external/distfiles/bison-3.4.1.tar.gz +/external/distfiles/grep-2.4.tar.gz +/external/distfiles/diffutils-2.7.tar.gz +/external/distfiles/coreutils-5.0.tar.bz2 +/external/distfiles/coreutils-6.10.tar.gz +/external/distfiles/gawk-3.0.4.tar.gz +/external/distfiles/perl-5.000.tar.gz +/external/distfiles/perl-5.003.tar.gz +/external/distfiles/perl5.004_05.tar.gz +/external/distfiles/perl5.005_03.tar.gz +/external/distfiles/perl-5.6.2.tar.gz +/external/distfiles/autoconf-2.52.tar.bz2 +/external/distfiles/automake-1.6.3.tar.bz2 +/external/distfiles/automake-1.6.3.tar.bz2 +/external/distfiles/autoconf-2.53.tar.bz2 +/external/distfiles/automake-1.7.tar.bz2 +/external/distfiles/autoconf-2.54.tar.bz2 +/external/distfiles/autoconf-2.55.tar.bz2 +/external/distfiles/automake-1.7.8.tar.bz2 +/external/distfiles/autoconf-2.57.tar.bz2 +/external/distfiles/autoconf-2.59.tar.bz2 +/external/distfiles/automake-1.8.5.tar.bz2 +/external/distfiles/help2man-1.36.4.tar.gz +/external/distfiles/autoconf-2.61.tar.bz2 +/external/distfiles/automake-1.9.6.tar.bz2 +/external/distfiles/automake-1.10.3.tar.bz2 +/external/distfiles/autoconf-2.64.tar.bz2 +/external/distfiles/automake-1.11.2.tar.bz2 +/external/distfiles/autoconf-2.69.tar.gz +/external/distfiles/libtool-2.2.4.tar.bz2 +/external/distfiles/automake-1.15.1.tar.gz +/external/distfiles/binutils-2.30.tar.bz2 +/external/distfiles/musl-1.1.24.tar.gz +/external/distfiles/tcc-0.9.27.tar.bz2 +/external/distfiles/gcc-core-4.0.4.tar.bz2 +/external/distfiles/automake-1.16.3.tar.gz +/external/distfiles/findutils-4.2.33.tar.gz +/external/distfiles/gnulib-8e128e.tar.gz +/external/distfiles/musl-1.2.4.tar.gz +/external/distfiles/gcc-core-4.0.4.tar.bz2 +/external/distfiles/automake-1.16.3.tar.gz +/external/distfiles/util-linux-2.19.1.tar.gz +/external/distfiles/e2fsprogs-1.45.7.tar.gz +/external/distfiles/CaseFolding.txt +/external/distfiles/DerivedAge.txt +/external/distfiles/DerivedCombiningClass.txt +/external/distfiles/DerivedCoreProperties.txt +/external/distfiles/NormalizationCorrections.txt +/external/distfiles/NormalizationTest.txt +/external/distfiles/UnicodeData.txt +/external/distfiles/v10.0.1.tar.gz +/external/distfiles/kbd-1.15.tar.gz +/external/distfiles/make-3.82.tar.bz2 +/external/distfiles/ed-1.4.tar.gz +/external/distfiles/bc-1.07.1.tar.gz +/external/distfiles/v2.0.22.tar.gz +/external/distfiles/linux-4.9.10.tar.gz +/external/distfiles/deblob-4.9 +/external/distfiles/curl-7.88.1.tar.bz2 diff --git a/sysa/lwext4-1.0.0-lb1/files/make_fiwix_initrd.c b/steps/lwext4-1.0.0-lb1/files/make_fiwix_initrd.c similarity index 96% rename from sysa/lwext4-1.0.0-lb1/files/make_fiwix_initrd.c rename to steps/lwext4-1.0.0-lb1/files/make_fiwix_initrd.c index 728a09d..d900948 100644 --- a/sysa/lwext4-1.0.0-lb1/files/make_fiwix_initrd.c +++ b/steps/lwext4-1.0.0-lb1/files/make_fiwix_initrd.c @@ -260,6 +260,11 @@ int main(int argc, char **argv) if (err != EOK) { printf("ext4_dir_mk error: %d\n", err); } + puts("ext4_dir_mk /mp/tmp"); + err = ext4_dir_mk("/mp/tmp"); + if (err != EOK) { + printf("ext4_dir_mk error: %d\n", err); + } puts("ext4_mknod /mp/dev/console"); err = ext4_mknod("/mp/dev/console", EXT4_DE_CHRDEV, MKDEV(5, 1)); @@ -280,15 +285,7 @@ int main(int argc, char **argv) return EXIT_FAILURE; } - copy_file("/usr/bin/kaem", "/mp/init"); - copy_file("/sysa/after2.kaem", "/mp/kaem.run"); - copy_file_list("/sysa/lwext4-1.0.0-lb1/files/fiwix-file-list.txt"); - puts("ext4_dir_mk /mp/tmp"); - ext4_dir_mk("/mp/tmp"); - puts("ext4_dir_mk /mp/usr"); - ext4_dir_mk("/mp/usr"); - puts("ext4_dir_mk /mp/usr/src"); - ext4_dir_mk("/mp/usr/src"); + copy_file_list("/steps/lwext4-1.0.0-lb1/files/fiwix-file-list.txt"); if (!lwext4_umount()) return EXIT_FAILURE; diff --git a/sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums b/steps/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums similarity index 100% rename from sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums rename to steps/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.checksums diff --git a/sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.kaem b/steps/lwext4-1.0.0-lb1/pass1.kaem similarity index 96% rename from sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.kaem rename to steps/lwext4-1.0.0-lb1/pass1.kaem index fb8aab6..3fa41fa 100755 --- a/sysa/lwext4-1.0.0-lb1/lwext4-1.0.0-lb1.kaem +++ b/steps/lwext4-1.0.0-lb1/pass1.kaem @@ -43,7 +43,7 @@ cc -c ext4_super.c cc -c ext4_trans.c cc -c ext4_xattr.c -catm make_fiwix_initrd.c ../../../files/make_fiwix_initrd.c +cp ../../../files/make_fiwix_initrd.c make_fiwix_initrd.c tcc -m32 -march=i386 -std=c89 -I../include -I../build_generic/include -I../../tcc/tcc-0.9.27/include -DVERSION="\"1.0\"" -c make_fiwix_initrd.c tcc -m32 -o ${BINDIR}/make_fiwix_initrd ext4.o ext4_balloc.o ext4_bcache.o ext4_bitmap.o ext4_block_group.o ext4_blockdev.o ext4_crc32.o ext4_debug.o ext4_dir.o ext4_dir_idx.o ext4_extent.o ext4_fs.o ext4_hash.o ext4_ialloc.o ext4_inode.o ext4_journal.o ext4_mbr.o ext4_mkfs.o ext4_super.o ext4_trans.o ext4_xattr.o ../blockdev/linux/file_dev.o make_fiwix_initrd.o diff --git a/sysa/lwext4-1.0.0-lb1/sources b/steps/lwext4-1.0.0-lb1/sources similarity index 100% rename from sysa/lwext4-1.0.0-lb1/sources rename to steps/lwext4-1.0.0-lb1/sources diff --git a/sysa/m4-1.4.7/mk/main.mk b/steps/m4-1.4.7/mk/main.mk similarity index 100% rename from sysa/m4-1.4.7/mk/main.mk rename to steps/m4-1.4.7/mk/main.mk diff --git a/sysa/m4-1.4.7/sources b/steps/m4-1.4.7/sources similarity index 100% rename from sysa/m4-1.4.7/sources rename to steps/m4-1.4.7/sources diff --git a/sysa/make-3.82/files/putenv_stub.c b/steps/make-3.82/files/putenv_stub.c similarity index 100% rename from sysa/make-3.82/files/putenv_stub.c rename to steps/make-3.82/files/putenv_stub.c diff --git a/sysa/make-3.82/make-3.82.checksums b/steps/make-3.82/make-3.82.checksums similarity index 100% rename from sysa/make-3.82/make-3.82.checksums rename to steps/make-3.82/make-3.82.checksums diff --git a/sysa/make-3.82/make-3.82.kaem b/steps/make-3.82/pass1.kaem similarity index 100% rename from sysa/make-3.82/make-3.82.kaem rename to steps/make-3.82/pass1.kaem diff --git a/sysa/make-3.82/make-3.82.sh b/steps/make-3.82/pass2.sh similarity index 100% rename from sysa/make-3.82/make-3.82.sh rename to steps/make-3.82/pass2.sh diff --git a/sysa/make-3.82/sources b/steps/make-3.82/sources similarity index 100% rename from sysa/make-3.82/sources rename to steps/make-3.82/sources diff --git a/sysc/make-4.2.1/make-4.2.1.sh b/steps/make-4.2.1/pass1.sh similarity index 100% rename from sysc/make-4.2.1/make-4.2.1.sh rename to steps/make-4.2.1/pass1.sh diff --git a/sysc/make-4.2.1/sources b/steps/make-4.2.1/sources similarity index 100% rename from sysc/make-4.2.1/sources rename to steps/make-4.2.1/sources diff --git a/steps/manifest b/steps/manifest new file mode 100644 index 0000000..8c7dac5 --- /dev/null +++ b/steps/manifest @@ -0,0 +1,169 @@ +# This file follows a very simple, human readable and machine parseable syntax. +# Each line is in the format: +# : +# +# The supported directives and arguments are: +# - build; simply builds a particular package. +# eg, build: make-3.82 +# - improve; runs a script that makes a distinct and logical improvement to the system. +# eg, improve: use_fhs +# - define: define a variable based upon other variables +# eg, define: BUILD_FIWIX = KERNEL_BOOTSTRAP == True || BUILD_KERNELS == True +# - jump: jump (usually) to a new kernel, executes a script with that name +# eg, jump: fiwix +# +# Other features: +# - predicate; based on variables set in bootstrap.cfg, require for something to execute +# must be enclosed in brackets with spaces padded +# eg, build: fiwix-1.4.0-lb3 ( BUILD_FIWIX == True ) + +build: checksum-transcriber-1.0 +build: simple-patch-1.0 +build: mes-0.25 +build: tcc-0.9.26 +build: tcc-0.9.27 +define: BUILD_FIWIX = ( KERNEL_BOOTSTRAP == True || BUILD_KERNELS == True ) +build: fiwix-1.4.0-lb3 ( BUILD_FIWIX == True ) +build: lwext4-1.0.0-lb1 ( BUILD_FIWIX == True ) +build: kexec-fiwix-1.0 ( BUILD_FIWIX == True ) +jump: fiwix ( KERNEL_BOOTSTRAP == True ) +define: JOBS = 1 ( KERNEL_BOOTSTRAP == True ) +build: make-3.82 +build: patch-2.5.9 +build: gzip-1.2.4 +build: tar-1.12 +build: sed-4.0.9 +build: bzip2-1.0.8 +build: coreutils-5.0 +build: heirloom-devtools-070527 +build: bash-2.05b +improve: setup_repo +improve: update_env +build: flex-2.5.11 +build: tcc-0.9.27 +improve: musl_libdir +build: musl-1.1.24 +build: tcc-0.9.27 +build: musl-1.1.24 +build: tcc-0.9.27 +build: sed-4.0.9 +build: bzip2-1.0.8 +build: m4-1.4.7 +build: flex-2.6.4 +build: bison-3.4.1 +build: bison-3.4.1 +build: bison-3.4.1 +build: grep-2.4 +build: diffutils-2.7 +build: coreutils-5.0 +build: coreutils-6.10 +build: gawk-3.0.4 +build: perl-5.000 +build: perl-5.003 +build: perl5.004-05 +build: perl5.005-03 +build: perl-5.6.2 +improve: populate_device_nodes +build: autoconf-2.52 +build: automake-1.6.3 +build: automake-1.6.3 +build: autoconf-2.53 +build: automake-1.7 +build: autoconf-2.54 +build: autoconf-2.55 +build: automake-1.7.8 +build: autoconf-2.57 +build: autoconf-2.59 +build: automake-1.8.5 +build: help2man-1.36.4 +build: autoconf-2.61 +build: automake-1.9.6 +build: automake-1.10.3 +build: autoconf-2.64 +build: automake-1.11.2 +build: autoconf-2.69 +build: libtool-2.2.4 +build: automake-1.15.1 +build: binutils-2.30 +build: musl-1.1.24 +build: tcc-0.9.27 +improve: populate_device_nodes +build: gcc-4.0.4 +build: findutils-4.2.33 +build: musl-1.2.4 +build: linux-headers-4.9.10 +build: gcc-4.0.4 +build: util-linux-2.19.1 +build: e2fsprogs-1.45.7 +build: dhcpcd-10.0.1 +build: kbd-1.15 +build: make-3.82 +build: ed-1.4 +build: bc-1.07.1 +define: BUILD_LINUX = ( CHROOT == False || BUILD_KERNELS == True ) +build: kexec-linux-1.0.0 ( BUILD_LINUX == True ) +build: kexec-tools-2.0.22 ( BUILD_LINUX == True ) +build: linux-4.9.10 ( BUILD_LINUX == True ) +jump: linux ( CHROOT == False ) +improve: finalize_fhs +build: musl-1.2.4 +build: curl-7.88.1 +improve: populate_device_nodes +jump: move_disk ( KERNEL_BOOTSTRAP == True ) +improve: get_network ( CHROOT == False ) +build: bash-5.2.15 +build: xz-5.4.1 +build: file-5.44 +build: libtool-2.4.7 +build: tar-1.34 +build: coreutils-8.32 +build: pkg-config-0.29.2 +build: make-4.2.1 +build: gmp-6.2.1 +build: autoconf-archive-2021.02.19 +build: mpfr-4.1.0 +build: mpc-1.2.1 +build: flex-2.5.33 +build: bison-2.3 +build: bison-3.4.2 +build: perl-5.10.1 +build: dist-3.5-236 +build: perl-5.32.1 +build: libarchive-3.5.2 +build: openssl-1.1.1l +build: ca-certificates-3.88.1 +build: curl-7.88.1 +build: zlib-1.2.13 +build: automake-1.16.3 +build: autoconf-2.71 +build: patch-2.7.6 +build: gettext-0.21 +build: texinfo-6.7 +build: gcc-4.7.4 +build: binutils-2.38 +build: gperf-3.1 +build: libunistring-0.9.10 +build: libffi-3.3 +build: libatomic_ops-7.6.10 +build: gc-8.0.4 +build: guile-3.0.9 +build: which-2.21 +build: grep-3.7 +build: sed-4.8 +build: autogen-5.18.16 +build: musl-1.2.4 +build: python-2.0.1 +build: python-2.0.1 +build: python-2.3.7 +build: python-2.3.7 +build: python-2.5.6 +build: python-3.1.5 +build: python-3.1.5 +build: python-3.3.7 +build: python-3.4.10 +build: python-3.8.16 +build: python-3.11.1 +build: gcc-10.4.0 +build: binutils-2.38 +build: gcc-13.1.0 +improve: null_time ( FORCE_TIMESTAMPS == True ) diff --git a/sysa/mes-0.25/files/config.h b/steps/mes-0.25/files/config.h similarity index 87% rename from sysa/mes-0.25/files/config.h rename to steps/mes-0.25/files/config.h index cab37d9..e79ee96 100644 --- a/sysa/mes-0.25/files/config.h +++ b/steps/mes-0.25/files/config.h @@ -4,4 +4,4 @@ // SPDX-License-Identifier: GPL-3.0-or-later #undef SYSTEM_LIBC -#define MES_VERSION "0.24.2" +#define MES_VERSION "0.25" diff --git a/sysa/mes-0.25/mes-0.25.amd64.checksums b/steps/mes-0.25/mes-0.25.amd64.checksums similarity index 100% rename from sysa/mes-0.25/mes-0.25.amd64.checksums rename to steps/mes-0.25/mes-0.25.amd64.checksums diff --git a/sysa/mes-0.25/mes-0.25.riscv64.checksums b/steps/mes-0.25/mes-0.25.riscv64.checksums similarity index 100% rename from sysa/mes-0.25/mes-0.25.riscv64.checksums rename to steps/mes-0.25/mes-0.25.riscv64.checksums diff --git a/sysa/mes-0.25/mes-0.25.x86.checksums b/steps/mes-0.25/mes-0.25.x86.checksums similarity index 100% rename from sysa/mes-0.25/mes-0.25.x86.checksums rename to steps/mes-0.25/mes-0.25.x86.checksums diff --git a/sysa/mes-0.25/mes-0.25.kaem b/steps/mes-0.25/pass1.kaem similarity index 100% rename from sysa/mes-0.25/mes-0.25.kaem rename to steps/mes-0.25/pass1.kaem diff --git a/sysa/mes-0.25/sources b/steps/mes-0.25/sources similarity index 100% rename from sysa/mes-0.25/sources rename to steps/mes-0.25/sources diff --git a/sysc/mpc-1.2.1/mpc-1.2.1.sh b/steps/mpc-1.2.1/pass1.sh similarity index 100% rename from sysc/mpc-1.2.1/mpc-1.2.1.sh rename to steps/mpc-1.2.1/pass1.sh diff --git a/sysc/mpc-1.2.1/sources b/steps/mpc-1.2.1/sources similarity index 100% rename from sysc/mpc-1.2.1/sources rename to steps/mpc-1.2.1/sources diff --git a/sysc/mpfr-4.1.0/files/mparam.h b/steps/mpfr-4.1.0/files/mparam.h similarity index 100% rename from sysc/mpfr-4.1.0/files/mparam.h rename to steps/mpfr-4.1.0/files/mparam.h diff --git a/sysc/mpfr-4.1.0/mpfr-4.1.0.sh b/steps/mpfr-4.1.0/pass1.sh similarity index 100% rename from sysc/mpfr-4.1.0/mpfr-4.1.0.sh rename to steps/mpfr-4.1.0/pass1.sh diff --git a/sysc/mpfr-4.1.0/sources b/steps/mpfr-4.1.0/sources similarity index 100% rename from sysc/mpfr-4.1.0/sources rename to steps/mpfr-4.1.0/sources diff --git a/sysa/musl-1.1.24/musl-1.1.24.sh b/steps/musl-1.1.24/pass1.sh similarity index 100% rename from sysa/musl-1.1.24/musl-1.1.24.sh rename to steps/musl-1.1.24/pass1.sh diff --git a/steps/musl-1.1.24/pass2.sh b/steps/musl-1.1.24/pass2.sh new file mode 120000 index 0000000..c069796 --- /dev/null +++ b/steps/musl-1.1.24/pass2.sh @@ -0,0 +1 @@ +pass1.sh \ No newline at end of file diff --git a/sysa/musl-1.1.24/binutils-rebuild.sh b/steps/musl-1.1.24/pass3.sh similarity index 100% rename from sysa/musl-1.1.24/binutils-rebuild.sh rename to steps/musl-1.1.24/pass3.sh diff --git a/sysa/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch b/steps/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch similarity index 100% rename from sysa/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch rename to steps/musl-1.1.24/patches-pass3/avoid_set_thread_area.patch diff --git a/sysa/musl-1.1.24/patches-pass3/avoid_sys_clone.patch b/steps/musl-1.1.24/patches-pass3/avoid_sys_clone.patch similarity index 100% rename from sysa/musl-1.1.24/patches-pass3/avoid_sys_clone.patch rename to steps/musl-1.1.24/patches-pass3/avoid_sys_clone.patch diff --git a/sysa/musl-1.1.24/patches-pass3/set_thread_area.patch b/steps/musl-1.1.24/patches-pass3/set_thread_area.patch similarity index 100% rename from sysa/musl-1.1.24/patches-pass3/set_thread_area.patch rename to steps/musl-1.1.24/patches-pass3/set_thread_area.patch diff --git a/sysa/musl-1.1.24/patches-pass3/va_list.patch b/steps/musl-1.1.24/patches-pass3/va_list.patch similarity index 100% rename from sysa/musl-1.1.24/patches-pass3/va_list.patch rename to steps/musl-1.1.24/patches-pass3/va_list.patch diff --git a/sysa/musl-1.1.24/patches/avoid_set_thread_area.patch b/steps/musl-1.1.24/patches/avoid_set_thread_area.patch similarity index 100% rename from sysa/musl-1.1.24/patches/avoid_set_thread_area.patch rename to steps/musl-1.1.24/patches/avoid_set_thread_area.patch diff --git a/sysa/musl-1.1.24/patches/avoid_sys_clone.patch b/steps/musl-1.1.24/patches/avoid_sys_clone.patch similarity index 100% rename from sysa/musl-1.1.24/patches/avoid_sys_clone.patch rename to steps/musl-1.1.24/patches/avoid_sys_clone.patch diff --git a/sysa/musl-1.1.24/patches/fenv.patch b/steps/musl-1.1.24/patches/fenv.patch similarity index 100% rename from sysa/musl-1.1.24/patches/fenv.patch rename to steps/musl-1.1.24/patches/fenv.patch diff --git a/sysa/musl-1.1.24/patches/makefile.patch b/steps/musl-1.1.24/patches/makefile.patch similarity index 100% rename from sysa/musl-1.1.24/patches/makefile.patch rename to steps/musl-1.1.24/patches/makefile.patch diff --git a/sysa/musl-1.1.24/patches/musl_weak_symbols.patch b/steps/musl-1.1.24/patches/musl_weak_symbols.patch similarity index 100% rename from sysa/musl-1.1.24/patches/musl_weak_symbols.patch rename to steps/musl-1.1.24/patches/musl_weak_symbols.patch diff --git a/sysa/musl-1.1.24/patches/set_thread_area.patch b/steps/musl-1.1.24/patches/set_thread_area.patch similarity index 100% rename from sysa/musl-1.1.24/patches/set_thread_area.patch rename to steps/musl-1.1.24/patches/set_thread_area.patch diff --git a/sysa/musl-1.1.24/patches/sigsetjmp.patch b/steps/musl-1.1.24/patches/sigsetjmp.patch similarity index 100% rename from sysa/musl-1.1.24/patches/sigsetjmp.patch rename to steps/musl-1.1.24/patches/sigsetjmp.patch diff --git a/sysa/musl-1.1.24/patches/stdio_flush_on_exit.patch b/steps/musl-1.1.24/patches/stdio_flush_on_exit.patch similarity index 100% rename from sysa/musl-1.1.24/patches/stdio_flush_on_exit.patch rename to steps/musl-1.1.24/patches/stdio_flush_on_exit.patch diff --git a/sysa/musl-1.1.24/patches/va_list.patch b/steps/musl-1.1.24/patches/va_list.patch similarity index 100% rename from sysa/musl-1.1.24/patches/va_list.patch rename to steps/musl-1.1.24/patches/va_list.patch diff --git a/sysa/musl-1.1.24/sources b/steps/musl-1.1.24/sources similarity index 100% rename from sysa/musl-1.1.24/sources rename to steps/musl-1.1.24/sources diff --git a/sysc/musl-1.2.4/files/__stack_chk_fail_local.c b/steps/musl-1.2.4/files/__stack_chk_fail_local.c similarity index 100% rename from sysc/musl-1.2.4/files/__stack_chk_fail_local.c rename to steps/musl-1.2.4/files/__stack_chk_fail_local.c diff --git a/sysc/musl-1.2.4/files/ld-musl-i386.path b/steps/musl-1.2.4/files/ld-musl-i386.path similarity index 100% rename from sysc/musl-1.2.4/files/ld-musl-i386.path rename to steps/musl-1.2.4/files/ld-musl-i386.path diff --git a/sysc/musl-1.2.4/files/ld-musl-i386.path.license b/steps/musl-1.2.4/files/ld-musl-i386.path.license similarity index 100% rename from sysc/musl-1.2.4/files/ld-musl-i386.path.license rename to steps/musl-1.2.4/files/ld-musl-i386.path.license diff --git a/sysa/musl-1.2.4/musl-1.2.4.sh b/steps/musl-1.2.4/pass1.sh similarity index 100% rename from sysa/musl-1.2.4/musl-1.2.4.sh rename to steps/musl-1.2.4/pass1.sh diff --git a/steps/musl-1.2.4/pass2.sh b/steps/musl-1.2.4/pass2.sh new file mode 120000 index 0000000..c069796 --- /dev/null +++ b/steps/musl-1.2.4/pass2.sh @@ -0,0 +1 @@ +pass1.sh \ No newline at end of file diff --git a/sysc/musl-1.2.4/musl-1.2.4.sh b/steps/musl-1.2.4/pass3.sh similarity index 83% rename from sysc/musl-1.2.4/musl-1.2.4.sh rename to steps/musl-1.2.4/pass3.sh index b51c8fc..b3e4226 100755 --- a/sysc/musl-1.2.4/musl-1.2.4.sh +++ b/steps/musl-1.2.4/pass3.sh @@ -38,11 +38,6 @@ src_install() { # Add library search path configurtion mkdir -p "${DESTDIR}/etc" cp ld-musl-i386.path "${DESTDIR}/etc" - - # Re-add /bin and /lib symlinks here so that binary package - # is self-contained and usable outside live-bootstrap - ln --symbolic --relative "${DESTDIR}/${PREFIX}/lib" "${DESTDIR}/lib" - ln --symbolic --relative "${DESTDIR}/${PREFIX}/bin" "${DESTDIR}/bin" } src_postprocess() { diff --git a/steps/musl-1.2.4/patches-pass2/.keep b/steps/musl-1.2.4/patches-pass2/.keep new file mode 100644 index 0000000..e69de29 diff --git a/steps/musl-1.2.4/patches-pass3 b/steps/musl-1.2.4/patches-pass3 new file mode 120000 index 0000000..e003eed --- /dev/null +++ b/steps/musl-1.2.4/patches-pass3 @@ -0,0 +1 @@ +patches-pass2 \ No newline at end of file diff --git a/sysa/musl-1.2.4/patches/avoid_set_thread_area.patch b/steps/musl-1.2.4/patches/avoid_set_thread_area.patch similarity index 100% rename from sysa/musl-1.2.4/patches/avoid_set_thread_area.patch rename to steps/musl-1.2.4/patches/avoid_set_thread_area.patch diff --git a/sysa/musl-1.2.4/patches/avoid_sys_clone.patch b/steps/musl-1.2.4/patches/avoid_sys_clone.patch similarity index 100% rename from sysa/musl-1.2.4/patches/avoid_sys_clone.patch rename to steps/musl-1.2.4/patches/avoid_sys_clone.patch diff --git a/sysa/musl-1.2.4/sources b/steps/musl-1.2.4/sources similarity index 100% rename from sysa/musl-1.2.4/sources rename to steps/musl-1.2.4/sources diff --git a/sysc/openssl-1.1.1l/openssl-1.1.1l.sh b/steps/openssl-1.1.1l/pass1.sh similarity index 100% rename from sysc/openssl-1.1.1l/openssl-1.1.1l.sh rename to steps/openssl-1.1.1l/pass1.sh diff --git a/sysc/openssl-1.1.1l/sources b/steps/openssl-1.1.1l/sources similarity index 100% rename from sysc/openssl-1.1.1l/sources rename to steps/openssl-1.1.1l/sources diff --git a/sysa/patch-2.5.9/mk/main.mk b/steps/patch-2.5.9/mk/main.mk similarity index 100% rename from sysa/patch-2.5.9/mk/main.mk rename to steps/patch-2.5.9/mk/main.mk diff --git a/sysa/patch-2.5.9/patch-2.5.9.kaem b/steps/patch-2.5.9/pass1.kaem similarity index 100% rename from sysa/patch-2.5.9/patch-2.5.9.kaem rename to steps/patch-2.5.9/pass1.kaem diff --git a/sysa/patch-2.5.9/patch-2.5.9.checksums b/steps/patch-2.5.9/patch-2.5.9.checksums similarity index 100% rename from sysa/patch-2.5.9/patch-2.5.9.checksums rename to steps/patch-2.5.9/patch-2.5.9.checksums diff --git a/sysa/patch-2.5.9/sources b/steps/patch-2.5.9/sources similarity index 100% rename from sysa/patch-2.5.9/sources rename to steps/patch-2.5.9/sources diff --git a/sysc/patch-2.7.6/import-gnulib.sh b/steps/patch-2.7.6/import-gnulib.sh similarity index 100% rename from sysc/patch-2.7.6/import-gnulib.sh rename to steps/patch-2.7.6/import-gnulib.sh diff --git a/sysc/patch-2.7.6/patch-2.7.6.sh b/steps/patch-2.7.6/pass1.sh similarity index 100% rename from sysc/patch-2.7.6/patch-2.7.6.sh rename to steps/patch-2.7.6/pass1.sh diff --git a/sysc/patch-2.7.6/sources b/steps/patch-2.7.6/sources similarity index 100% rename from sysc/patch-2.7.6/sources rename to steps/patch-2.7.6/sources diff --git a/sysa/perl-5.000/files/config.h b/steps/perl-5.000/files/config.h similarity index 100% rename from sysa/perl-5.000/files/config.h rename to steps/perl-5.000/files/config.h diff --git a/sysa/perl-5.000/files/keywords.sh b/steps/perl-5.000/files/keywords.sh similarity index 100% rename from sysa/perl-5.000/files/keywords.sh rename to steps/perl-5.000/files/keywords.sh diff --git a/sysa/perl-5.000/files/opcode.awk b/steps/perl-5.000/files/opcode.awk similarity index 100% rename from sysa/perl-5.000/files/opcode.awk rename to steps/perl-5.000/files/opcode.awk diff --git a/sysa/perl-5.000/files/opcode.sh b/steps/perl-5.000/files/opcode.sh similarity index 100% rename from sysa/perl-5.000/files/opcode.sh rename to steps/perl-5.000/files/opcode.sh diff --git a/sysa/perl-5.000/mk/main.mk b/steps/perl-5.000/mk/main.mk similarity index 100% rename from sysa/perl-5.000/mk/main.mk rename to steps/perl-5.000/mk/main.mk diff --git a/sysa/perl-5.000/perl-5.000.sh b/steps/perl-5.000/pass1.sh similarity index 100% rename from sysa/perl-5.000/perl-5.000.sh rename to steps/perl-5.000/pass1.sh diff --git a/sysa/perl-5.000/sources b/steps/perl-5.000/sources similarity index 100% rename from sysa/perl-5.000/sources rename to steps/perl-5.000/sources diff --git a/sysa/perl-5.003/files/config.h b/steps/perl-5.003/files/config.h similarity index 100% rename from sysa/perl-5.003/files/config.h rename to steps/perl-5.003/files/config.h diff --git a/sysa/perl-5.003/mk/main.mk b/steps/perl-5.003/mk/main.mk similarity index 100% rename from sysa/perl-5.003/mk/main.mk rename to steps/perl-5.003/mk/main.mk diff --git a/sysa/perl-5.003/perl-5.003.sh b/steps/perl-5.003/pass1.sh similarity index 100% rename from sysa/perl-5.003/perl-5.003.sh rename to steps/perl-5.003/pass1.sh diff --git a/sysa/perl-5.003/sources b/steps/perl-5.003/sources similarity index 100% rename from sysa/perl-5.003/sources rename to steps/perl-5.003/sources diff --git a/sysc/perl-5.10.1/files/config.h b/steps/perl-5.10.1/files/config.h similarity index 100% rename from sysc/perl-5.10.1/files/config.h rename to steps/perl-5.10.1/files/config.h diff --git a/sysc/perl-5.10.1/files/config.sh b/steps/perl-5.10.1/files/config.sh similarity index 100% rename from sysc/perl-5.10.1/files/config.sh rename to steps/perl-5.10.1/files/config.sh diff --git a/sysc/perl-5.10.1/mk/main.mk b/steps/perl-5.10.1/mk/main.mk similarity index 100% rename from sysc/perl-5.10.1/mk/main.mk rename to steps/perl-5.10.1/mk/main.mk diff --git a/sysc/perl-5.10.1/perl-5.10.1.sh b/steps/perl-5.10.1/pass1.sh similarity index 100% rename from sysc/perl-5.10.1/perl-5.10.1.sh rename to steps/perl-5.10.1/pass1.sh diff --git a/sysc/perl-5.10.1/patches/undefined_hack.patch b/steps/perl-5.10.1/patches/undefined_hack.patch similarity index 100% rename from sysc/perl-5.10.1/patches/undefined_hack.patch rename to steps/perl-5.10.1/patches/undefined_hack.patch diff --git a/sysc/perl-5.10.1/sources b/steps/perl-5.10.1/sources similarity index 100% rename from sysc/perl-5.10.1/sources rename to steps/perl-5.10.1/sources diff --git a/sysc/perl-5.32.1/perl-5.32.1.sh b/steps/perl-5.32.1/pass1.sh similarity index 100% rename from sysc/perl-5.32.1/perl-5.32.1.sh rename to steps/perl-5.32.1/pass1.sh diff --git a/sysc/perl-5.32.1/patches/reproducibility.patch b/steps/perl-5.32.1/patches/reproducibility.patch similarity index 100% rename from sysc/perl-5.32.1/patches/reproducibility.patch rename to steps/perl-5.32.1/patches/reproducibility.patch diff --git a/sysc/perl-5.32.1/patches/reproducibility2.patch b/steps/perl-5.32.1/patches/reproducibility2.patch similarity index 100% rename from sysc/perl-5.32.1/patches/reproducibility2.patch rename to steps/perl-5.32.1/patches/reproducibility2.patch diff --git a/sysc/perl-5.32.1/sources b/steps/perl-5.32.1/sources similarity index 100% rename from sysc/perl-5.32.1/sources rename to steps/perl-5.32.1/sources diff --git a/sysa/perl-5.6.2/files/config.h b/steps/perl-5.6.2/files/config.h similarity index 100% rename from sysa/perl-5.6.2/files/config.h rename to steps/perl-5.6.2/files/config.h diff --git a/sysa/perl-5.6.2/files/config.sh b/steps/perl-5.6.2/files/config.sh similarity index 100% rename from sysa/perl-5.6.2/files/config.sh rename to steps/perl-5.6.2/files/config.sh diff --git a/sysa/perl-5.6.2/mk/main.mk b/steps/perl-5.6.2/mk/main.mk similarity index 100% rename from sysa/perl-5.6.2/mk/main.mk rename to steps/perl-5.6.2/mk/main.mk diff --git a/sysa/perl-5.6.2/perl-5.6.2.sh b/steps/perl-5.6.2/pass1.sh similarity index 100% rename from sysa/perl-5.6.2/perl-5.6.2.sh rename to steps/perl-5.6.2/pass1.sh diff --git a/sysa/perl-5.6.2/sources b/steps/perl-5.6.2/sources similarity index 100% rename from sysa/perl-5.6.2/sources rename to steps/perl-5.6.2/sources diff --git a/sysa/perl5.004-05/files/config.h b/steps/perl5.004-05/files/config.h similarity index 100% rename from sysa/perl5.004-05/files/config.h rename to steps/perl5.004-05/files/config.h diff --git a/sysa/perl5.004-05/mk/main.mk b/steps/perl5.004-05/mk/main.mk similarity index 100% rename from sysa/perl5.004-05/mk/main.mk rename to steps/perl5.004-05/mk/main.mk diff --git a/sysa/perl5.004-05/perl5.004-05.sh b/steps/perl5.004-05/pass1.sh similarity index 100% rename from sysa/perl5.004-05/perl5.004-05.sh rename to steps/perl5.004-05/pass1.sh diff --git a/sysa/perl5.004-05/sources b/steps/perl5.004-05/sources similarity index 100% rename from sysa/perl5.004-05/sources rename to steps/perl5.004-05/sources diff --git a/sysa/perl5.005-03/files/config.h b/steps/perl5.005-03/files/config.h similarity index 100% rename from sysa/perl5.005-03/files/config.h rename to steps/perl5.005-03/files/config.h diff --git a/sysa/perl5.005-03/mk/main.mk b/steps/perl5.005-03/mk/main.mk similarity index 100% rename from sysa/perl5.005-03/mk/main.mk rename to steps/perl5.005-03/mk/main.mk diff --git a/sysa/perl5.005-03/perl5.005-03.sh b/steps/perl5.005-03/pass1.sh similarity index 100% rename from sysa/perl5.005-03/perl5.005-03.sh rename to steps/perl5.005-03/pass1.sh diff --git a/sysa/perl5.005-03/sources b/steps/perl5.005-03/sources similarity index 100% rename from sysa/perl5.005-03/sources rename to steps/perl5.005-03/sources diff --git a/sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh b/steps/pkg-config-0.29.2/pass1.sh similarity index 100% rename from sysc/pkg-config-0.29.2/pkg-config-0.29.2.sh rename to steps/pkg-config-0.29.2/pass1.sh diff --git a/sysc/pkg-config-0.29.2/sources b/steps/pkg-config-0.29.2/sources similarity index 100% rename from sysc/pkg-config-0.29.2/sources rename to steps/pkg-config-0.29.2/sources diff --git a/steps/pre-network-sources b/steps/pre-network-sources new file mode 100644 index 0000000..8b54d0d --- /dev/null +++ b/steps/pre-network-sources @@ -0,0 +1,86 @@ +mes-0.25.tar.gz +nyacc-1.00.2.tar.gz +tcc-0.9.26.tar.gz +tcc-0.9.27.tar.bz2 +fiwix-1.4.0-lb3.tar.gz +lwext4-1.0.0-lb1.tar.gz +make-3.82.tar.bz2 +patch-2.5.9.tar.gz +gzip-1.2.4.tar.gz +tar-1.12.tar.gz +sed-4.0.9.tar.gz +bzip2-1.0.8.tar.gz +coreutils-5.0.tar.bz2 +heirloom-devtools-070527.tar.bz2 +bash-2.05b.tar.gz +flex-2.5.11.tar.gz +tcc-0.9.27.tar.bz2 +musl-1.1.24.tar.gz +tcc-0.9.27.tar.bz2 +musl-1.1.24.tar.gz +tcc-0.9.27.tar.bz2 +sed-4.0.9.tar.gz +bzip2-1.0.8.tar.gz +m4-1.4.7.tar.gz +flex-2.6.4.tar.gz +bison-3.4.1.tar.gz +bison-3.4.1.tar.gz +bison-3.4.1.tar.gz +grep-2.4.tar.gz +diffutils-2.7.tar.gz +coreutils-5.0.tar.bz2 +coreutils-6.10.tar.gz +gawk-3.0.4.tar.gz +perl-5.000.tar.gz +perl-5.003.tar.gz +perl5.004_05.tar.gz +perl5.005_03.tar.gz +perl-5.6.2.tar.gz +autoconf-2.52.tar.bz2 +automake-1.6.3.tar.bz2 +automake-1.6.3.tar.bz2 +autoconf-2.53.tar.bz2 +automake-1.7.tar.bz2 +autoconf-2.54.tar.bz2 +autoconf-2.55.tar.bz2 +automake-1.7.8.tar.bz2 +autoconf-2.57.tar.bz2 +autoconf-2.59.tar.bz2 +automake-1.8.5.tar.bz2 +help2man-1.36.4.tar.gz +autoconf-2.61.tar.bz2 +automake-1.9.6.tar.bz2 +automake-1.10.3.tar.bz2 +autoconf-2.64.tar.bz2 +automake-1.11.2.tar.bz2 +autoconf-2.69.tar.gz +libtool-2.2.4.tar.bz2 +automake-1.15.1.tar.gz +binutils-2.30.tar.bz2 +musl-1.1.24.tar.gz +tcc-0.9.27.tar.bz2 +gcc-core-4.0.4.tar.bz2 +automake-1.16.3.tar.gz +findutils-4.2.33.tar.gz +gnulib-8e128e.tar.gz +musl-1.2.4.tar.gz +gcc-core-4.0.4.tar.bz2 +automake-1.16.3.tar.gz +util-linux-2.19.1.tar.gz +e2fsprogs-1.45.7.tar.gz +CaseFolding.txt +DerivedAge.txt +DerivedCombiningClass.txt +DerivedCoreProperties.txt +NormalizationCorrections.txt +NormalizationTest.txt +UnicodeData.txt +v10.0.1.tar.gz +kbd-1.15.tar.gz +make-3.82.tar.bz2 +ed-1.4.tar.gz +bc-1.07.1.tar.gz +v2.0.22.tar.gz +linux-4.9.10.tar.gz +deblob-4.9 +curl-7.88.1.tar.bz2 diff --git a/sysc/python-2.0.1/files/disable-unicode.patch b/steps/python-2.0.1/files/disable-unicode.patch similarity index 100% rename from sysc/python-2.0.1/files/disable-unicode.patch rename to steps/python-2.0.1/files/disable-unicode.patch diff --git a/sysc/python-2.0.1/files/keyword.c b/steps/python-2.0.1/files/keyword.c similarity index 100% rename from sysc/python-2.0.1/files/keyword.c rename to steps/python-2.0.1/files/keyword.c diff --git a/sysc/python-2.0.1/files/token.c b/steps/python-2.0.1/files/token.c similarity index 100% rename from sysc/python-2.0.1/files/token.c rename to steps/python-2.0.1/files/token.c diff --git a/sysc/python-2.0.1/stage1.sh b/steps/python-2.0.1/pass1.sh similarity index 100% rename from sysc/python-2.0.1/stage1.sh rename to steps/python-2.0.1/pass1.sh diff --git a/sysc/python-2.0.1/stage2.sh b/steps/python-2.0.1/pass2.sh similarity index 100% rename from sysc/python-2.0.1/stage2.sh rename to steps/python-2.0.1/pass2.sh diff --git a/sysc/python-2.0.1/patches/destdir.patch b/steps/python-2.0.1/patches/destdir.patch similarity index 100% rename from sysc/python-2.0.1/patches/destdir.patch rename to steps/python-2.0.1/patches/destdir.patch diff --git a/sysc/python-2.0.1/patches/posixmodule.patch b/steps/python-2.0.1/patches/posixmodule.patch similarity index 100% rename from sysc/python-2.0.1/patches/posixmodule.patch rename to steps/python-2.0.1/patches/posixmodule.patch diff --git a/sysc/python-2.0.1/patches/undefs.patch b/steps/python-2.0.1/patches/undefs.patch similarity index 100% rename from sysc/python-2.0.1/patches/undefs.patch rename to steps/python-2.0.1/patches/undefs.patch diff --git a/sysc/python-2.0.1/sources b/steps/python-2.0.1/sources similarity index 100% rename from sysc/python-2.0.1/sources rename to steps/python-2.0.1/sources diff --git a/sysc/python-2.3.7/files/disable-unicode.patch b/steps/python-2.3.7/files/disable-unicode.patch similarity index 100% rename from sysc/python-2.3.7/files/disable-unicode.patch rename to steps/python-2.3.7/files/disable-unicode.patch diff --git a/sysc/python-2.3.7/stage1.sh b/steps/python-2.3.7/pass1.sh similarity index 100% rename from sysc/python-2.3.7/stage1.sh rename to steps/python-2.3.7/pass1.sh diff --git a/sysc/python-2.3.7/stage2.sh b/steps/python-2.3.7/pass2.sh similarity index 100% rename from sysc/python-2.3.7/stage2.sh rename to steps/python-2.3.7/pass2.sh diff --git a/sysc/python-2.3.7/patches/posixmodule.patch b/steps/python-2.3.7/patches/posixmodule.patch similarity index 100% rename from sysc/python-2.3.7/patches/posixmodule.patch rename to steps/python-2.3.7/patches/posixmodule.patch diff --git a/sysc/python-2.3.7/sources b/steps/python-2.3.7/sources similarity index 100% rename from sysc/python-2.3.7/sources rename to steps/python-2.3.7/sources diff --git a/sysc/python-2.5.6/files/graminit-regen.patch b/steps/python-2.5.6/files/graminit-regen.patch similarity index 100% rename from sysc/python-2.5.6/files/graminit-regen.patch rename to steps/python-2.5.6/files/graminit-regen.patch diff --git a/sysc/python-2.5.6/python-2.5.6.sh b/steps/python-2.5.6/pass1.sh similarity index 100% rename from sysc/python-2.5.6/python-2.5.6.sh rename to steps/python-2.5.6/pass1.sh diff --git a/sysc/python-2.5.6/patches/keyword.patch b/steps/python-2.5.6/patches/keyword.patch similarity index 100% rename from sysc/python-2.5.6/patches/keyword.patch rename to steps/python-2.5.6/patches/keyword.patch diff --git a/sysc/python-2.5.6/patches/pgen-timestamp.patch b/steps/python-2.5.6/patches/pgen-timestamp.patch similarity index 100% rename from sysc/python-2.5.6/patches/pgen-timestamp.patch rename to steps/python-2.5.6/patches/pgen-timestamp.patch diff --git a/sysc/python-2.5.6/patches/posixmodule.patch b/steps/python-2.5.6/patches/posixmodule.patch similarity index 100% rename from sysc/python-2.5.6/patches/posixmodule.patch rename to steps/python-2.5.6/patches/posixmodule.patch diff --git a/sysc/python-2.5.6/patches/sorted.patch b/steps/python-2.5.6/patches/sorted.patch similarity index 100% rename from sysc/python-2.5.6/patches/sorted.patch rename to steps/python-2.5.6/patches/sorted.patch diff --git a/sysc/python-2.5.6/patches/sre_constants.patch b/steps/python-2.5.6/patches/sre_constants.patch similarity index 100% rename from sysc/python-2.5.6/patches/sre_constants.patch rename to steps/python-2.5.6/patches/sre_constants.patch diff --git a/sysc/python-2.5.6/sources b/steps/python-2.5.6/sources similarity index 100% rename from sysc/python-2.5.6/sources rename to steps/python-2.5.6/sources diff --git a/sysc/python-3.1.5/files/graminit-regen.patch b/steps/python-3.1.5/files/graminit-regen.patch similarity index 100% rename from sysc/python-3.1.5/files/graminit-regen.patch rename to steps/python-3.1.5/files/graminit-regen.patch diff --git a/sysc/python-3.1.5/files/py2.patch b/steps/python-3.1.5/files/py2.patch similarity index 100% rename from sysc/python-3.1.5/files/py2.patch rename to steps/python-3.1.5/files/py2.patch diff --git a/sysc/python-3.1.5/stage1.sh b/steps/python-3.1.5/pass1.sh similarity index 100% rename from sysc/python-3.1.5/stage1.sh rename to steps/python-3.1.5/pass1.sh diff --git a/sysc/python-3.1.5/stage2.sh b/steps/python-3.1.5/pass2.sh similarity index 100% rename from sysc/python-3.1.5/stage2.sh rename to steps/python-3.1.5/pass2.sh diff --git a/sysc/python-3.1.5/patches/install-perms.patch b/steps/python-3.1.5/patches/install-perms.patch similarity index 100% rename from sysc/python-3.1.5/patches/install-perms.patch rename to steps/python-3.1.5/patches/install-perms.patch diff --git a/sysc/python-3.1.5/patches/openssl.patch b/steps/python-3.1.5/patches/openssl.patch similarity index 100% rename from sysc/python-3.1.5/patches/openssl.patch rename to steps/python-3.1.5/patches/openssl.patch diff --git a/sysc/python-3.1.5/patches/posixmodule.patch b/steps/python-3.1.5/patches/posixmodule.patch similarity index 100% rename from sysc/python-3.1.5/patches/posixmodule.patch rename to steps/python-3.1.5/patches/posixmodule.patch diff --git a/sysc/python-3.1.5/sources b/steps/python-3.1.5/sources similarity index 100% rename from sysc/python-3.1.5/sources rename to steps/python-3.1.5/sources diff --git a/sysc/python-3.11.1/files/Setup.local b/steps/python-3.11.1/files/Setup.local similarity index 100% rename from sysc/python-3.11.1/files/Setup.local rename to steps/python-3.11.1/files/Setup.local diff --git a/sysc/python-3.11.1/python-3.11.1.sh b/steps/python-3.11.1/pass1.sh similarity index 100% rename from sysc/python-3.11.1/python-3.11.1.sh rename to steps/python-3.11.1/pass1.sh diff --git a/sysc/python-3.11.1/patches/empty-date.patch b/steps/python-3.11.1/patches/empty-date.patch similarity index 100% rename from sysc/python-3.11.1/patches/empty-date.patch rename to steps/python-3.11.1/patches/empty-date.patch diff --git a/sysc/python-3.11.1/patches/multiarch.patch b/steps/python-3.11.1/patches/multiarch.patch similarity index 100% rename from sysc/python-3.11.1/patches/multiarch.patch rename to steps/python-3.11.1/patches/multiarch.patch diff --git a/sysc/python-3.11.1/sources b/steps/python-3.11.1/sources similarity index 100% rename from sysc/python-3.11.1/sources rename to steps/python-3.11.1/sources diff --git a/sysc/python-3.3.7/python-3.3.7.sh b/steps/python-3.3.7/pass1.sh similarity index 100% rename from sysc/python-3.3.7/python-3.3.7.sh rename to steps/python-3.3.7/pass1.sh diff --git a/sysc/python-3.3.7/patches/install-perms.patch b/steps/python-3.3.7/patches/install-perms.patch similarity index 100% rename from sysc/python-3.3.7/patches/install-perms.patch rename to steps/python-3.3.7/patches/install-perms.patch diff --git a/sysc/python-3.3.7/patches/symbol.patch b/steps/python-3.3.7/patches/symbol.patch similarity index 100% rename from sysc/python-3.3.7/patches/symbol.patch rename to steps/python-3.3.7/patches/symbol.patch diff --git a/sysc/python-3.3.7/sources b/steps/python-3.3.7/sources similarity index 100% rename from sysc/python-3.3.7/sources rename to steps/python-3.3.7/sources diff --git a/sysc/python-3.4.10/python-3.4.10.sh b/steps/python-3.4.10/pass1.sh similarity index 100% rename from sysc/python-3.4.10/python-3.4.10.sh rename to steps/python-3.4.10/pass1.sh diff --git a/sysc/python-3.4.10/patches/install-perms.patch b/steps/python-3.4.10/patches/install-perms.patch similarity index 100% rename from sysc/python-3.4.10/patches/install-perms.patch rename to steps/python-3.4.10/patches/install-perms.patch diff --git a/sysc/python-3.4.10/patches/symbol.patch b/steps/python-3.4.10/patches/symbol.patch similarity index 100% rename from sysc/python-3.4.10/patches/symbol.patch rename to steps/python-3.4.10/patches/symbol.patch diff --git a/sysc/python-3.4.10/sources b/steps/python-3.4.10/sources similarity index 100% rename from sysc/python-3.4.10/sources rename to steps/python-3.4.10/sources diff --git a/sysc/python-3.8.16/python-3.8.16.sh b/steps/python-3.8.16/pass1.sh similarity index 100% rename from sysc/python-3.8.16/python-3.8.16.sh rename to steps/python-3.8.16/pass1.sh diff --git a/sysc/python-3.8.16/patches/empty-date.patch b/steps/python-3.8.16/patches/empty-date.patch similarity index 100% rename from sysc/python-3.8.16/patches/empty-date.patch rename to steps/python-3.8.16/patches/empty-date.patch diff --git a/sysc/python-3.8.16/patches/maxgroups.patch b/steps/python-3.8.16/patches/maxgroups.patch similarity index 100% rename from sysc/python-3.8.16/patches/maxgroups.patch rename to steps/python-3.8.16/patches/maxgroups.patch diff --git a/sysc/python-3.8.16/patches/refractor.patch b/steps/python-3.8.16/patches/refractor.patch similarity index 100% rename from sysc/python-3.8.16/patches/refractor.patch rename to steps/python-3.8.16/patches/refractor.patch diff --git a/sysc/python-3.8.16/sources b/steps/python-3.8.16/sources similarity index 100% rename from sysc/python-3.8.16/sources rename to steps/python-3.8.16/sources diff --git a/sysa/sed-4.0.9/mk/main.mk b/steps/sed-4.0.9/mk/main.mk similarity index 100% rename from sysa/sed-4.0.9/mk/main.mk rename to steps/sed-4.0.9/mk/main.mk diff --git a/sysa/sed-4.0.9/sed-4.0.9.kaem b/steps/sed-4.0.9/pass1.kaem similarity index 100% rename from sysa/sed-4.0.9/sed-4.0.9.kaem rename to steps/sed-4.0.9/pass1.kaem diff --git a/sysa/sed-4.0.9/sed-4.0.9.sh b/steps/sed-4.0.9/pass2.sh similarity index 100% rename from sysa/sed-4.0.9/sed-4.0.9.sh rename to steps/sed-4.0.9/pass2.sh diff --git a/sysa/sed-4.0.9/sed-4.0.9.checksums b/steps/sed-4.0.9/sed-4.0.9.checksums similarity index 100% rename from sysa/sed-4.0.9/sed-4.0.9.checksums rename to steps/sed-4.0.9/sed-4.0.9.checksums diff --git a/sysa/sed-4.0.9/sources b/steps/sed-4.0.9/sources similarity index 100% rename from sysa/sed-4.0.9/sources rename to steps/sed-4.0.9/sources diff --git a/sysc/sed-4.8/import-gnulib.sh b/steps/sed-4.8/import-gnulib.sh similarity index 100% rename from sysc/sed-4.8/import-gnulib.sh rename to steps/sed-4.8/import-gnulib.sh diff --git a/sysc/sed-4.8/sed-4.8.sh b/steps/sed-4.8/pass1.sh similarity index 100% rename from sysc/sed-4.8/sed-4.8.sh rename to steps/sed-4.8/pass1.sh diff --git a/sysc/sed-4.8/sources b/steps/sed-4.8/sources similarity index 100% rename from sysc/sed-4.8/sources rename to steps/sed-4.8/sources diff --git a/sysa/simple-patch-1.0/simple-patch-1.0.kaem b/steps/simple-patch-1.0/pass1.kaem similarity index 100% rename from sysa/simple-patch-1.0/simple-patch-1.0.kaem rename to steps/simple-patch-1.0/pass1.kaem diff --git a/sysa/simple-patch-1.0/simple-patch-1.0.x86.checksums b/steps/simple-patch-1.0/simple-patch-1.0.x86.checksums similarity index 100% rename from sysa/simple-patch-1.0/simple-patch-1.0.x86.checksums rename to steps/simple-patch-1.0/simple-patch-1.0.x86.checksums diff --git a/sysa/simple-patch-1.0/src/simple-patch.c b/steps/simple-patch-1.0/src/simple-patch.c similarity index 100% rename from sysa/simple-patch-1.0/src/simple-patch.c rename to steps/simple-patch-1.0/src/simple-patch.c diff --git a/sysa/tar-1.12/files/getdate_stub.c b/steps/tar-1.12/files/getdate_stub.c similarity index 100% rename from sysa/tar-1.12/files/getdate_stub.c rename to steps/tar-1.12/files/getdate_stub.c diff --git a/sysa/tar-1.12/files/stat_override.c b/steps/tar-1.12/files/stat_override.c similarity index 100% rename from sysa/tar-1.12/files/stat_override.c rename to steps/tar-1.12/files/stat_override.c diff --git a/sysa/tar-1.12/mk/main.mk b/steps/tar-1.12/mk/main.mk similarity index 100% rename from sysa/tar-1.12/mk/main.mk rename to steps/tar-1.12/mk/main.mk diff --git a/sysa/tar-1.12/tar-1.12.kaem b/steps/tar-1.12/pass1.kaem similarity index 100% rename from sysa/tar-1.12/tar-1.12.kaem rename to steps/tar-1.12/pass1.kaem diff --git a/sysa/tar-1.12/sources b/steps/tar-1.12/sources similarity index 100% rename from sysa/tar-1.12/sources rename to steps/tar-1.12/sources diff --git a/sysa/tar-1.12/tar-1.12.checksums b/steps/tar-1.12/tar-1.12.checksums similarity index 100% rename from sysa/tar-1.12/tar-1.12.checksums rename to steps/tar-1.12/tar-1.12.checksums diff --git a/sysc/tar-1.34/import-gnulib.sh b/steps/tar-1.34/import-gnulib.sh similarity index 100% rename from sysc/tar-1.34/import-gnulib.sh rename to steps/tar-1.34/import-gnulib.sh diff --git a/sysc/tar-1.34/tar-1.34.sh b/steps/tar-1.34/pass1.sh similarity index 100% rename from sysc/tar-1.34/tar-1.34.sh rename to steps/tar-1.34/pass1.sh diff --git a/sysc/tar-1.34/sources b/steps/tar-1.34/sources similarity index 100% rename from sysc/tar-1.34/sources rename to steps/tar-1.34/sources diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.kaem b/steps/tcc-0.9.26/pass1.kaem similarity index 99% rename from sysa/tcc-0.9.26/tcc-0.9.26.kaem rename to steps/tcc-0.9.26/pass1.kaem index b2b5a78..be93e55 100755 --- a/sysa/tcc-0.9.26/tcc-0.9.26.kaem +++ b/steps/tcc-0.9.26/pass1.kaem @@ -39,7 +39,7 @@ simple-patch ${TCC_PKG}/tcctools.c \ untar --non-strict --file ../src/${MES_PKG}.tar # Create config.h -catm ${MES_PKG_DIR}/include/mes/config.h +catm ${MES_PKG}/include/mes/config.h catm ${TCC_PKG}/config.h cd ${TCC_PKG} @@ -171,7 +171,7 @@ tcc-mes \ # Install cp tcc-boot0 ${BINDIR}/ chmod 755 ${BINDIR}/tcc-boot0 -cd ../${MES_PKG_DIR} +cd ../${MES_PKG} # Recompile libc: crt{1,n,i}, libtcc.a, libc.a tcc-boot0 -c -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} -o ${LIBDIR}/crt1.o lib/linux/${MES_ARCH}-mes-${MES_LIBC_SUFFIX}/crt1.c if match ${ARCH} x86; then @@ -224,7 +224,7 @@ tcc-boot0 \ tcc.c cp tcc-boot1 ${BINDIR} chmod 755 ${BINDIR}/tcc-boot1 -cd ../${MES_PKG_DIR} +cd ../${MES_PKG} tcc-boot1 -c -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} -o ${LIBDIR}/crt1.o lib/linux/${MES_ARCH}-mes-${MES_LIBC_SUFFIX}/crt1.c if match ${ARCH} x86; then tcc-boot1 -c -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} -o ${LIBDIR}/crtn.o lib/linux/${MES_ARCH}-mes-gcc/crtn.c @@ -276,7 +276,7 @@ tcc-boot1 \ tcc.c cp tcc-boot2 ${BINDIR} chmod 755 ${BINDIR}/tcc-boot2 -cd ../${MES_PKG_DIR} +cd ../${MES_PKG} tcc-boot2 -c -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} -o ${LIBDIR}/crt1.o lib/linux/${MES_ARCH}-mes-${MES_LIBC_SUFFIX}/crt1.c if match ${ARCH} x86; then tcc-boot2 -c -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} -o ${LIBDIR}/crtn.o lib/linux/${MES_ARCH}-mes-gcc/crtn.c @@ -307,7 +307,7 @@ chmod 755 ${BINDIR}/tcc-0.9.26 # Also recompile getopt, we don't need to do this during the boot* stages # because nothing is linked against it -cd ../${MES_PKG_DIR} +cd ../${MES_PKG} tcc -c -D HAVE_CONFIG_H=1 -I include -I include/linux/${MES_ARCH} lib/posix/getopt.c tcc -ar cr ${LIBDIR}/libgetopt.a getopt.o diff --git a/sysa/tcc-0.9.26/simple-patches/addback-fileopen.after b/steps/tcc-0.9.26/simple-patches/addback-fileopen.after similarity index 100% rename from sysa/tcc-0.9.26/simple-patches/addback-fileopen.after rename to steps/tcc-0.9.26/simple-patches/addback-fileopen.after diff --git a/sysa/tcc-0.9.26/simple-patches/addback-fileopen.before b/steps/tcc-0.9.26/simple-patches/addback-fileopen.before similarity index 100% rename from sysa/tcc-0.9.26/simple-patches/addback-fileopen.before rename to steps/tcc-0.9.26/simple-patches/addback-fileopen.before diff --git a/sysa/tcc-0.9.26/simple-patches/remove-fileopen.after b/steps/tcc-0.9.26/simple-patches/remove-fileopen.after similarity index 100% rename from sysa/tcc-0.9.26/simple-patches/remove-fileopen.after rename to steps/tcc-0.9.26/simple-patches/remove-fileopen.after diff --git a/sysa/tcc-0.9.26/simple-patches/remove-fileopen.before b/steps/tcc-0.9.26/simple-patches/remove-fileopen.before similarity index 100% rename from sysa/tcc-0.9.26/simple-patches/remove-fileopen.before rename to steps/tcc-0.9.26/simple-patches/remove-fileopen.before diff --git a/sysa/tcc-0.9.26/sources b/steps/tcc-0.9.26/sources similarity index 100% rename from sysa/tcc-0.9.26/sources rename to steps/tcc-0.9.26/sources diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.riscv64.checksums b/steps/tcc-0.9.26/tcc-0.9.26.riscv64.checksums similarity index 100% rename from sysa/tcc-0.9.26/tcc-0.9.26.riscv64.checksums rename to steps/tcc-0.9.26/tcc-0.9.26.riscv64.checksums diff --git a/sysa/tcc-0.9.26/tcc-0.9.26.x86.checksums b/steps/tcc-0.9.26/tcc-0.9.26.x86.checksums similarity index 100% rename from sysa/tcc-0.9.26/tcc-0.9.26.x86.checksums rename to steps/tcc-0.9.26/tcc-0.9.26.x86.checksums diff --git a/sysa/tcc-0.9.27/tcc-0.9.27.kaem b/steps/tcc-0.9.27/pass1.kaem similarity index 100% rename from sysa/tcc-0.9.27/tcc-0.9.27.kaem rename to steps/tcc-0.9.27/pass1.kaem diff --git a/sysa/tcc-0.9.27/tcc-mes-pass2.sh b/steps/tcc-0.9.27/pass2.sh similarity index 100% rename from sysa/tcc-0.9.27/tcc-mes-pass2.sh rename to steps/tcc-0.9.27/pass2.sh diff --git a/sysa/tcc-0.9.27/tcc-musl-pass1.sh b/steps/tcc-0.9.27/pass3.sh similarity index 100% rename from sysa/tcc-0.9.27/tcc-musl-pass1.sh rename to steps/tcc-0.9.27/pass3.sh diff --git a/sysa/tcc-0.9.27/tcc-musl-pass2.sh b/steps/tcc-0.9.27/pass4.sh similarity index 100% rename from sysa/tcc-0.9.27/tcc-musl-pass2.sh rename to steps/tcc-0.9.27/pass4.sh diff --git a/sysa/tcc-0.9.27/tcc-musl-pass3.sh b/steps/tcc-0.9.27/pass5.sh similarity index 100% rename from sysa/tcc-0.9.27/tcc-musl-pass3.sh rename to steps/tcc-0.9.27/pass5.sh diff --git a/sysa/tcc-0.9.27/patches-musl-pass3/ignore-static-inside-array.patch b/steps/tcc-0.9.27/patches-pass5/ignore-static-inside-array.patch similarity index 100% rename from sysa/tcc-0.9.27/patches-musl-pass3/ignore-static-inside-array.patch rename to steps/tcc-0.9.27/patches-pass5/ignore-static-inside-array.patch diff --git a/sysa/tcc-0.9.27/patches-musl-pass3/static-link.patch b/steps/tcc-0.9.27/patches-pass5/static-link.patch similarity index 100% rename from sysa/tcc-0.9.27/patches-musl-pass3/static-link.patch rename to steps/tcc-0.9.27/patches-pass5/static-link.patch diff --git a/sysa/tcc-0.9.27/patches/ignore-duplicate-symbols.patch b/steps/tcc-0.9.27/patches/ignore-duplicate-symbols.patch similarity index 100% rename from sysa/tcc-0.9.27/patches/ignore-duplicate-symbols.patch rename to steps/tcc-0.9.27/patches/ignore-duplicate-symbols.patch diff --git a/sysa/tcc-0.9.27/patches/ignore-static-inside-array.patch b/steps/tcc-0.9.27/patches/ignore-static-inside-array.patch similarity index 100% rename from sysa/tcc-0.9.27/patches/ignore-static-inside-array.patch rename to steps/tcc-0.9.27/patches/ignore-static-inside-array.patch diff --git a/sysa/tcc-0.9.27/patches/static-link.patch b/steps/tcc-0.9.27/patches/static-link.patch similarity index 100% rename from sysa/tcc-0.9.27/patches/static-link.patch rename to steps/tcc-0.9.27/patches/static-link.patch diff --git a/sysa/tcc-0.9.27/simple-patches/addback-fileopen.after b/steps/tcc-0.9.27/simple-patches/addback-fileopen.after similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/addback-fileopen.after rename to steps/tcc-0.9.27/simple-patches/addback-fileopen.after diff --git a/sysa/tcc-0.9.27/simple-patches/addback-fileopen.before b/steps/tcc-0.9.27/simple-patches/addback-fileopen.before similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/addback-fileopen.before rename to steps/tcc-0.9.27/simple-patches/addback-fileopen.before diff --git a/sysa/tcc-0.9.27/simple-patches/check-reloc-null.after b/steps/tcc-0.9.27/simple-patches/check-reloc-null.after similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/check-reloc-null.after rename to steps/tcc-0.9.27/simple-patches/check-reloc-null.after diff --git a/sysa/tcc-0.9.27/simple-patches/check-reloc-null.before b/steps/tcc-0.9.27/simple-patches/check-reloc-null.before similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/check-reloc-null.before rename to steps/tcc-0.9.27/simple-patches/check-reloc-null.before diff --git a/sysa/tcc-0.9.27/simple-patches/fiwix-paddr.after b/steps/tcc-0.9.27/simple-patches/fiwix-paddr.after similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/fiwix-paddr.after rename to steps/tcc-0.9.27/simple-patches/fiwix-paddr.after diff --git a/sysa/tcc-0.9.27/simple-patches/fiwix-paddr.before b/steps/tcc-0.9.27/simple-patches/fiwix-paddr.before similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/fiwix-paddr.before rename to steps/tcc-0.9.27/simple-patches/fiwix-paddr.before diff --git a/sysa/tcc-0.9.27/simple-patches/remove-fileopen.after b/steps/tcc-0.9.27/simple-patches/remove-fileopen.after similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/remove-fileopen.after rename to steps/tcc-0.9.27/simple-patches/remove-fileopen.after diff --git a/sysa/tcc-0.9.27/simple-patches/remove-fileopen.before b/steps/tcc-0.9.27/simple-patches/remove-fileopen.before similarity index 100% rename from sysa/tcc-0.9.27/simple-patches/remove-fileopen.before rename to steps/tcc-0.9.27/simple-patches/remove-fileopen.before diff --git a/sysa/tcc-0.9.27/sources b/steps/tcc-0.9.27/sources similarity index 100% rename from sysa/tcc-0.9.27/sources rename to steps/tcc-0.9.27/sources diff --git a/sysa/tcc-0.9.27/tcc-0.9.27.checksums b/steps/tcc-0.9.27/tcc-0.9.27.checksums similarity index 100% rename from sysa/tcc-0.9.27/tcc-0.9.27.checksums rename to steps/tcc-0.9.27/tcc-0.9.27.checksums diff --git a/sysc/texinfo-6.7/import-gnulib.sh b/steps/texinfo-6.7/import-gnulib.sh similarity index 100% rename from sysc/texinfo-6.7/import-gnulib.sh rename to steps/texinfo-6.7/import-gnulib.sh diff --git a/sysc/texinfo-6.7/texinfo-6.7.sh b/steps/texinfo-6.7/pass1.sh similarity index 100% rename from sysc/texinfo-6.7/texinfo-6.7.sh rename to steps/texinfo-6.7/pass1.sh diff --git a/sysc/texinfo-6.7/sources b/steps/texinfo-6.7/sources similarity index 100% rename from sysc/texinfo-6.7/sources rename to steps/texinfo-6.7/sources diff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/steps/util-linux-2.19.1/pass1.sh similarity index 100% rename from sysa/util-linux-2.19.1/util-linux-2.19.1.sh rename to steps/util-linux-2.19.1/pass1.sh diff --git a/sysa/util-linux-2.19.1/patches/broken-programs.patch b/steps/util-linux-2.19.1/patches/broken-programs.patch similarity index 100% rename from sysa/util-linux-2.19.1/patches/broken-programs.patch rename to steps/util-linux-2.19.1/patches/broken-programs.patch diff --git a/sysa/util-linux-2.19.1/patches/disable-tests.patch b/steps/util-linux-2.19.1/patches/disable-tests.patch similarity index 100% rename from sysa/util-linux-2.19.1/patches/disable-tests.patch rename to steps/util-linux-2.19.1/patches/disable-tests.patch diff --git a/sysa/util-linux-2.19.1/patches/headers-bsd.patch b/steps/util-linux-2.19.1/patches/headers-bsd.patch similarity index 100% rename from sysa/util-linux-2.19.1/patches/headers-bsd.patch rename to steps/util-linux-2.19.1/patches/headers-bsd.patch diff --git a/sysa/util-linux-2.19.1/patches/headers-gpl2.patch b/steps/util-linux-2.19.1/patches/headers-gpl2.patch similarity index 100% rename from sysa/util-linux-2.19.1/patches/headers-gpl2.patch rename to steps/util-linux-2.19.1/patches/headers-gpl2.patch diff --git a/sysa/util-linux-2.19.1/patches/headers.patch b/steps/util-linux-2.19.1/patches/headers.patch similarity index 100% rename from sysa/util-linux-2.19.1/patches/headers.patch rename to steps/util-linux-2.19.1/patches/headers.patch diff --git a/sysa/util-linux-2.19.1/patches/pkg-config.patch b/steps/util-linux-2.19.1/patches/pkg-config.patch similarity index 100% rename from sysa/util-linux-2.19.1/patches/pkg-config.patch rename to steps/util-linux-2.19.1/patches/pkg-config.patch diff --git a/sysa/util-linux-2.19.1/sources b/steps/util-linux-2.19.1/sources similarity index 100% rename from sysa/util-linux-2.19.1/sources rename to steps/util-linux-2.19.1/sources diff --git a/sysc/which-2.21/which-2.21.sh b/steps/which-2.21/pass1.sh similarity index 100% rename from sysc/which-2.21/which-2.21.sh rename to steps/which-2.21/pass1.sh diff --git a/sysc/which-2.21/sources b/steps/which-2.21/sources similarity index 100% rename from sysc/which-2.21/sources rename to steps/which-2.21/sources diff --git a/sysc/xz-5.4.1/xz-5.4.1.sh b/steps/xz-5.4.1/pass1.sh similarity index 100% rename from sysc/xz-5.4.1/xz-5.4.1.sh rename to steps/xz-5.4.1/pass1.sh diff --git a/sysc/xz-5.4.1/sources b/steps/xz-5.4.1/sources similarity index 100% rename from sysc/xz-5.4.1/sources rename to steps/xz-5.4.1/sources diff --git a/sysc/zlib-1.2.13/zlib-1.2.13.sh b/steps/zlib-1.2.13/pass1.sh similarity index 100% rename from sysc/zlib-1.2.13/zlib-1.2.13.sh rename to steps/zlib-1.2.13/pass1.sh diff --git a/sysc/zlib-1.2.13/sources b/steps/zlib-1.2.13/sources similarity index 100% rename from sysc/zlib-1.2.13/sources rename to steps/zlib-1.2.13/sources diff --git a/sysa/after2.kaem b/sysa/after2.kaem deleted file mode 100644 index 837935f..0000000 --- a/sysa/after2.kaem +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Richard Masters -# SPDX-License-Identifier: MIT - -PREFIX=/usr -BINDIR=${PREFIX}/bin - -PATH=${BINDIR} - -cd sysa - -catm run2-after-fiwix.kaem bootstrap.cfg run-after-fiwix.kaem -chmod 755 run2-after-fiwix.kaem - -kaem --file run2-after-fiwix.kaem diff --git a/sysa/base-preseeded.kaem b/sysa/base-preseeded.kaem deleted file mode 100644 index 6ff099d..0000000 --- a/sysa/base-preseeded.kaem +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2022 fosslinux -# -# SPDX-License-Identifier: GPL-3.0-or-later - -/usr/bin/kaem -f /sysa/after-preseeded.kaem diff --git a/sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt b/sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt deleted file mode 100644 index f023bf8..0000000 --- a/sysa/lwext4-1.0.0-lb1/files/early-artifacts-needed-after-fiwix.txt +++ /dev/null @@ -1,95 +0,0 @@ -# SPDX-FileCopyrightText: 2023 Richard Masters -# SPDX-License-Identifier: MIT -/usr/bin/blood-elf -/usr/bin/catm -/usr/bin/chmod -/usr/bin/get_machine -/usr/bin/hex2 -/usr/bin/kaem -/usr/bin/match -/usr/bin/M1 -/usr/bin/M2-Mesoplanet -/usr/bin/M2-Planet -/usr/bin/mkdir -/usr/bin/sha256sum -/usr/bin/unbz2 -/usr/bin/ungz -/usr/bin/untar -/usr/bin/cp -/usr/bin/replace -/usr/bin/rm -/usr/bin/checksum-transcriber -/usr/bin/tcc -/usr/bin/tcc-0.9.26 -/usr/bin/kexec-linux -/usr/lib/mes/libc.a -/usr/lib/mes/libgetopt.a -/usr/lib/mes/crt1.o -/usr/lib/mes/crti.o -/usr/lib/mes/crtn.o -/usr/lib/mes/tcc/libtcc1.a -/usr/include/mes/alloca.h -/usr/include/mes/argz.h -/usr/include/mes/ar.h -/usr/include/mes/assert.h -/usr/include/mes/ctype.h -/usr/include/mes/dirent.h -/usr/include/mes/dirstream.h -/usr/include/mes/dlfcn.h -/usr/include/mes/endian.h -/usr/include/mes/errno.h -/usr/include/mes/fcntl.h -/usr/include/mes/features.h -/usr/include/mes/float.h -/usr/include/mes/getopt.h -/usr/include/mes/grp.h -/usr/include/mes/inttypes.h -/usr/include/mes/libgen.h -/usr/include/mes/limits.h -/usr/include/mes/locale.h -/usr/include/mes/math.h -/usr/include/mes/memory.h -/usr/include/mes/pwd.h -/usr/include/mes/setjmp.h -/usr/include/mes/signal.h -/usr/include/mes/stdarg.h -/usr/include/mes/stdbool.h -/usr/include/mes/stddef.h -/usr/include/mes/stdint.h -/usr/include/mes/stdio.h -/usr/include/mes/stdlib.h -/usr/include/mes/stdnoreturn.h -/usr/include/mes/string.h -/usr/include/mes/strings.h -/usr/include/mes/termio.h -/usr/include/mes/time.h -/usr/include/mes/unistd.h -/usr/include/mes/arch/kernel-stat.h -/usr/include/mes/arch/syscall.h -/usr/include/mes/linux/syscall.h -/usr/include/mes/linux/x86/syscall.h -/usr/include/mes/mes/builtins.h -/usr/include/mes/mes/cc.h -/usr/include/mes/mes/config.h -/usr/include/mes/mes/constants.h -/usr/include/mes/mes/lib.h -/usr/include/mes/mes/lib-cc.h -/usr/include/mes/mes/lib-mini.h -/usr/include/mes/mes/mes.h -/usr/include/mes/mes/symbols.h -/usr/include/mes/sys/cdefs.h -/usr/include/mes/sys/dir.h -/usr/include/mes/sys/file.h -/usr/include/mes/sys/ioctl.h -/usr/include/mes/sys/mman.h -/usr/include/mes/sys/param.h -/usr/include/mes/sys/resource.h -/usr/include/mes/sys/select.h -/usr/include/mes/sys/stat.h -/usr/include/mes/sys/timeb.h -/usr/include/mes/sys/time.h -/usr/include/mes/sys/times.h -/usr/include/mes/sys/types.h -/usr/include/mes/sys/ucontext.h -/usr/include/mes/sys/user.h -/usr/include/mes/sys/wait.h diff --git a/sysa/run-after-fiwix.kaem b/sysa/run-after-fiwix.kaem deleted file mode 100755 index 7db3328..0000000 --- a/sysa/run-after-fiwix.kaem +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2021 Andrius Štikonas -# SPDX-FileCopyrightText: 2021 Paul Dersey -# SPDX-FileCopyrightText: 2020-2022 fosslinux -# SPDX-FileCopyrightText: 2022 Dor Askayo -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -ex - -ARCH_DIR="x86" -ARCH="x86" -ARCH_DIR="x86" -M2LIBC="M2libc" -TOOLS="${ARCH_DIR}/bin" -BLOOD_FLAG=" " -BASE_ADDRESS="0x08048000" -ENDIAN_FLAG="--little-endian" -BINDIR="${ARCH_DIR}/bin" -BUILDDIR="${ARCH_DIR}/artifact" - -sysa=/sysa -DISTFILES=/sysa/distfiles -PREFIX=/usr -BINDIR=${PREFIX}/bin -LIBDIR=${PREFIX}/lib/mes -INCDIR=${PREFIX}/include/mes -SRCDIR=${PREFIX}/src -TMPDIR=/tmp # tmpdir is needed for patch to work - -PATH=/usr/bin - -# make -pkg="make-3.82" -cd ${pkg} -kaem --file ${pkg}.kaem -cd .. - -# patch -pkg="patch-2.5.9" -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 .. - -# bzip2 -pkg="bzip2-1.0.8" -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 diff --git a/sysa/run.kaem b/sysa/run.kaem deleted file mode 100755 index e11b79b..0000000 --- a/sysa/run.kaem +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: 2021 Andrius Štikonas -# SPDX-FileCopyrightText: 2021 Paul Dersey -# SPDX-FileCopyrightText: 2020-2022 fosslinux -# SPDX-FileCopyrightText: 2022 Dor Askayo -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -ex - -M2LIBC_PATH=/M2libc - -# checksum-transcriber utility -pkg="checksum-transcriber-1.0" -cd ${pkg} -kaem --file ${pkg}.kaem -cd .. - -# simple patch tool based on before and after chunks -pkg="simple-patch-1.0" -cd ${pkg} -kaem --file ${pkg}.kaem -cd .. - -# Environmental variables needed for mes -NYACC_PKG=nyacc-1.00.2 -MES_VERSION=0.25 -MES_PKG=mes-${MES_VERSION} -MES_PKG_DIR=${MES_PKG} -MES_PREFIX=${sysa}/${MES_PKG}/build/${MES_PKG_DIR} -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 - -# tcc 0.9.27 -pkg="tcc-0.9.27" -cd ${pkg} -kaem --file ${pkg}.kaem -cd .. - -BUILD_FIWIX=False - -if match x${KERNEL_BOOTSTRAP} xTrue; then - BUILD_FIWIX=True -fi - -if match x${BUILD_KERNELS} xTrue; then - BUILD_FIWIX=True -fi - -if match x${BUILD_FIWIX} xTrue; then - # The Fiwix kernel - pkg="fiwix-1.4.0-lb3" - cd ${pkg} - kaem --verbose --file ${pkg}.kaem - cd .. - - # ext2 file system library for Fiwix - pkg="lwext4-1.0.0-lb1" - cd ${pkg} - kaem --verbose --file ${pkg}.kaem - cd .. - - # Live boot loader for Fiwix - pkg="kexec-fiwix-1.0" - cd ${pkg} - kaem --verbose --file ${pkg}.kaem - cd .. -fi - -if match x${KERNEL_BOOTSTRAP} xTrue; then - # Build the ext2 image - make_fiwix_initrd - - # Boot Fiwix - kexec-fiwix -else - exec kaem --verbose --file run-after-fiwix.kaem -fi diff --git a/sysa/run.sh b/sysa/run.sh deleted file mode 100755 index 3350397..0000000 --- a/sysa/run.sh +++ /dev/null @@ -1,188 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022 Andrius Štikonas -# SPDX-FileCopyrightText: 2021-22 fosslinux -# SPDX-FileCopyrightText: 2021 Paul Dersey -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e - -# shellcheck disable=SC2153 -LIBDIR="${PREFIX}/lib/mes" -# shellcheck disable=SC2154 -SOURCES="${sysa}" -DISTFILES="${sysa}/distfiles" -DESTDIR=/tmp/destdir - -# shellcheck source=sysa/helpers.sh -. helpers.sh - -if [ "${KERNEL_BOOTSTRAP}" ]; then - # Fiwix does not support SMP - MAKEJOBS="-j1" -else - MAKEJOBS="-j${JOBS}" -fi - -# Ask some questions -echo -echo "Now that bash has been built, there are potentially some questions for you!" -echo "To give your answer, type your answer, press Enter, and then Control-D." -echo - -ask_chroot() { - read -r CHROOT_STRING - if [ "${CHROOT_STRING}" = "yes" ] || [ "${CHROOT_STRING}" = "y" ]; then - CHROOT=True - elif [ "${CHROOT_STRING}" = "no" ] || [ "${CHROOT_STRING}" = "n" ]; then - CHROOT=False - else - echo "Invalid response. Please give a yes/no answer." - ask_chroot - fi -} - -if [ -z "${CHROOT}" ]; then - echo "Currently, it is unknown if live-bootstrap is running in a chroot" - echo "or not. Is it? (yes/no answer)" - ask_chroot - echo - - echo "CHROOT=${CHROOT}" >> "${SOURCES}/bootstrap.cfg" -fi - -ask_timestamps() { - read -r TIMESTAMPS_STRING - if [ "${TIMESTAMPS_STRING}" = "yes" ] || [ "${TIMESTAMPS_STRING}" = "y" ]; then - FORCE_TIMESTAMPS=True - elif [ "${TIMESTAMPS_STRING}" = "no" ] || [ "${TIMESTAMPS_STRING}" = "n" ]; then - FORCE_TIMESTAMPS=False - else - echo "Invalid response. Please give a yes/no answer." - ask_timestamps - fi -} - -if [ -z "${FORCE_TIMESTAMPS}" ]; then - echo "Would you like all timestamps to be set to unix time 0" - echo "(Jan 1 1970 00:00) at the end of the bootstrap? This makes a" - echo "fully reproducible disk image. (yes/no answer)" - ask_timestamps - echo - - echo "FORCE_TIMESTAMPS=${FORCE_TIMESTAMPS}" >> "${SOURCES}/bootstrap.cfg" -fi - -echo "Thank you! All done." - -echo "ARCH=${ARCH}" >> "${SOURCES}/bootstrap.cfg" - -mkdir -p "${DESTDIR}" "${SRCDIR}/repo" /dev - -build flex-2.5.11 - -# Rebuild tcc with some patches -build tcc-0.9.27 tcc-mes-pass2.sh - -# shellcheck disable=SC2034 -LIBDIR="${PREFIX}/lib/i386-unknown-linux-musl" - -build musl-1.1.24 - -# Rebuild tcc using musl -build tcc-0.9.27 tcc-musl-pass1.sh - -# Rebuild musl using tcc-musl -build musl-1.1.24 - -# Rebuild tcc-musl using new musl -build tcc-0.9.27 tcc-musl-pass2.sh - -# Rebuild sed using musl -build sed-4.0.9 sed-4.0.9.sh - -# Rebuild bzip2 using musl -build bzip2-1.0.8 bzip2-1.0.8.sh - -build m4-1.4.7 - -build flex-2.6.4 - -build bison-3.4.1 stage1.sh -build bison-3.4.1 stage2.sh -build bison-3.4.1 stage3.sh - -build grep-2.4 - -build diffutils-2.7 - -# Rebuild coreutils using musl -build coreutils-5.0 coreutils-5.0.sh patches-musl - -# Build only date, mktemp and sha256sum -build coreutils-6.10 - -build gawk-3.0.4 - -build perl-5.000 - -build perl-5.003 - -build perl5.004-05 '' '' perl5.004_05 - -build perl5.005-03 '' '' perl5.005_03 - -build perl-5.6.2 - -populate_device_nodes - -build autoconf-2.52 - -build automake-1.6.3 stage1.sh -build automake-1.6.3 stage2.sh - -build autoconf-2.53 - -build automake-1.7 - -build autoconf-2.54 - -build autoconf-2.55 - -build automake-1.7.8 - -build autoconf-2.57 - -build autoconf-2.59 - -build automake-1.8.5 - -build help2man-1.36.4 - -build autoconf-2.61 - -build automake-1.9.6 - -build automake-1.10.3 - -build autoconf-2.64 - -build automake-1.11.2 - -build autoconf-2.69 - -build libtool-2.2.4 - -cat > .env <<- EOF -export PATH=${PATH} -PREFIX=${PREFIX} -LIBDIR=${LIBDIR} -SOURCES=${SOURCES} -DESTDIR=${DESTDIR} -DISTFILES=${DISTFILES} -SRCDIR=${SRCDIR} -MAKEJOBS=${MAKEJOBS} -EOF - -exec env -i bash run2.sh diff --git a/sysa/run2.sh b/sysa/run2.sh deleted file mode 100755 index 986e097..0000000 --- a/sysa/run2.sh +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022 Andrius Štikonas -# SPDX-FileCopyrightText: 2021-22 fosslinux -# SPDX-FileCopyrightText: 2021 Paul Dersey -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e - -# shellcheck source=/dev/null -. .env - -# shellcheck source=sysa/helpers.sh -. helpers.sh - -create_sysb() { - # Copy everything in - echo "Creating sysb rootfs" - sys_transfer /sysb_image /sysb gzip patch - cp -rl /sysc /sysb_image/sysc_src - echo "Creating sysb initramfs" - gen_initramfs_list.sh -o "/boot/initramfs-sysb.cpio.gz" /sysb_image - rm -rf /sysb /sysb_image # Cleanup -} - -go_sysb() { - if [ "${KERNEL_BOOTSTRAP}" = True ]; then - kexec-linux "/dev/ram1" "/boot/linux-4.9.10" "/boot/initramfs-sysb.cpio.gz" - else - # Mount proc for kexec - mkdir /proc /etc - mount -t proc proc /proc - # kexec time - echo "Loading kernel + sysb initramfs using kexec" - if [ "${BARE_METAL}" = True ]; then - kexec -l "/boot/linux-4.9.10" \ - --initrd="/boot/initramfs-sysb.cpio.gz" \ - --append="init=/init" - else - kexec -l "/boot/linux-4.9.10" --console-serial \ - --initrd="/boot/initramfs-sysb.cpio.gz" \ - --append="init=/init console=ttyS0" - fi - echo "kexecing into sysb" - kexec -e - fi -} - -build automake-1.15.1 - -build binutils-2.30 - -# Build musl with fewer patches -build musl-1.1.24 binutils-rebuild.sh patches-pass3 - -# Rebuild tcc-musl using new musl -build tcc-0.9.27 tcc-musl-pass3.sh patches-musl-pass3 - -populate_device_nodes - -build gcc-4.0.4 pass1.sh - -build findutils-4.2.33 - -build musl-1.2.4 - -build linux-headers-4.9.10 '' '' linux-4.9.10 - -build gcc-4.0.4 pass2.sh - -build util-linux-2.19.1 - -build e2fsprogs-1.45.7 - -build dhcpcd-10.0.1 - -build kbd-1.15 - -build make-3.82 - -build ed-1.4 - -build bc-1.07.1 - -if [ "${CHROOT}" = False ] || [ "${BUILD_KERNELS}" = True ]; then - # Save because linux deletes all distfiles to save space - cp "${DISTFILES}"/musl-1.2.4.tar.gz "${SOURCES}"/musl-1.2.4 -fi - -mkdir -p /sysc/distfiles -cp "${DISTFILES}"/curl-7.88.1.tar.bz2 /sysc/distfiles - -# Clear up some RAM space -grep --no-filename '^build' "${SOURCES}"/run*.sh | grep -v musl-1.2.4 | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do - rm -rf "${SOURCES:?}/${p:?}" -done - -if [ "${CHROOT}" = False ] || [ "${BUILD_KERNELS}" = True ]; then - build kexec-linux-1.0.0 - - build kexec-tools-2.0.22 - - build linux-4.9.10 -fi - -build musl-1.2.4 '' no-patches - -if [ "${CHROOT}" = False ]; then - create_sysb - go_sysb -else - # In chroot mode transition directly into System C. - SYSC=/sysc_image - sys_transfer "${SYSC}" /sysc gzip patch - if [ "${CHROOT_ONLY_SYSA}" != True ]; then - exec chroot "${SYSC}" /init - fi -fi diff --git a/sysb/init b/sysb/init deleted file mode 100755 index 69204d8..0000000 --- a/sysb/init +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/bash - -# SPDX-FileCopyrightText: 2021-22 fosslinux -# SPDX-FileCopyrightText: 2022 Andrius Štikonas -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e - -PREFIX=/usr -SOURCES="${PREFIX}/src" - -export PATH="${PREFIX}/bin" - -# shellcheck source=sysa/helpers.sh -. /usr/src/helpers.sh - -echo -echo "Installing packages into sysb" - -install_tar() { - echo "${1}: installing package" - src_apply "$@" -} - -# Install needed packages. -install_tar coreutils-5.0 0 -install_tar sed-4.0.9 0 - -install_tar bzip2-1.0.8 0 -install_tar coreutils-6.10 0 -install_tar e2fsprogs-1.45.7 0 -install_tar grep-2.4 0 -install_tar kexec-tools-2.0.22 0 -install_tar util-linux-2.19.1 0 - -# Begin sysb bootstrapping process -cd "${SOURCES}" - -cat > .env <<- EOF -export PATH=${PATH} -PREFIX=${PREFIX} -SOURCES=${SOURCES} -EOF - -exec env -i bash run.sh diff --git a/sysb/run.sh b/sysb/run.sh deleted file mode 100755 index 653a66e..0000000 --- a/sysb/run.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/bash - -# SPDX-FileCopyrightText: 2021-22 fosslinux -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e - -# shellcheck source=/dev/null -. .env - -# shellcheck source=sysa/helpers.sh -. helpers.sh - -# Unload the current kernel before things go weird -kexec -u - -create_hdx() { - # Create all of the sd{a,b,c..} - minor=0 - alpha="a b c d e f g h i j k l m n o p" # 16 disks -- more than enough - # For each disk... - for a in ${alpha}; do - mknod -m 600 "/dev/sd${a}" b 8 "$((minor++))" - # For each partition... - for p in $(seq 15); do - mknod -m 600 "/dev/sd${a}${p}" b 8 "$((minor++))" - done - done -} - -# All the various structures that don't exist but needed to mount -mkdir -p /etc /dev -populate_device_nodes -create_hdx - -ask_disk() { - echo - echo "What disk would you like to use for live-bootstrap?" - echo "This disk may have pre-prepared sources on it." - echo "If there is no partition we will make one". - echo "Please provide in format sdxx (as you would find under /dev)," - echo "or sdx if it is a blank disk. An ext4 partition is expected on" - echo "existing disks." - echo "You can type 'list' to get a list of disks to help you figure" - echo "out which is the right disk." - echo "NO WARRANTY IS PROVIDED FOR BUGGY BEHAVIOUR, INCLUDING THAT" - echo "REGARDING DISKS & DATA." - echo - read -r DISK - - if [ "${DISK}" = "list" ]; then - fdisk -l - ask_disk - elif [ -z "${DISK}" ] || ! [ -e "/dev/${DISK}" ]; then - echo "Invalid." - ask_disk - fi -} - -if [ -z "${DISK}" ] || ! [ -e "/dev/${DISK}" ]; then - echo "You did not provide a valid disk in the configuration file." - ask_disk - - echo "DISK=${DISK}" >> /usr/src/bootstrap.cfg -fi - -# Is it a full disk, and not a partition? -# shellcheck disable=SC2012 -if [ $(($(ls -l "/dev/${DISK}" | sed "s/.*, *//" | sed "s/ .*//") % 8)) -eq 0 ]; then - echo "Creating partition table..." - echo ";" | sfdisk "/dev/${DISK}" - fdisk -l "/dev/${DISK}" - echo "Creating ext4 partition..." - mkfs.ext4 "/dev/${DISK}1" - DISK="${DISK}1" -fi -echo "DISK=${DISK}" >> /usr/src/bootstrap.cfg - -SYSC=/sysc - -# Otherwise, add stuff from sysa to sysb -echo "Mounting sysc" -mkdir /sysc -mount -t ext4 "/dev/${DISK}" /sysc - -# Copy over appropriate data -echo "Copying data into sysc" -sys_transfer "${SYSC}" /sysc_src gzip patch -sync - -# switch_root into sysc 1. for simplicity 2. to avoid kexecing again -# spouts a few errors because we don't have /proc /sys or /dev mounted -echo "Switching into sysc" -exec switch_root /sysc /init diff --git a/sysc.py b/sysc.py deleted file mode 100755 index e75a000..0000000 --- a/sysc.py +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env python3 -"""System C""" -# SPDX-License-Identifier: GPL-3.0-or-later -# SPDX-FileCopyrightText: 2022-2023 Dor Askayo -# SPDX-FileCopyrightText: 2021-23 fosslinux -# SPDX-FileCopyrightText: 2021 Andrius Štikonas - -import os - -from lib.utils import copytree -from lib.sysgeneral import SysGeneral - -# pylint: disable=consider-using-with -# pylint: disable=too-many-instance-attributes -class SysC(SysGeneral): - """ - Class responsible for preparing sources for System C. - """ - - git_dir = os.path.dirname(os.path.join(__file__)) - sys_dir = os.path.join(git_dir, 'sysc') - cache_dir = os.path.join(sys_dir, 'distfiles') - - def __init__(self, tmpdir, arch, external_sources): - self.arch = arch - self.external_sources = external_sources - self._tmpdir = tmpdir - - self.tmp_dir = tmpdir.add_sys("sysc") - - def prepare(self, create_disk_image): - """ - Prepare directory structure for System C. - """ - if create_disk_image: - self._tmpdir.add_disk("sysc") - - if self.external_sources: - if create_disk_image: - rootfs_dir = self._tmpdir.mount_disk("sysc", size="16G") - else: - rootfs_dir = self.tmp_dir - source_manifest = self.get_source_manifest() - self.get_packages(source_manifest) - - copytree(self.cache_dir, os.path.join(rootfs_dir, "distfiles")) - - if create_disk_image: - self._tmpdir.umount_disk("sysc") diff --git a/sysc/after.sh b/sysc/after.sh deleted file mode 100755 index e10e27b..0000000 --- a/sysc/after.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# SPDX-FileCopyrightText: 2022 Andrius Štikonas -# SPDX-License-Identifier: MIT - -# Replace this hook if you wish to do more -# Add Dev Nodes -# Disk Nodes -# 3 disks 3 partitions -major=0 -alpha="a b c" -# For each disk... -for a in ${alpha}; do - mknod -m 600 "/dev/sd${a}" b 8 "$((major*16))" - #For each partition do... - minor=1 - for p in $(seq 3); do - mknod -m 600 "/dev/sd${a}${p}" b 8 "$((major*16+minor++))" - done - ((major++)) -done -# NVME Nodes -# 3 NVME disk with 3 partitions -major=0 -# For each disk... -for a in $(seq 3); do - mknod -m 600 "/dev/nvme${a}" c 259 0 # NVME CHAR node - mknod -m 600 "/dev/nvme${a}n1" b 259 "$((major))" - ((major++)) - # For each partition... - for q in $(seq 3); do - mknod -m 600 "/dev/nvme${a}n1p${q}" b 259 "$((major++))" - done -done -# add cd-rom drive -mknod -m 600 /dev/sr0 b 11 0 -. /usr/src/.env -exec env - PATH="${PREFIX}/bin" PS1="\w # " bash -i diff --git a/sysc/curl-7.88.1/sources b/sysc/curl-7.88.1/sources deleted file mode 100644 index 7858eb9..0000000 --- a/sysc/curl-7.88.1/sources +++ /dev/null @@ -1 +0,0 @@ -https://curl.se/download/curl-7.88.1.tar.bz2 8224b45cce12abde039c12dc0711b7ea85b104b9ad534d6e4c5b4e188a61c907 diff --git a/sysc/init b/sysc/init deleted file mode 100755 index 8a8b99f..0000000 --- a/sysc/init +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/bash - -# SPDX-FileCopyrightText: 2022 Andrius Štikonas -# SPDX-FileCopyrightText: 2021-22 fosslinux -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e - -PREFIX=/usr -LIBDIR="${PREFIX}/lib/i386-unknown-linux-musl" -SOURCES="${PREFIX}/src" -DESTDIR=/tmp/destdir -DISTFILES=/distfiles -SRCDIR="${SOURCES}" - -export PATH="${PREFIX}/bin:${PREFIX}/sbin" -export HOME=/tmp -export SOURCE_DATE_EPOCH=0 - -# shellcheck source=sysa/helpers.sh -. "${SOURCES}/helpers.sh" - -MAKEJOBS="-j${JOBS}" - -echo -echo "Installing packages into sysc" - -install_tar() { - echo "${1}: installing package" - src_apply "$@" -} - -# Install packages. -# First two packages must be coreutils and sed - -install_tar coreutils-5.0 0 -install_tar sed-4.0.9 0 - -install_tar autoconf-2.64 0 -install_tar autoconf-2.69 0 -install_tar automake-1.11.2 0 -install_tar automake-1.15.1 0 -install_tar binutils-2.30 0 -install_tar bzip2-1.0.8 0 -install_tar bison-3.4.1 2 -install_tar coreutils-6.10 0 -install_tar dhcpcd-10.0.1 0 -install_tar diffutils-2.7 0 -install_tar findutils-4.2.33 0 -install_tar flex-2.6.4 0 -install_tar gawk-3.0.4 0 -install_tar gcc-4.0.4 1 -install_tar grep-2.4 0 -install_tar help2man-1.36.4 0 -install_tar libtool-2.2.4 0 -install_tar linux-headers-5.10.41 0 -install_tar m4-1.4.7 0 -install_tar make-3.82 0 -install_tar musl-1.2.4 1 -install_tar perl-5.6.2 0 -install_tar util-linux-2.19.1 0 - -# Fix invocation of bash from perl -ln -s /usr/bin/bash /usr/bin/sh - -# Begin sysc bootstrapping process -cd "${SOURCES}" - -cat > .env <<- EOF -export PATH=${PATH} -export HOME=${HOME} -export SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} -PREFIX=${PREFIX} -LIBDIR=${LIBDIR} -SOURCES=${SOURCES} -DESTDIR=${DESTDIR} -DISTFILES=${DISTFILES} -SRCDIR=${SRCDIR} -MAKEJOBS=${MAKEJOBS} -INTERNAL_CI=${INTERNAL_CI} -EOF - -exec env -i bash run.sh diff --git a/sysc/musl-1.2.4/sources b/sysc/musl-1.2.4/sources deleted file mode 100644 index 3c0a41b..0000000 --- a/sysc/musl-1.2.4/sources +++ /dev/null @@ -1 +0,0 @@ -https://musl.libc.org/releases/musl-1.2.4.tar.gz 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 diff --git a/sysc/run.sh b/sysc/run.sh deleted file mode 100755 index b15927a..0000000 --- a/sysc/run.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/bash - -# SPDX-FileCopyrightText: © 2023 fosslinux -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e - -# shellcheck source=/dev/null -. .env - -trap bash EXIT - -# shellcheck source=sysa/helpers.sh -. helpers.sh - -umask 0022 - -create_fhs() { - # Add the rest of the FHS that we will use and is not created pre-boot - rm -rf /sbin /usr/sbin - ln -s bin /usr/sbin # Hack to fix xbps (alternatively need to install which) - for d in bin lib sbin; do - ln -s "usr/${d}" "/${d}" - done - mkdir -p /etc /run /var - test -d /proc || (mkdir /proc && mount -t proc proc /proc) - test -d /sys || (mkdir /sys && mount -t sysfs sysfs /sys) - # Make /tmp a ramdisk (speeds up configure etc significantly) - test -d /tmp || (mkdir /tmp && mount -t tmpfs tmpfs /tmp) - # Add /etc/resolv.conf - echo 'nameserver 1.1.1.1' > /etc/resolv.conf -} - -create_fhs - -populate_device_nodes - -if [ -e "${SOURCES}/distfiles" ]; then - mv "${SOURCES}/distfiles" / -else - mkdir -p "${DISTFILES}" -fi - -build curl-7.88.1 pass1.sh - -# Obtain network connection -if [ "${CHROOT}" = "False" ]; then - dhcpcd --waitip=4 - # Ensure network accessible - timeout=120 - while ! curl example.com >/dev/null 2>&1; do - sleep 1 - # shellcheck disable=SC2219 - let timeout-- - if [ "${timeout}" -le 0 ]; then - echo "Timeout reached for internet to become accessible" - false - fi - done -fi - -build bash-5.2.15 - -exec env -i bash run2.sh diff --git a/sysc/run2.sh b/sysc/run2.sh deleted file mode 100755 index 431a383..0000000 --- a/sysc/run2.sh +++ /dev/null @@ -1,147 +0,0 @@ -#!/usr/bin/bash - -# SPDX-FileCopyrightText: 2022 Andrius Štikonas -# SPDX-FileCopyrightText: 2021-22 fosslinux -# SPDX-FileCopyrightText: 2021 Paul Dersey -# SPDX-FileCopyrightText: 2021 Melg Eight -# -# SPDX-License-Identifier: GPL-3.0-or-later - -set -e - -# shellcheck source=/dev/null -. .env - -# shellcheck disable=SC2153 -trap 'env - PATH=${PREFIX}/bin PS1="\w # " bash -i' EXIT - -# shellcheck source=sysa/helpers.sh -. helpers.sh - -build xz-5.4.1 - -build file-5.44 - -build libtool-2.4.7 - -build tar-1.34 - -build coreutils-8.32 - -build pkg-config-0.29.2 - -build make-4.2.1 - -build gmp-6.2.1 - -build autoconf-archive-2021.02.19 - -build mpfr-4.1.0 - -build mpc-1.2.1 - -build flex-2.5.33 - -build bison-2.3 - -build bison-3.4.2 - -build perl-5.10.1 - -build dist-3.5-236 - -build perl-5.32.1 - -build libarchive-3.5.2 - -build openssl-1.1.1l - -build ca-certificates-3.88.1 - -build curl-7.88.1 pass2.sh - -build zlib-1.2.13 - -build automake-1.16.3 - -build autoconf-2.71 - -build patch-2.7.6 - -build gettext-0.21 - -build texinfo-6.7 - -build gcc-4.7.4 - -build binutils-2.38 pass1.sh - -build gperf-3.1 - -build libunistring-0.9.10 - -build libffi-3.3 - -build libatomic_ops-7.6.10 - -build gc-8.0.4 - -build guile-3.0.9 - -build which-2.21 - -build grep-3.7 - -build sed-4.8 - -build autogen-5.18.16 autogen-5.18.16.sh - -build musl-1.2.4 - -build python-2.0.1 stage1.sh - -build python-2.0.1 stage2.sh - -build python-2.3.7 stage1.sh - -build python-2.3.7 stage2.sh - -build python-2.5.6 - -build python-3.1.5 stage1.sh - -build python-3.1.5 stage2.sh - -build python-3.3.7 - -build python-3.4.10 - -build python-3.8.16 - -build python-3.11.1 - -[ "${INTERNAL_CI}" = "pass2" ] && exit 0 - -build gcc-10.4.0 - -build binutils-2.38 pass2.sh - -build gcc-13.1.0 - -if [ "$FORCE_TIMESTAMPS" = True ] ; then - echo 'Forcing all files timestamps to be 0 unix time.' - canonicalise_all_files_timestamp -fi - -shopt -s extglob -if [ "$UPDATE_CHECKSUMS" = True ] ; then - pushd /usr/src/repo - sha256sum -- !(*-repodata) | tee "${SOURCES}/SHA256SUMS.pkgs" - popd -fi - -echo "Bootstrapping completed." - -cd "/" -exec env -i bash "${SOURCES}/after.sh" -