Variety of improvements

- Rename sources to distfiles for clarity. - Per sys(a/c) distfiles to reduce rootfs.py processing and reduce RAM usage in sysa. - Canonicalise early kaem mes/tcc files to kaem script conventions. - Cleanup unused setup in python.
2026-03-12 14:25:24 +01:00 · 2022-04-24 13:59:17 +10:00 · 2022-04-24 13:59:17 +10:00 · f1600467a7
commit f1600467a7
parent acf713595c
48 changed files with 130 additions and 138 deletions
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@ -45,13 +45,13 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.6.3
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.6.3_1.links
 fd3f08f1f36f01c60a58e673c22d24baf387753096252c6485a2c746fb5a59be  automake-1.6.3_1.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.6.3_2.links
-1f72ccf75607d5230edd45e87d7c193e4170f4496fb867f71dd8bbe06457cba5  automake-1.6.3_2.tar.bz2
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.7.8_0.links
-56b1db0695b9df345434d12affd890be0d2abf98e2ecc0a8db5610c2bdad5877  automake-1.7.8_0.tar.bz2
+5fd895eec36ee3af58e484ffd3423a36fe231b10154c588452f31141a7f25926  automake-1.6.3_2.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.7_0.links
 a2e3b4407bda56f88d78c4efed47fe6adff31e5869e4caa9c0d51bc228b03ae7  automake-1.7_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.7_1.links
 a2e3b4407bda56f88d78c4efed47fe6adff31e5869e4caa9c0d51bc228b03ae7  automake-1.7_1.tar.bz2
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.7.8_0.links
+56b1db0695b9df345434d12affd890be0d2abf98e2ecc0a8db5610c2bdad5877  automake-1.7.8_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.8.5_0.links
 4709bd37394a9ae54b3fd48af13a13027d9dd4b13d9b84262850078bf42f68ec  automake-1.8.5_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  automake-1.9.6_0.links
@ -73,7 +73,7 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  bison-3.4.1_2.
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  bison-3.4.2_0.links
 0146942b6d008d11c42d11141c2f80dbdbbf8472073db79d921bb516e20f9dcf  bison-3.4.2_0.tar.bz2
 07fee627dcf30aaa9beab40ffeacc3bec7afe3488d2fbc7e8a72ae782a85869a  bzip2-1.0.8_0.links
-d9a4b7f7b2d4113cd0c6aee962ec80f9af13acded0d796e9a3acac6af3eb2710  bzip2-1.0.8_0.tar.bz2
+2375ce2aefd97cb5d26d2c3bd0fa5f64cdce28304668dcb2918d2446c37362c2  bzip2-1.0.8_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  coreutils-5.0_0.links
 23adbf427dab824a9b63604ddd2226e5598ccccdaa33f6f8b723fb316b2f131b  coreutils-5.0_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  coreutils-6.10_0.links
@ -99,7 +99,7 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  gcc-4.0.4_0.li
 b6134fabf6f8eb98c63f0218281cc5fe0140094f0dc92415653b0de28e877ba0  gcc-4.0.4_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  gcc-4.0.4_1.links
 af372b5ecf41c9d9c10da58f845c5d0e32ac27e1c11f4e4a1a4a7f01fb9c71e1  gcc-4.0.4_1.tar.bz2
-3d012ad16221f6cd39d35158a5d483002d53e279eed0a4d6a1ad32bac4f2fd52  gcc-4.7.4_0.x86.xbps
+c2fd372b857146510db4dfc53455915702dac269e81fea1430a5e3ad6a9c614e  gcc-4.7.4_0.x86.xbps
 d5c08e8f48c78b9f96c38cdbcea321be57a4f5a7e8bf05c9bac5770550aab0ca  gettext-0.21_0.x86.xbps
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  gmp-6.2.1_0.links
 ddcc4d5e4a80855d1c59a22ad9d095be5b0ae828461f98bc1246093a797a83b4  gmp-6.2.1_0.tar.bz2
@ -153,16 +153,16 @@ e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl-5.000_0.l
 ed5a2422e430a4c445b0afc4bc4a0fcfd7de84b08206c8ceca106826500098bb  perl-5.000_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl-5.003_0.links
 9311682e86e847fe7a2fe5e68013b2643042b8409011fcb68cb8f187840cea4c  perl-5.003_0.tar.bz2
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl5.004-05_0.links
+e58538ab8f14a17941982165de8ea3ff57d402140b86583542af6ef5ab3e35ac  perl5.004-05_0.tar.bz2
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl5.005-03_0.links
+3247abde3ddced1efb1f418f4d03765f996503421d67a07bf21000f85f3f3309  perl5.005-03_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl-5.10.1_0.links
 0e216f189404be18ef7463665e9288258058b322f0636e9b9c19b5262af7980a  perl-5.10.1_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl-5.32.1_0.links
 9ed0a0c9ff88af07ea2cb2eea6367365da42a346a81b537f6e4a3dc80076953d  perl-5.32.1_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl-5.6.2_0.links
 7cbc4e4335fd3e25a24c94e4313c9426039efa28b0eb9eecb2b1e6e23c414ff3  perl-5.6.2_0.tar.bz2
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl5.004-05_0.links
-e58538ab8f14a17941982165de8ea3ff57d402140b86583542af6ef5ab3e35ac  perl5.004-05_0.tar.bz2
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  perl5.005-03_0.links
-3247abde3ddced1efb1f418f4d03765f996503421d67a07bf21000f85f3f3309  perl5.005-03_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  pkg-config-0.29.2_0.links
 f7d06f0ea85e8ede35ffdd0c37a8996803263ca8766905e5533f36d2258fddfa  pkg-config-0.29.2_0.tar.bz2
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  sed-4.0.9_0.links
@ -180,10 +180,9 @@ d353c17c187960f16e7944dd4bd1d4b45678ab230ba673ab596f9ce0e87755d1  tcc-0.9.27_3.t
 8cc08f90342fdbfac51c9d3d0219f2b5bbf54ef3272aa16c1cee28a97e281822  texinfo-6.7_0.x86.xbps
 970cc84444fecc225becb0db24671a186888a8a8d37daf3f40d827a907181a12  util-linux-2.19.1_0.links
 c5e290b56f7a148b874e148d41050660eaac62124aff8ec29f277a584c4ee672  util-linux-2.19.1_0.tar.bz2
-8a93bd58e2463eeb9ec1bf9b647dffee16e4d0d4d12067c82e4124aabd875710  x86-repodata
 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  xbps-0.59.1_0.links
-8ac1acb6db2cb2856630d48915f5f38a45aaa2ccb0709d19df60477bcb54fcb1  xbps-0.59.1_0.tar.bz2
+608d4933e5ce97723d3489ceec0944045f43d72cd76263d9eba8a232f52d57da  xbps-0.59.1_0.tar.bz2
 ac8c7b186195ad29d86c2d1608b0c4ba37eeb12daff8f155d69d568239cae237  xz-5.0.5_0.links
 514cd101fa54861de51622f35004423e5e4b168e704127d631692b7b4eed477d  xz-5.0.5_0.tar.bz2
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  zlib-1.2.11_0.links
-cf5118fda278108c698c53725f411da4a0939c844a3a053181d916736429642f  zlib-1.2.11_0.tar.bz2
+e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  zlib-1.2.12_0.links
+f73856b9e370cb54a44ca6167abff326d4c909aaa6822c935804766e2ef11ef3  zlib-1.2.12_0.tar.bz2
--- a/sysa/after.kaem
+++ b/sysa/after.kaem
@ -2,7 +2,7 @@

 # SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
-# SPDX-FileCopyrightText: 2020-2021 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

@ -12,7 +12,7 @@ PATH=/${ARCH_DIR}/bin

 # Set commonly used variables
 sysa=/sysa
-sources=/sources
+distfiles=/sysa/distfiles
 prefix=/usr
 bindir=${prefix}/bin
 libdir=${prefix}/lib
@ -22,8 +22,8 @@ TMPDIR=/tmp # tmpdir is needed for patch to work
 # Environmental variables needed for mes
 NYACC_PKG=nyacc-1.00.2
 MES_PKG=mes
-MES_PREFIX=${sysa}/${MES_PKG}/src/mes-m2-dad1744fa80f52b3b428803c06b09d39c285f500
-GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sysa}/${MES_PKG}/src/${NYACC_PKG}/module
+MES_PREFIX=${sysa}/${MES_PKG}/build/mes-m2-dad1744fa80f52b3b428803c06b09d39c285f500
+GUILE_LOAD_PATH=${MES_PREFIX}/mes/module:${MES_PREFIX}/module:${sysa}/${MES_PKG}/build/${NYACC_PKG}/module
 mkdir -p ${prefix} ${bindir} ${libdir} ${incdir} ${TMPDIR}
 cd ${prefix}

@ -66,7 +66,7 @@ cd ${sysa}
 pkg=${MES_PKG}
 cd ${pkg}
 kaem --file ${pkg}.kaem
-cd ${sysa}
+cd ..

 # tcc 0.9.26
 pkg="tcc-0.9.26"
--- a/sysa/bash-2.05b/bash-2.05b.kaem
+++ b/sysa/bash-2.05b/bash-2.05b.kaem
@ -12,7 +12,7 @@ mkdir build src
 cd build

 # Extract
-cp ${sources}/${pkg}.tar.gz ../src/
+cp ${distfiles}/${pkg}.tar.gz ../src/
 gunzip -f ../src/${pkg}.tar.gz
 tar xf ../src/${pkg}.tar
 rm -r ../src/
--- a/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem
+++ b/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem
@ -11,7 +11,7 @@ mkdir build src
 cd build 

 # Extract
-cp ${sources}/${pkg}.tar.gz ../src/
+cp ${distfiles}/${pkg}.tar.gz ../src/
 gunzip -f ../src/${pkg}.tar.gz
 tar xf ../src/${pkg}.tar
 cd ${pkg}
--- a/sysa/bzip2-1.0.8/bzip2-1.0.8.sh
+++ b/sysa/bzip2-1.0.8/bzip2-1.0.8.sh
@ -13,7 +13,9 @@ src_compile() {
 }

 src_install() {
-    install -D bzip2 ${DESTDIR}${PREFIX}/bin/bzip2
+    # Manually install bzip2 (cannot replace binary while running)
+    install -D bzip2 ${PREFIX}/bin/bzip2
+    mkdir -p ${DESTDIR}${PREFIX}/bin
    ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bunzip2
    ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bzcat
 }
--- a/sysa/coreutils-5.0/coreutils-5.0.kaem
+++ b/sysa/coreutils-5.0/coreutils-5.0.kaem
@ -12,7 +12,7 @@ mkdir build src
 cd build

 # Extract
-cp ${sources}/${pkg}.tar.bz2 ../src/
+cp ${distfiles}/${pkg}.tar.bz2 ../src/
 bunzip2 -f ../src/${pkg}.tar.bz2
 tar xf ../src/${pkg}.tar
 cd ${pkg}
--- a/sysa/findutils-4.2.33/findutils-4.2.33.sh
+++ b/sysa/findutils-4.2.33/findutils-4.2.33.sh
@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

-EXTRA_SRCS="gnulib-8e128e.tar.gz"
+EXTRA_DISTFILES="gnulib-8e128e.tar.gz"

 src_prepare() {
    . ../../import-gnulib.sh
--- a/sysa/gcc-4.0.4/pass1.sh
+++ b/sysa/gcc-4.0.4/pass1.sh
@ -4,7 +4,7 @@

 # SPDX-License-Identifier: GPL-3.0-or-later

-EXTRA_SRCS="automake-1.16.3.tar.gz"
+EXTRA_DISTFILES="automake-1.16.3.tar.gz"

 src_prepare() {
    default
--- a/sysa/gcc-4.0.4/pass2.sh
+++ b/sysa/gcc-4.0.4/pass2.sh
@ -4,7 +4,7 @@

 # SPDX-License-Identifier: GPL-3.0-or-later

-EXTRA_SRCS="automake-1.16.3.tar.gz"
+EXTRA_DISTFILES="automake-1.16.3.tar.gz"

 src_prepare() {
    default
--- a/sysa/gzip-1.2.4/gzip-1.2.4.kaem
+++ b/sysa/gzip-1.2.4/gzip-1.2.4.kaem
@ -15,7 +15,7 @@ catm gzip.c.new ../../files/stat_override.c gzip.c
 cp gzip.c.new gzip.c

 # Extract
-cp ${sources}/${pkg}.tar.gz ../src/
+cp ${distfiles}/${pkg}.tar.gz ../src/
 ungz ../src/${pkg}.tar.gz
 untar ../src/${pkg}.tar
 cd ${pkg}
--- a/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem
+++ b/sysa/heirloom-devtools-070527/heirloom-devtools-070527.kaem
@ -13,7 +13,7 @@ cd build
 lexdir=/lex

 # Extract
-cp ${sources}/${pkg}.tar.bz2 ../src/
+cp ${distfiles}/${pkg}.tar.bz2 ../src/
 bunzip2 -f ../src/${pkg}.tar.bz2
 tar xf ../src/${pkg}.tar ${pkg}/yacc ${pkg}/lex
 rm -r ../src/
--- a/sysa/helpers.sh
+++ b/sysa/helpers.sh
@ -118,7 +118,7 @@ build() {
    echo "${pkg}: unpacking source."
    build_stage=src_unpack
    call $build_stage
-    unset EXTRA_SRCS
+    unset EXTRA_DISTFILES

    cd "${dirname}" || (echo "Cannot cd into build/${dirname}!"; kill $$)

@ -153,8 +153,6 @@ build() {
    echo "${pkg}: creating package."
    cd "${DESTDIR}"
    src_pkg
-    # Various shenanigans must be implemented for repoducibility
-    # as a result of timestamps

    src_checksum

@ -171,36 +169,31 @@ build() {
    cd "${SOURCES}"

    unset -f src_unpack src_prepare src_configure src_compile src_install
-    unset checksum
 }

 # Default unpacking function that unpacks all source tarballs.
 default_src_unpack() {
-    SRCS=$EXTRA_SRCS
-    for f in "/sources/${pkg}."*; do
-        SRCS="$(basename "$f") ${SRCS}"
+    distfiles=${EXTRA_DISTFILES}
+    # shellcheck disable=SC2153
+    for f in "${DISTFILES}/${pkg}."*; do
+        distfiles="$(basename "$f") ${distfiles}"
    done

    # Check for new tar
+    # shellcheck disable=SC2153
    if test -e "${PREFIX}/libexec/rmt"; then
-        for i in $SRCS; do
-            tar --no-same-owner -xf "/sources/${i}"
+        for i in ${distfiles}; do
+            tar --no-same-owner -xf "${DISTFILES}/${i}"
        done
    else
-        for i in $SRCS; do
+        for i in ${distfiles}; do
            case "$i" in
-            *.tar.gz)
-                tar -xzf "/sources/${i}"
-                ;;
+            *.tar.gz) tar -xzf "${DISTFILES}/${i}" ;;
            *.tar.bz2)
                # Initial bzip2 built against meslibc has broken pipes
-                bzip2 --decompress --keep "/sources/${i}"
-                tar -xf "/sources/${i%.bz2}"
-                rm "/sources/${i%.bz2}"
-                ;;
+                bzip2 -dc "${DISTFILES}/${i}" | tar -xf - ;;
            *.tar.xz)
-                tar -xf "/sources/${i}" --use-compress-program=xz
-                ;;
+                tar -xf "${DISTFILES}/${i}" --use-compress-program=xz ;;
            esac
        done
    fi
@ -297,9 +290,8 @@ src_apply() {
                rm -f "/${file}" >/dev/null 2>&1 || true
            done < /tmp/filelist.txt
        fi
-        bzip2 --decompress --keep "/usr/src/repo/${pkg}_${revision}.tar.bz2"
-        tar -C / -xpf "/usr/src/repo/${pkg}_${revision}.tar"
-        rm "/usr/src/repo/${pkg}_${revision}.tar"
+        bzip2 -dc "/usr/src/repo/${pkg}_${revision}.tar.bz2" | \
+            tar -C / -xpf -
        # shellcheck disable=SC2162
        # ^ read -r unsupported in old bash
        while read line; do
--- a/sysa/linux-4.9.10/linux-4.9.10.sh
+++ b/sysa/linux-4.9.10/linux-4.9.10.sh
@ -1,19 +1,17 @@
-# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
 # SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

 src_unpack() {
    mkdir "${pkg}"
-    mv /sources/deblob-4.9 "${pkg}/"
-    mv "/sources/${pkg}.tar.gz" .
+    mv "${DISTFILES}/deblob-4.9" "${pkg}/"
    # Remove all previous source tarballs
-    rm /sources/*
-    mv ${pkg}.tar.gz /sources
+    mv "${DISTFILES}/${pkg}.tar.gz" .
+    rm -r "${DISTFILES}/"*
+    mv "${pkg}.tar.gz" "${DISTFILES}"
    default || true # Predictable link errors - not a problem
-
-    # Clear up storage space
-    rm -rf "/sources/${pkg}.tar.gz"
+    rm -r "${DISTFILES}" # Clear storage space
 }

 generate_autoconf_h() {
--- a/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh
+++ b/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh
@ -4,7 +4,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later

 src_unpack() {
-    tarball="/sources/linux-headers-5.10.41.tar.gz"
+    tarball="${DISTFILES}/linux-headers-5.10.41.tar.gz"
    tar -xzf "${tarball}" "${dirname}/scripts"
    tar -xzf "${tarball}" "${dirname}/include"
    tar -xzf "${tarball}" "${dirname}/arch/x86/include"
--- a/sysa/make-3.80/make-3.80.kaem
+++ b/sysa/make-3.80/make-3.80.kaem
@ -10,7 +10,7 @@ mkdir build src
 cd build 

 # Extract
-cp ${sources}/${pkg}.tar.gz ../src/
+cp ${distfiles}/${pkg}.tar.gz ../src/
 gunzip -f ../src/${pkg}.tar.gz
 tar xf ../src/${pkg}.tar
 cd ${pkg}
--- a/sysa/mes/mes.kaem
+++ b/sysa/mes/mes.kaem
@ -1,7 +1,7 @@
 #!/bin/sh

 # SPDX-FileCopyrightText: 2020-2021 Andrius Štikonas <andrius@stikonas.eu>
-# SPDX-FileCopyrightText: 2020-2021 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2020-2022 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

@ -18,14 +18,17 @@ cp files/mescc.scm ${bindir}/
 chmod 755 ${bindir}/mescc.scm

 # Unpack
-mkdir src
-cp ${sources}/${NYACC_PKG}.tar.gz src/
-cp ${sources}/${MES_PKG}.tar.gz src/
+mkdir src build
 cd src
+cp ${distfiles}/${NYACC_PKG}.tar.gz ${NYACC_PKG}.tar.gz
 ungz ${NYACC_PKG}.tar.gz
-untar ${NYACC_PKG}.tar
+cp ${distfiles}/${MES_PKG}.tar.gz ${MES_PKG}.tar.gz
 ungz ${MES_PKG}.tar.gz
-untar ${MES_PKG}.tar
+cd ..
+
+cd build
+untar ../src/${NYACC_PKG}.tar
+untar ../src/${MES_PKG}.tar

 cp ../files/config.h ${MES_PREFIX}/include/mes

@ -287,5 +290,5 @@ cp include/sys/user.h ${incdir}/sys/user.h
 cp include/sys/wait.h ${incdir}/sys/wait.h

 # Checksums
-cd ${sysa}/${MES_PKG}
+cd ../..
 sha256sum -c checksums
--- a/sysa/musl-1.2.2/musl-1.2.2.sh
+++ b/sysa/musl-1.2.2/musl-1.2.2.sh
@ -1,7 +1,9 @@
-# SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

+SRCS="musl-1.2.2.tar.gz"
+
 src_configure() {
    CC=gcc ./configure \
        --host=i386-unknown-linux-musl \
--- a/sysa/patch-2.5.9/patch-2.5.9.kaem
+++ b/sysa/patch-2.5.9/patch-2.5.9.kaem
@ -10,7 +10,7 @@ mkdir build src
 cd build

 # Extract
-cp ${sources}/${pkg}.tar.gz ../src/
+cp ${distfiles}/${pkg}.tar.gz ../src/
 gunzip -f ../src/${pkg}.tar.gz
 tar xf ../src/${pkg}.tar
 cd ${pkg}
--- a/sysa/run.sh
+++ b/sysa/run.sh
@ -14,6 +14,7 @@ set -e
 export PREFIX="${prefix}"
 # shellcheck disable=SC2154
 export SOURCES="${sysa}"
+export DISTFILES="${sysa}/distfiles"
 export DESTDIR=/tmp/destdir
 export REPO="${PREFIX}/src/repo"

--- a/sysa/sed-4.0.9/sed-4.0.9.kaem
+++ b/sysa/sed-4.0.9/sed-4.0.9.kaem
@ -12,7 +12,7 @@ mkdir build src
 cd build

 # Extract
-cp ${sources}/${pkg}.tar.gz ../src/
+cp ${distfiles}/${pkg}.tar.gz ../src/
 gunzip -f ../src/${pkg}.tar.gz
 tar xf ../src/${pkg}.tar
 cd ${pkg}
--- a/sysa/tar-1.12/tar-1.12.kaem
+++ b/sysa/tar-1.12/tar-1.12.kaem
@ -12,7 +12,7 @@ mkdir build src
 cd build

 # Extract
-cp ${sources}/${pkg}.tar.gz ../src/
+cp ${distfiles}/${pkg}.tar.gz ../src/
 gunzip -f ../src/${pkg}.tar.gz
 untar ../src/${pkg}.tar

--- a/sysa/tcc-0.9.26/checksums
+++ b/sysa/tcc-0.9.26/checksums
@ -1,10 +1,10 @@
 ea96f7ad93ee4f7ed33b45b5055dbd95280a7fb315d8a205c703b55d1fe127ca  /usr/bin/mes-tcc
-25b21459c5e111492ce4e253a9b7e51a6a7caa3922e56f804cc597dbafd8d675  /usr/bin/boot0-tcc
-31bc48b1d97777769e62d4b547fdf1655d441b6d33f5036de9e0a7000b491fee  /usr/bin/boot1-tcc
-bcbfad01134f83382932843343874de0952afce12ee69512e53c6153f4fcd7fa  /usr/bin/boot2-tcc
-7d34c08f1bd8944d11cbe213f03d484b6aca5fed0585d971572f239a09746b75  /usr/bin/boot3-tcc
-e5bc6851ae1f3601f6dcb775d6459277646066147726028c28a8cf47eb96dd36  /usr/bin/boot4-tcc
-7edcbfa3851f78bc9708cbf2a327d04ff1a88fd1cbef652ebe862345749049ca  /usr/bin/tcc
+fbf055522c51b6b4f5359beb937d404d0c17b43f892d4725c5a13208d3e24ae3  /usr/bin/boot0-tcc
+a0a91baa0194f6bebb658f041d6ae786b9aea002b5dc8b2b21fa725f81b31259  /usr/bin/boot1-tcc
+93e7a2530dba4955c3cea9f57f156e6368a2b5febc56855e1b277c46326a917e  /usr/bin/boot2-tcc
+9e7c8043fb42994faa255b14e3bb0d1fc44289a8567370baef5b455fa4b85e4c  /usr/bin/boot3-tcc
+d7301f314697d6783f5b8b1a969160ee7628ccbb477193ab746adffeb4a85855  /usr/bin/boot4-tcc
+9ae8d5f4986c6375a705bd3e56aad26150c0a7a89421fc47c4343f5cf25a7a8d  /usr/bin/tcc
 37e53f55da1a8ca5452016528727b0c3e4b4e60690f1c5ed1dfc7ecca6e56581  /usr/lib/mes/libc.a
 12c07ae103e7e3b390150a79e5c600d88de14e9bb73a066f6342582729ef5a3f  /usr/lib/mes/libgetopt.a
 44b5f15e1f015685fe4c3d66eda5ba52aac77b94f2edd98b764cec05ca350d49  /usr/lib/mes/crt1.o
--- a/sysa/tcc-0.9.26/tcc-0.9.26.kaem
+++ b/sysa/tcc-0.9.26/tcc-0.9.26.kaem
@ -1,6 +1,6 @@
 #!/bin/sh

-# SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

@ -20,15 +20,18 @@ TCC_PKG=tcc-0.9.26-1136-g5bba73cc
 MES_PKG=mes-0.23

 # Unpack
-mkdir src
-cp ${sources}/${TCC_TAR}.tar.gz src
+mkdir src build
+cp ${distfiles}/${TCC_TAR}.tar.gz src
+cp ${distfiles}/mes-0.23.tar.gz src
+
 cd src
 ungz ${TCC_TAR}.tar.gz
-untar ${TCC_TAR}.tar
-
-cp ${sources}/mes-0.23.tar.gz mes-0.23.tar.gz
 ungz mes-0.23.tar.gz
-untar mes-0.23.tar
+cd ..
+
+cd build
+untar ../src/${TCC_TAR}.tar
+untar ../src/mes-0.23.tar

 # Create config.h
 cd ${TCC_PKG}
--- a/sysa/tcc-0.9.27/tcc-0.9.27.kaem
+++ b/sysa/tcc-0.9.27/tcc-0.9.27.kaem
@ -11,7 +11,7 @@ mkdir build src
 cd build

 # Extract
-cp ${sources}/${pkg}.tar.bz2 ../src/
+cp ${distfiles}/${pkg}.tar.bz2 ../src/
 bunzip2 -f ../src/${pkg}.tar.bz2
 tar xf ../src/${pkg}.tar
 cd ${pkg}