From b444196d9946c7aaa281446418f4409a16ea22cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 27 Feb 2023 09:36:53 +0800
Subject: [PATCH 01/11] Add a missing description for curl.

---
 parts.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/parts.rst b/parts.rst
index c2c6ffbd..c10d2356 100644
--- a/parts.rst
+++ b/parts.rst
@@ -614,6 +614,12 @@ make 3.82
 GNU ``make`` is now rebuilt properly using the build system and GCC, which means that
 it does not randomly segfault while building the Linux kernel.
 
+curl 7.83.0
+===========
+
+``curl`` is used to download files using various protocols including HTTP and HTTPS.
+However, this first build does not support encrypted HTTPS yet.
+
 kexec-tools 2.0.22
 ==================
 

From 5cc4d959b437a972c123680aa88e776c69833d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 27 Feb 2023 09:44:41 +0800
Subject: [PATCH 02/11] populate_device_nodes function needs /etc present, run
 it after create_fhs.

---
 sysc/run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sysc/run.sh b/sysc/run.sh
index e9da3f43..10012ccd 100755
--- a/sysc/run.sh
+++ b/sysc/run.sh
@@ -30,10 +30,10 @@ create_fhs() {
     echo 'nameserver 1.1.1.1' > /etc/resolv.conf
 }
 
-populate_device_nodes
-
 create_fhs
 
+populate_device_nodes
+
 # Obtain network connection
 if [ "${CHROOT}" = "False" ]; then
     dhcpcd --waitip=4

From b8446054f20abba2f528c5c1747d7bcfd7bb4a7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 27 Feb 2023 09:41:09 +0800
Subject: [PATCH 03/11] Add ed 1.4.

---
 parts.rst             |  6 ++++++
 sysa/SHA256SUMS.pkgs  |  1 +
 sysa/ed-1.4/ed-1.4.sh | 16 ++++++++++++++++
 sysa/ed-1.4/sources   |  1 +
 sysa/run.sh           |  2 ++
 5 files changed, 26 insertions(+)
 create mode 100755 sysa/ed-1.4/ed-1.4.sh
 create mode 100644 sysa/ed-1.4/sources

diff --git a/parts.rst b/parts.rst
index c10d2356..c65e09f9 100644
--- a/parts.rst
+++ b/parts.rst
@@ -620,6 +620,12 @@ curl 7.83.0
 ``curl`` is used to download files using various protocols including HTTP and HTTPS.
 However, this first build does not support encrypted HTTPS yet.
 
+ed 1.4
+======
+
+``ed`` is a very basic line editor. This is the last version that is not distributed
+in ``.tar.lz`` format. ``ed`` is used by ``bc`` build scripts.
+
 kexec-tools 2.0.22
 ==================
 
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 5209d8ed..67373098 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -39,6 +39,7 @@ d6a43ad9a56f21407e72820e0bafabd7b4bb3def9d9ba717203964fa2d500a00  curl-7.83.0_1.
 f1a17f3d1c65140a6d3043ecb710e5fffe9c019cb3d2eaa982be03706876e534  diffutils-2.7_0.tar.bz2
 de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45  dist-3.5-236_0.tar.bz2
 67cccd627c4f940214907c55d0a78c3b1abb996729298e2c41f7f83776e5dd0f  e2fsprogs-1.45.7_0.tar.bz2
+30998009d585c8f83ec70db2fcecc4fffcd17d7ddcd5e282a04fac005e680880  ed-1.4_0.tar.bz2
 bc381a028836d7ba2b679d4c41167180f23d3d8a4720453534be9500185f05f9  file-5.44_0.tar.bz2
 8a0405a66c09c6e1647078c919ae54948f069632214c8430af7adbdb176f62e2  findutils-4.2.33_0.tar.bz2
 3c85ce52e37c313d699a21cc741d24e808048461b105f58445a645a54ea55436  flex-2.5.11_0.tar.bz2
diff --git a/sysa/ed-1.4/ed-1.4.sh b/sysa/ed-1.4/ed-1.4.sh
new file mode 100755
index 00000000..ba460713
--- /dev/null
+++ b/sysa/ed-1.4/ed-1.4.sh
@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: © 2023 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    rm doc/ed.info
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" \
+        --build=i386-unknown-linux-musl
+}
+
+src_install() {
+    install -m 755 -D ed ${DESTDIR}/usr/bin/ed
+}
diff --git a/sysa/ed-1.4/sources b/sysa/ed-1.4/sources
new file mode 100644
index 00000000..10885f3f
--- /dev/null
+++ b/sysa/ed-1.4/sources
@@ -0,0 +1 @@
+https://mirrors.kernel.org/gnu/ed/ed-1.4.tar.gz db36da85ee1a9d8bafb4b041bd4c8c11becba0c43ec446353b67045de1634fda
diff --git a/sysa/run.sh b/sysa/run.sh
index f000765e..00cc8769 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -228,6 +228,8 @@ build make-3.82
 
 build curl-7.83.0
 
+build ed-1.4
+
 # Clear up some RAM space
 grep '^build' "${SOURCES}/run.sh" | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do
     rm -rf "${SOURCES:?}/${p:?}"

From 58d1206c8361a7570f816ec590fe10354880981d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 27 Feb 2023 09:44:06 +0800
Subject: [PATCH 04/11] Add bc-1.07.1.

---
 parts.rst                   |  6 ++++++
 sysa/SHA256SUMS.pkgs        |  1 +
 sysa/bc-1.07.1/bc-1.07.1.sh | 21 +++++++++++++++++++++
 sysa/bc-1.07.1/sources      |  1 +
 sysa/run.sh                 |  2 ++
 5 files changed, 31 insertions(+)
 create mode 100755 sysa/bc-1.07.1/bc-1.07.1.sh
 create mode 100644 sysa/bc-1.07.1/sources

diff --git a/parts.rst b/parts.rst
index c65e09f9..8c41de05 100644
--- a/parts.rst
+++ b/parts.rst
@@ -626,6 +626,12 @@ ed 1.4
 ``ed`` is a very basic line editor. This is the last version that is not distributed
 in ``.tar.lz`` format. ``ed`` is used by ``bc`` build scripts.
 
+bc 1.07.1
+=========
+
+``bc`` is a console based calculator that is sometime used in scripts. We need ``bc``
+to rebuild some Linux kernel headers.
+
 kexec-tools 2.0.22
 ==================
 
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 67373098..006d71d0 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -21,6 +21,7 @@ e8ff13753943e43972a8cf1672819f001718ed38e5497cf7b554c21a507ba22b  automake-1.7.8
 9922651b64ad2e29b944082f26db223008220155048f25d64df1f6d82071ff1c  automake-1.8.5_0.tar.bz2
 c5807850a377e4bb9aa4121d9781d145bdd80327626a9419630a75ce2c8d9c71  automake-1.9.6_0.tar.bz2
 6e9f4263f8a938e2bf62ae1507092a7d3679a018c2037e2eac9cf424ca20c19c  bash-5.1_0.tar.bz2
+78c5e718510fcf0ab4296d5cfac114abb31af4a30aa5c9f2c0844d7ee5bae5c5  bc-1.07.1_0.tar.bz2
 b06a20417c7dadb007f3e6930b8385ad934651756a339d8a87e086b1139e62d8  binutils-2.24_0.tar.bz2
 aa910ea75172041b9285436c148f81b3a9fb205f61b88b5e5bbaab2c1cee9484  binutils-2.38_0.tar.bz2
 9ff9b31de7aab2b10f29bb2e0cacc4a30b31e4c0dc15d6fa1202181204aaa6e6  bison-2.3_0.tar.bz2
diff --git a/sysa/bc-1.07.1/bc-1.07.1.sh b/sysa/bc-1.07.1/bc-1.07.1.sh
new file mode 100755
index 00000000..b881d2db
--- /dev/null
+++ b/sysa/bc-1.07.1/bc-1.07.1.sh
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: © 2023 Andrius Štikonas <andrius@stikonas.eu>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+src_prepare() {
+    # Remove bison generated files
+    rm bc/bc.c bc/bc.h
+    rm bc/scan.c
+
+    # Skip documentation
+    sed -i 's/ doc//' Makefile.am
+    
+    # Rebuild configure script
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
+}
+
+src_configure() {
+    ./configure --prefix="${PREFIX}" \
+        --build=i386-unknown-linux-musl
+}
+
diff --git a/sysa/bc-1.07.1/sources b/sysa/bc-1.07.1/sources
new file mode 100644
index 00000000..8bbdd04d
--- /dev/null
+++ b/sysa/bc-1.07.1/sources
@@ -0,0 +1 @@
+https://mirrors.kernel.org/gnu/bc/bc-1.07.1.tar.gz 62adfca89b0a1c0164c2cdca59ca210c1d44c3ffc46daf9931cf4942664cb02a
diff --git a/sysa/run.sh b/sysa/run.sh
index 00cc8769..a82ddab4 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -230,6 +230,8 @@ build curl-7.83.0
 
 build ed-1.4
 
+build bc-1.07.1
+
 # Clear up some RAM space
 grep '^build' "${SOURCES}/run.sh" | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do
     rm -rf "${SOURCES:?}/${p:?}"

From da9a2c6c50f9fafff4ea3b8393443f469f5f0d81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sun, 26 Feb 2023 17:00:15 +0800
Subject: [PATCH 05/11] Move bash rebuild to sysa.

---
 .cirrus.yml                                   |   2 +-
 parts.rst                                     |  18 +--
 sysa/SHA256SUMS.pkgs                          |   2 +-
 .../bash-5.2.15/bash-5.2.15.sh                |  14 +-
 sysa/bash-5.2.15/sources                      |   1 +
 sysa/run.sh                                   |  60 +------
 sysa/run2.sh                                  |  95 ++++++++++++
 sysc/bash-5.1/sources                         |   1 -
 sysc/run.sh                                   | 132 +++++++++++++++-
 sysc/run2.sh                                  | 146 ------------------
 10 files changed, 250 insertions(+), 221 deletions(-)
 rename sysc/bash-5.1/bash-5.1.sh => sysa/bash-5.2.15/bash-5.2.15.sh (80%)
 create mode 100644 sysa/bash-5.2.15/sources
 create mode 100755 sysa/run2.sh
 delete mode 100644 sysc/bash-5.1/sources
 delete mode 100755 sysc/run2.sh

diff --git a/.cirrus.yml b/.cirrus.yml
index 2c748f40..f8c8e04d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -24,7 +24,7 @@ shell_lint_task:
     - apt-get -y install shellcheck
     - apt-get -y clean
   check_script:
-    - shellcheck sysa/run.sh sysb/init sysb/run.sh sysc/init sysc/run.sh sysc/run2.sh sysa/helpers.sh download-distfiles.sh
+    - shellcheck sysa/run.sh sysa/run2.sh sysb/init sysb/run.sh sysc/init sysc/run.sh sysa/helpers.sh download-distfiles.sh
 
 reuse_lint_task:
   container:
diff --git a/parts.rst b/parts.rst
index 8c41de05..50a652f1 100644
--- a/parts.rst
+++ b/parts.rst
@@ -539,6 +539,15 @@ libtool 2.2.4
 GNU Libtool is the final part of GNU Autotools. It is a script used to hide away differences
 when compiling shared libraries on different platforms.
 
+bash 5.2.15
+===========
+
+Up to this point, our build of ``bash`` could run scripts but could not be used
+interactively.  This new version of ``bash`` compiles without any patches,
+provides new features, and is built with GNU readline support so it can be used
+as an interactive shell. ``autoconf-2.69`` is used to regenerate the configure
+script and ``bison`` is used to recreate some included generated files.
+
 binutils 2.24
 =============
 
@@ -683,15 +692,6 @@ sysb is purely a transition to sysc, allowing binaries from sysa to get onto a
 disk (as sysa does not necessarily have hard disk support in the kernel).
 It populates device nodes, mounts sysc, copies over data, and executes sysc.
 
-bash 5.1
-========
-
-Up to this point, our build of ``bash`` could run scripts but could not be used
-interactively.  This new version of ``bash`` compiles without any patches,
-provides new features, and is built with GNU readline support so it can be used
-as an interactive shell. ``autoconf-2.61`` is used to regenerate the configure
-script and ``bison`` is used to recreate some included generated files.
-
 xz 5.0.5
 ========
 
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 006d71d0..33798b3e 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -20,7 +20,7 @@ ef08694bf8e78ffcf56f9c8a63b0f189e301c06f02ab240e15e4c7fe354c2a0d  automake-1.7_0
 e8ff13753943e43972a8cf1672819f001718ed38e5497cf7b554c21a507ba22b  automake-1.7.8_0.tar.bz2
 9922651b64ad2e29b944082f26db223008220155048f25d64df1f6d82071ff1c  automake-1.8.5_0.tar.bz2
 c5807850a377e4bb9aa4121d9781d145bdd80327626a9419630a75ce2c8d9c71  automake-1.9.6_0.tar.bz2
-6e9f4263f8a938e2bf62ae1507092a7d3679a018c2037e2eac9cf424ca20c19c  bash-5.1_0.tar.bz2
+ca49c0338d6aed5131f907d375384bf42e70f2875f58973da0015b4fb73156cc  bash-5.2.15_0.tar.bz2
 78c5e718510fcf0ab4296d5cfac114abb31af4a30aa5c9f2c0844d7ee5bae5c5  bc-1.07.1_0.tar.bz2
 b06a20417c7dadb007f3e6930b8385ad934651756a339d8a87e086b1139e62d8  binutils-2.24_0.tar.bz2
 aa910ea75172041b9285436c148f81b3a9fb205f61b88b5e5bbaab2c1cee9484  binutils-2.38_0.tar.bz2
diff --git a/sysc/bash-5.1/bash-5.1.sh b/sysa/bash-5.2.15/bash-5.2.15.sh
similarity index 80%
rename from sysc/bash-5.1/bash-5.1.sh
rename to sysa/bash-5.2.15/bash-5.2.15.sh
index add074df..75f9987a 100755
--- a/sysc/bash-5.1/bash-5.1.sh
+++ b/sysa/bash-5.2.15/bash-5.2.15.sh
@@ -9,9 +9,17 @@ src_prepare() {
     # Remove bison generated files
     rm y.tab.c y.tab.h
 
+    # Remove prebuilt translation catalogs
+    rm po/*.gmo
+
+    # Skip documentation
+    mv doc/Makefile.in Makefile.in.doc
+    rm doc/*
+    mv Makefile.in.doc doc/Makefile.in
+
     # Rebuild configure script
     rm configure
-    autoconf-2.64
+    autoconf-2.69
 
     # avoid non-deterministic build:
     printf '%s\n%s\n' \
@@ -25,7 +33,8 @@ src_configure() {
     # improve reproducibility because they make configure
     # skip checking for /dev/{fd,stdin,stdout,stderr} (build
     # output is affected by their availability otherwise).
-    ./configure --prefix="${PREFIX}" \
+    # size is part of binutils and is not yet available.
+    CC=tcc LD=tcc AR="tcc -ar" SIZE=true ./configure --prefix="${PREFIX}" \
         --without-bash-malloc \
         --disable-nls \
         --build=i386-unknown-linux-musl \
@@ -35,7 +44,6 @@ src_configure() {
 }
 
 src_install() {
-    # Do not install prebuilt .mo translation catalogs
     install -D bash "${DESTDIR}${PREFIX}/bin/bash"
     # Work around weird symlink bug
     install bash "${DESTDIR}${PREFIX}/bin/sh"
diff --git a/sysa/bash-5.2.15/sources b/sysa/bash-5.2.15/sources
new file mode 100644
index 00000000..0a5427a0
--- /dev/null
+++ b/sysa/bash-5.2.15/sources
@@ -0,0 +1 @@
+https://mirrors.kernel.org/gnu/bash/bash-5.2.15.tar.gz 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c
diff --git a/sysa/run.sh b/sysa/run.sh
index a82ddab4..10ff0be5 100755
--- a/sysa/run.sh
+++ b/sysa/run.sh
@@ -193,62 +193,6 @@ build autoconf-2.69
 
 build libtool-2.2.4
 
-build binutils-2.24
+build bash-5.2.15
 
-# 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.3
-
-# This hack fixes a strange bug in mes libc bash
-set -x
-build linux-headers-5.10.41 '' '' linux-5.10.41
-set +x
-
-build gcc-4.0.4 pass2.sh
-
-build util-linux-2.19.1
-
-build e2fsprogs-1.45.7
-
-build dhcpcd-9.4.1 '' '' dhcpcd-dhcpcd-9.4.1-1663155
-
-build kbd-1.15
-
-build make-3.82
-
-build curl-7.83.0
-
-build ed-1.4
-
-build bc-1.07.1
-
-# Clear up some RAM space
-grep '^build' "${SOURCES}/run.sh" | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do
-    rm -rf "${SOURCES:?}/${p:?}"
-done
-
-if [ "${CHROOT}" = False ]; then
-    build kexec-tools-2.0.22
-
-    build linux-4.9.10
-
-    create_sysb
-    go_sysb
-fi
-
-# 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
+exec env -i PATH="${PATH}" PREFIX="${PREFIX}" LIBDIR="${LIBDIR}" SOURCES="${SOURCES}" DISTFILES="${DISTFILES}" DESTDIR="${DESTDIR}" SRCDIR="${SRCDIR}" bash run2.sh
diff --git a/sysa/run2.sh b/sysa/run2.sh
new file mode 100755
index 00000000..6b5f6b23
--- /dev/null
+++ b/sysa/run2.sh
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
+# SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
+# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+set -e
+
+# 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 "${PREFIX}/boot/initramfs-sysb.cpio.gz" /sysb_image
+    rm -rf /sysb /sysb_image # Cleanup
+}
+
+go_sysb() {
+    # Mount proc for kexec
+    mkdir /proc /etc
+    mount -t proc proc /proc
+    # kexec time
+    echo "Loading kernel + sysb initramfs using kexec"
+    kexec -l "${PREFIX}/boot/linux-4.9.10" --console-serial \
+        --initrd="${PREFIX}/boot/initramfs-sysb.cpio.gz" \
+        --append="init=/init console=ttyS0"
+    echo "kexecing into sysb"
+    kexec -e
+}
+
+build binutils-2.24
+
+# 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.3
+
+# This hack fixes a strange bug in mes libc bash
+set -x
+build linux-headers-5.10.41 '' '' linux-5.10.41
+set +x
+
+build gcc-4.0.4 pass2.sh
+
+build util-linux-2.19.1
+
+build e2fsprogs-1.45.7
+
+build dhcpcd-9.4.1 '' '' dhcpcd-dhcpcd-9.4.1-1663155
+
+build kbd-1.15
+
+build make-3.82
+
+build curl-7.83.0
+
+build ed-1.4
+
+build bc-1.07.1
+
+# Clear up some RAM space
+grep '^build' "${SOURCES}/run.sh" | sed "s/build //" | sed "s/ .*$//" | while read -r p ; do
+    rm -rf "${SOURCES:?}/${p:?}"
+done
+
+if [ "${CHROOT}" = False ]; then
+    build kexec-tools-2.0.22
+
+    build linux-4.9.10
+
+    create_sysb
+    go_sysb
+fi
+
+# 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
diff --git a/sysc/bash-5.1/sources b/sysc/bash-5.1/sources
deleted file mode 100644
index 9f2c2fdd..00000000
--- a/sysc/bash-5.1/sources
+++ /dev/null
@@ -1 +0,0 @@
-http://mirrors.kernel.org/gnu/bash/bash-5.1.tar.gz cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
diff --git a/sysc/run.sh b/sysc/run.sh
index 10012ccd..32384600 100755
--- a/sysc/run.sh
+++ b/sysc/run.sh
@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
 # SPDX-FileCopyrightText: 2021-22 fosslinux <fosslinux@aussies.space>
 # SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
+# SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -11,9 +12,16 @@ 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
 
+trap bash EXIT
+
+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
@@ -56,6 +64,126 @@ else
     mkdir -p "${DISTFILES}"
 fi
 
-build bash-5.1
+build xz-5.0.5
+
+build file-5.44
+
+build libtool-2.4.7
+
+build automake-1.15.1
+
+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.86
+
+build curl-7.83.0
+
+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.7
+
+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.3
+
+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
+
+build gcc-10.4.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 PATH="${PATH}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash "${SOURCES}/after.sh"
 
-exec env -i PATH="${PATH}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash run2.sh
diff --git a/sysc/run2.sh b/sysc/run2.sh
deleted file mode 100755
index 62c09f32..00000000
--- a/sysc/run2.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/bash
-
-# SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
-# SPDX-FileCopyrightText: 2021-23 fosslinux <fosslinux@aussies.space>
-# SPDX-FileCopyrightText: 2021 Paul Dersey <pdersey@gmail.com>
-# SPDX-FileCopyrightText: 2021 Melg Eight <public.melg8@gmail.com>
-#
-# 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
-
-trap bash EXIT
-
-umask 0022
-
-build xz-5.0.5
-
-build file-5.44
-
-build libtool-2.4.7
-
-build automake-1.15.1
-
-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.86
-
-build curl-7.83.0
-
-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.7
-
-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.3
-
-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
-
-build gcc-10.4.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 PATH="${PATH}" HOME="${HOME}" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" bash "${SOURCES}/after.sh"

From 241717ee8da32319c53edb373de856247f0770d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sun, 26 Feb 2023 17:14:01 +0800
Subject: [PATCH 06/11] Move automake-1.15.1 to sysa.

---
 parts.rst                                            | 12 ++++++------
 {sysc => sysa}/automake-1.15.1/automake-1.15.1.sh    |  0
 .../automake-1.15.1/patches/aclocal_glob.patch       |  0
 .../automake-1.15.1/patches/bootstrap.patch          |  0
 sysa/automake-1.15.1/sources                         |  1 +
 sysa/run2.sh                                         |  2 ++
 sysc/automake-1.15.1/sources                         |  1 -
 sysc/init                                            |  1 +
 sysc/run.sh                                          |  2 --
 9 files changed, 10 insertions(+), 9 deletions(-)
 rename {sysc => sysa}/automake-1.15.1/automake-1.15.1.sh (100%)
 rename {sysc => sysa}/automake-1.15.1/patches/aclocal_glob.patch (100%)
 rename {sysc => sysa}/automake-1.15.1/patches/bootstrap.patch (100%)
 create mode 100644 sysa/automake-1.15.1/sources
 delete mode 100644 sysc/automake-1.15.1/sources

diff --git a/parts.rst b/parts.rst
index 50a652f1..c89356d4 100644
--- a/parts.rst
+++ b/parts.rst
@@ -526,7 +526,7 @@ automake 1.11.2
 ===============
 
 GNU Automake from 1.11 series. This is not the latest point release as newer ones
-need Autoconf 2.68.
+need Autoconf 2.68. Newer major version of ``automake`` also depends on a newer ``bash``.
 
 autoconf 2.69
 =============
@@ -548,6 +548,11 @@ provides new features, and is built with GNU readline support so it can be used
 as an interactive shell. ``autoconf-2.69`` is used to regenerate the configure
 script and ``bison`` is used to recreate some included generated files.
 
+automake 1.15.1
+===============
+
+GNU Automake from 1.15 series. This is the last version that runs on Perl 5.6.
+
 binutils 2.24
 =============
 
@@ -711,11 +716,6 @@ libtool 2.4.7
 A modern version of libtool with better compatibility with newer versions of GNU
 Autotools.
 
-automake 1.15.1
-===============
-
-GNU Automake from 1.15 series. This is the last version that runs on Perl 5.6.
-
 tar 1.34
 ========
 
diff --git a/sysc/automake-1.15.1/automake-1.15.1.sh b/sysa/automake-1.15.1/automake-1.15.1.sh
similarity index 100%
rename from sysc/automake-1.15.1/automake-1.15.1.sh
rename to sysa/automake-1.15.1/automake-1.15.1.sh
diff --git a/sysc/automake-1.15.1/patches/aclocal_glob.patch b/sysa/automake-1.15.1/patches/aclocal_glob.patch
similarity index 100%
rename from sysc/automake-1.15.1/patches/aclocal_glob.patch
rename to sysa/automake-1.15.1/patches/aclocal_glob.patch
diff --git a/sysc/automake-1.15.1/patches/bootstrap.patch b/sysa/automake-1.15.1/patches/bootstrap.patch
similarity index 100%
rename from sysc/automake-1.15.1/patches/bootstrap.patch
rename to sysa/automake-1.15.1/patches/bootstrap.patch
diff --git a/sysa/automake-1.15.1/sources b/sysa/automake-1.15.1/sources
new file mode 100644
index 00000000..d0166446
--- /dev/null
+++ b/sysa/automake-1.15.1/sources
@@ -0,0 +1 @@
+https://mirrors.kernel.org/gnu/automake/automake-1.15.1.tar.gz 988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260
diff --git a/sysa/run2.sh b/sysa/run2.sh
index 6b5f6b23..e3ec4fcc 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -34,6 +34,8 @@ go_sysb() {
     kexec -e
 }
 
+build automake-1.15.1
+
 build binutils-2.24
 
 # Build musl with fewer patches
diff --git a/sysc/automake-1.15.1/sources b/sysc/automake-1.15.1/sources
deleted file mode 100644
index d90c5d2a..00000000
--- a/sysc/automake-1.15.1/sources
+++ /dev/null
@@ -1 +0,0 @@
-http://mirrors.kernel.org/gnu/automake/automake-1.15.1.tar.xz af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf
diff --git a/sysc/init b/sysc/init
index 915685be..de435e90 100755
--- a/sysc/init
+++ b/sysc/init
@@ -38,6 +38,7 @@ 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.24 0
 install_tar bzip2-1.0.8 0
 install_tar bison-3.4.1 2
diff --git a/sysc/run.sh b/sysc/run.sh
index 32384600..3ef547a5 100755
--- a/sysc/run.sh
+++ b/sysc/run.sh
@@ -70,8 +70,6 @@ build file-5.44
 
 build libtool-2.4.7
 
-build automake-1.15.1
-
 build tar-1.34
 
 build coreutils-8.32

From d8c033aa796f985a3da527fc3d39e4d1280cb554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 27 Feb 2023 09:51:00 +0800
Subject: [PATCH 07/11] Remove set -x hack.

---
 sysa/run2.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sysa/run2.sh b/sysa/run2.sh
index e3ec4fcc..f747cea1 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -52,10 +52,7 @@ build findutils-4.2.33
 
 build musl-1.2.3
 
-# This hack fixes a strange bug in mes libc bash
-set -x
 build linux-headers-5.10.41 '' '' linux-5.10.41
-set +x
 
 build gcc-4.0.4 pass2.sh
 

From 1a2a4c1c6c690e33d5b454b36dba1cec64a142f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 27 Feb 2023 12:03:03 +0800
Subject: [PATCH 08/11] Update to xz-5.4.1.

---
 LICENSES/Unlicense.txt                        | 22 -------------------
 parts.rst                                     |  2 +-
 sysa/SHA256SUMS.pkgs                          |  2 +-
 sysc/run.sh                                   |  2 +-
 sysc/xz-5.0.5/patches/xz_automake.patch       | 19 ----------------
 sysc/xz-5.0.5/sources                         |  1 -
 sysc/xz-5.4.1/sources                         |  1 +
 .../xz-5.0.5.sh => xz-5.4.1/xz-5.4.1.sh}      |  7 ++++--
 8 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 LICENSES/Unlicense.txt
 delete mode 100644 sysc/xz-5.0.5/patches/xz_automake.patch
 delete mode 100644 sysc/xz-5.0.5/sources
 create mode 100644 sysc/xz-5.4.1/sources
 rename sysc/{xz-5.0.5/xz-5.0.5.sh => xz-5.4.1/xz-5.4.1.sh} (57%)

diff --git a/LICENSES/Unlicense.txt b/LICENSES/Unlicense.txt
deleted file mode 100644
index 5227a51b..00000000
--- a/LICENSES/Unlicense.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute
-this software, either in source code form or as a compiled binary, for any
-purpose, commercial or non-commercial, and by any means.
-
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and
-to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of relinquishment
-in perpetuity of all present and future rights to this software under copyright
-law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH
-THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
diff --git a/parts.rst b/parts.rst
index c89356d4..ccdbfe85 100644
--- a/parts.rst
+++ b/parts.rst
@@ -697,7 +697,7 @@ sysb is purely a transition to sysc, allowing binaries from sysa to get onto a
 disk (as sysa does not necessarily have hard disk support in the kernel).
 It populates device nodes, mounts sysc, copies over data, and executes sysc.
 
-xz 5.0.5
+xz 5.4.1
 ========
 
 XZ Utils is a set of free software command-line lossless data compressors,
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 33798b3e..7da81dc7 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -110,5 +110,5 @@ afe30ba8abf45ac3605c09df93ec3b2fec29c242bf5193a2086ef32340c6ebc6  tcc-0.9.27_2.t
 50b867379c97a45da3313c74341d3c880370b61f2ac20734e19b0714271a9861  texinfo-6.7_0.tar.bz2
 75a57f10e2e6060d6c754730297ee210976ed8adb03efe7a42095167da7a3507  util-linux-2.19.1_0.tar.bz2
 145bdcd8866199839f112cb1ccdef26b6d337c7aa651e95b9c8a6dc770450b3e  which-2.21_0.tar.bz2
-2f13766643924a17fea7f44d0a4ed353fe1b9a7d288799c5672619665582cd14  xz-5.0.5_0.tar.bz2
+1ce23bc276d1148a80d36f5a95e60aa5168d22c9ef5e28705c6deb53d4b92d0f  xz-5.4.1_0.tar.bz2
 481c4b1970dbf9845be26b55c59556903b0b1f924f48efe5c728b76e482ab485  zlib-1.2.13_0.tar.bz2
diff --git a/sysc/run.sh b/sysc/run.sh
index 3ef547a5..dab41f3c 100755
--- a/sysc/run.sh
+++ b/sysc/run.sh
@@ -64,7 +64,7 @@ else
     mkdir -p "${DISTFILES}"
 fi
 
-build xz-5.0.5
+build xz-5.4.1
 
 build file-5.44
 
diff --git a/sysc/xz-5.0.5/patches/xz_automake.patch b/sysc/xz-5.0.5/patches/xz_automake.patch
deleted file mode 100644
index 5db0e506..00000000
--- a/sysc/xz-5.0.5/patches/xz_automake.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-SPDX-FileCopyrightText: 2021 Andrius Štikonas <andrius@stikonas.eu>
-
-SPDX-License-Identifier: Unlicense
-
-Build with Automake 1.10
-
---- configure.ac	2021-03-25 21:25:45.309736487 +0000
-+++ configure.ac	2021-03-25 21:28:06.683426486 +0000
-@@ -417,8 +417,8 @@
- echo "Initializing Automake:"
- 
- # Automake 1.10 should still be enough but you need to omit serial-tests.
--dnl AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99])
--AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests])
-+AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99])
-+dnl AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests])
- AC_PROG_LN_S
- 
- AC_PROG_CC_C99
diff --git a/sysc/xz-5.0.5/sources b/sysc/xz-5.0.5/sources
deleted file mode 100644
index 76f25cc8..00000000
--- a/sysc/xz-5.0.5/sources
+++ /dev/null
@@ -1 +0,0 @@
-http://ixpeering.dl.sourceforge.net/project/lzmautils/xz-5.0.5.tar.bz2 166c48d2842519bc4f96333bff9e265f8cdda44d38e40594ef3f9bbb52890490
diff --git a/sysc/xz-5.4.1/sources b/sysc/xz-5.4.1/sources
new file mode 100644
index 00000000..26dd3979
--- /dev/null
+++ b/sysc/xz-5.4.1/sources
@@ -0,0 +1 @@
+http://ixpeering.dl.sourceforge.net/project/lzmautils/xz-5.4.1.tar.bz2 dd172acb53867a68012f94c17389401b2f274a1aa5ae8f84cbfb8b7e383ea8d3
diff --git a/sysc/xz-5.0.5/xz-5.0.5.sh b/sysc/xz-5.4.1/xz-5.4.1.sh
similarity index 57%
rename from sysc/xz-5.0.5/xz-5.0.5.sh
rename to sysc/xz-5.4.1/xz-5.4.1.sh
index 9fcac8f6..dad9fb80 100755
--- a/sysc/xz-5.0.5/xz-5.0.5.sh
+++ b/sysc/xz-5.4.1/xz-5.4.1.sh
@@ -3,15 +3,18 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 src_prepare() {
-    default
+    # Delete translation catalogs
+    find . -name "*.gmo" -delete
+    rm -rf po4a/man
 
-    AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 AUTOCONF=autoconf-2.64 AUTOM4TE=autom4te-2.64 autoreconf-2.64 -f
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOM4TE=autom4te-2.69 autoreconf-2.69 -f
 }
 
 src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --disable-shared \
+        --disable-nls \
         --build=i386-unknown-linux-musl \
         --libdir="${LIBDIR}"
 }

From 57b55b8652bffb40cfc87ef62c27b81af5221a3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 27 Feb 2023 13:12:37 +0800
Subject: [PATCH 09/11] Use newer autotools.

---
 sysa/SHA256SUMS.pkgs                | 4 ++--
 sysc/file-5.44/file-5.44.sh         | 2 +-
 sysc/libtool-2.4.7/libtool-2.4.7.sh | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 7da81dc7..4e1e587f 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -41,7 +41,7 @@ f1a17f3d1c65140a6d3043ecb710e5fffe9c019cb3d2eaa982be03706876e534  diffutils-2.7_
 de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45  dist-3.5-236_0.tar.bz2
 67cccd627c4f940214907c55d0a78c3b1abb996729298e2c41f7f83776e5dd0f  e2fsprogs-1.45.7_0.tar.bz2
 30998009d585c8f83ec70db2fcecc4fffcd17d7ddcd5e282a04fac005e680880  ed-1.4_0.tar.bz2
-bc381a028836d7ba2b679d4c41167180f23d3d8a4720453534be9500185f05f9  file-5.44_0.tar.bz2
+ea3d239b97a28f6f15614037ddb19d0aa544588391ecf1f70f8dd281ce3d3270  file-5.44_0.tar.bz2
 8a0405a66c09c6e1647078c919ae54948f069632214c8430af7adbdb176f62e2  findutils-4.2.33_0.tar.bz2
 3c85ce52e37c313d699a21cc741d24e808048461b105f58445a645a54ea55436  flex-2.5.11_0.tar.bz2
 857c77c8e8a53b8201901fa347a0c7cf44c5fea50a3204d171d49737a298fe24  flex-2.5.33_0.tar.bz2
@@ -65,7 +65,7 @@ c3b54377ea461e73a171158cef90e3f744c4bb18d2981e2cb1cf8948dd56dcf4  grep-3.7_0.tar
 e479b8ba2e13081bf31a416c463be98feb3f747630418de7ed40f309005c3412  libatomic_ops-7.6.10_0.tar.bz2
 fcf30550a8e84be824fd2296a7964c404cb54e9df2f31af484a504342342c0fe  libffi-3.3_0.tar.bz2
 daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29  libtool-2.2.4_0.tar.bz2
-5cf56c632724ab73ef3f6178ce5aa2aab39b3ff3aa29f41feb0f16983d3b88c6  libtool-2.4.7_0.tar.bz2
+fcb24c5f5906d4b4196ed39a8e84b79b889ba99a3c06e101e950388ec8f100fc  libtool-2.4.7_0.tar.bz2
 564fcf89cb762b99e58dddb39c3812084a701447209bd4cf0dc06661e337c265  libunistring-0.9.10_0.tar.bz2
 1d07aaf7049be45853fd409340cdb52bb3a1b6dfa4dbc8b69358c1ee966cd67f  linux-4.9.10_0.tar.bz2
 2fd5bec0c086cb89596f14894cbf078b3d1e990d297ba02b6cc4135e7d64996b  linux-headers-5.10.41_0.tar.bz2
diff --git a/sysc/file-5.44/file-5.44.sh b/sysc/file-5.44/file-5.44.sh
index 09e30cff..f4762ad3 100755
--- a/sysc/file-5.44/file-5.44.sh
+++ b/sysc/file-5.44/file-5.44.sh
@@ -5,7 +5,7 @@
 src_prepare() {
     default
 
-    AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 autoreconf-2.64 -fi
+    AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 autoreconf-2.69 -fi
 }
 
 src_configure() {
diff --git a/sysc/libtool-2.4.7/libtool-2.4.7.sh b/sysc/libtool-2.4.7/libtool-2.4.7.sh
index 7cba3b06..ac3269f2 100755
--- a/sysc/libtool-2.4.7/libtool-2.4.7.sh
+++ b/sysc/libtool-2.4.7/libtool-2.4.7.sh
@@ -16,8 +16,8 @@ src_prepare() {
 
     LIBTOOLIZE=true AUTOPOINT=true ../../bootstrap-helper.sh
 
-    LIBTOOLIZE=true AUTOPOINT=true AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 AUTOCONF=autoconf-2.64 AUTOHEADER=autoheader-2.64 autoreconf-2.64 -fi
-    LIBTOOLIZE=true AUTOPOINT=true AUTOMAKE=automake-1.11 ACLOCAL=aclocal-1.11 AUTOCONF=autoconf-2.64 AUTOHEADER=autoheader-2.64 autoreconf-2.64 -fi libltdl
+    LIBTOOLIZE=true AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOHEADER=autoheader-2.69 autoreconf-2.69 -fi
+    LIBTOOLIZE=true AUTOPOINT=true AUTOMAKE=automake-1.15 ACLOCAL=aclocal-1.15 AUTOCONF=autoconf-2.69 AUTOHEADER=autoheader-2.69 autoreconf-2.69 -fi libltdl
 }
 
 src_configure() {
@@ -35,7 +35,7 @@ src_configure() {
 }
 
 src_compile() {
-    make AUTOM4TE=autom4te-2.64 MAKEINFO=true
+    make AUTOM4TE=autom4te-2.69 MAKEINFO=true
 }
 
 src_install() {

From 8fbc5b06c74d6e5f557471ae048306b2b8f3393e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Tue, 28 Feb 2023 13:54:31 +0800
Subject: [PATCH 10/11] Build util-linux without cramfs that fails to build
 with new binutils. Enable libuuid that might be useful for python later.

Also fixes #244.
---
 sysa/SHA256SUMS.pkgs                        | 2 +-
 sysa/util-linux-2.19.1/util-linux-2.19.1.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index 4e1e587f..fedbfb43 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -108,7 +108,7 @@ a07edeebe88d27afe01ae4b9c2fec7d26f54d87928976927f73d9dba5f50782b  tcc-0.9.27_0.t
 afe30ba8abf45ac3605c09df93ec3b2fec29c242bf5193a2086ef32340c6ebc6  tcc-0.9.27_2.tar.bz2
 90ccfdd7d8ff855183cd873af027262b525c63c65b438e49deeb9e84bef1542c  tcc-0.9.27_3.tar.bz2
 50b867379c97a45da3313c74341d3c880370b61f2ac20734e19b0714271a9861  texinfo-6.7_0.tar.bz2
-75a57f10e2e6060d6c754730297ee210976ed8adb03efe7a42095167da7a3507  util-linux-2.19.1_0.tar.bz2
+4a4c40c3ab4d9255e53c582314968980ec85a44dd4e270b32367b11f3b3242ce  util-linux-2.19.1_0.tar.bz2
 145bdcd8866199839f112cb1ccdef26b6d337c7aa651e95b9c8a6dc770450b3e  which-2.21_0.tar.bz2
 1ce23bc276d1148a80d36f5a95e60aa5168d22c9ef5e28705c6deb53d4b92d0f  xz-5.4.1_0.tar.bz2
 481c4b1970dbf9845be26b55c59556903b0b1f924f48efe5c728b76e482ab485  zlib-1.2.13_0.tar.bz2
diff --git a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
index 1e26dc08..4e6b986b 100755
--- a/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
+++ b/sysa/util-linux-2.19.1/util-linux-2.19.1.sh
@@ -15,10 +15,10 @@ src_configure() {
         --sbindir="${PREFIX}/bin" \
         --libdir="${LIBDIR}" \
         --build=i386-unknown-linux-gnu \
-        --disable-libuuid \
+        --disable-cramfs \
         --without-ncurses \
         --enable-static \
-        --enable-static-programs=losetup,mount,umount,fdsik,sfdisk,blkid \
+        --enable-static-programs=losetup,mount,umount,fdisk,sfdisk,blkid \
         --enable-shared=no \
         --disable-wall \
         ac_cv_type_loff_t=yes

From db9dd4628ab05dd5fd06ec4a12ff69de3f916e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Tue, 28 Feb 2023 08:32:18 +0800
Subject: [PATCH 11/11] Add binutils 2.30.

---
 parts.rst                                     |   2 +-
 sysa/SHA256SUMS.pkgs                          | 102 +++++++++---------
 sysa/binutils-2.24/sources                    |   1 -
 .../binutils-2.30.sh}                         |  46 ++++----
 ...d-missing-config-directory-reference.patch |  18 ++++
 sysa/binutils-2.30/patches/new-gettext.patch  |  17 +++
 ...i386-init-dependencies-are-satisfied.patch |  17 +++
 sysa/binutils-2.30/sources                    |   1 +
 sysa/linux-4.9.10/linux-4.9.10.sh             |   3 +
 sysa/run2.sh                                  |   2 +-
 sysc/init                                     |   2 +-
 11 files changed, 133 insertions(+), 78 deletions(-)
 delete mode 100644 sysa/binutils-2.24/sources
 rename sysa/{binutils-2.24/binutils-2.24.sh => binutils-2.30/binutils-2.30.sh} (71%)
 create mode 100644 sysa/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch
 create mode 100644 sysa/binutils-2.30/patches/new-gettext.patch
 create mode 100644 sysa/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch
 create mode 100644 sysa/binutils-2.30/sources

diff --git a/parts.rst b/parts.rst
index ccdbfe85..4ab222b3 100644
--- a/parts.rst
+++ b/parts.rst
@@ -553,7 +553,7 @@ automake 1.15.1
 
 GNU Automake from 1.15 series. This is the last version that runs on Perl 5.6.
 
-binutils 2.24
+binutils 2.30
 =============
 
 The GNU Binary Utilities, or binutils, are a set of programming tools for creating and
diff --git a/sysa/SHA256SUMS.pkgs b/sysa/SHA256SUMS.pkgs
index fedbfb43..e055d7fb 100644
--- a/sysa/SHA256SUMS.pkgs
+++ b/sysa/SHA256SUMS.pkgs
@@ -9,106 +9,106 @@ d5fcce4baea5e11f983a7e4b7148545ab6720bb4e010898c73387f6711be67f4  autoconf-2.64_
 298dcf17a439adb306237b308e3c4ed3d376cb863ae0f0f08bfdf1f3199a548b  autoconf-2.69_0.tar.bz2
 8c2401edf1c68910005bbcb8b8e84727a46f7d9643d2ad1267bd0259078dadc4  autoconf-2.71_0.tar.bz2
 6ff691e3ddd4f3d1796d28b07a2a96691dbd9801844c99ccbe660da59dabd74b  autoconf-archive-2021.02.19_0.tar.bz2
-5edc04b6e2df83fd854d2f2ccc52ce1987ece8fb8dcbeaf5899aae64f36d4b6d  autogen-5.18.16_0.tar.bz2
+de6e6d994a0ba722c28a4d3a623bdcf26fc29b99aed2fa4fea42fc6adbe3ad80  autogen-5.18.16_0.tar.bz2
 02a426e82a52d4a2cd7e73fe3dc5a2c58b3ed100f24a92c57e42511fd86e247c  automake-1.10.3_0.tar.bz2
 34925adeaa2876a5e068adeb17b71fe7c7105244c3cb5439d33f7406310674da  automake-1.11.2_0.tar.bz2
 a7bd12bd0c639783ce1c0e9f640cf004a87460bbda8154bc550c5e6884457b48  automake-1.15.1_0.tar.bz2
 57100612d902537b72ee2fd3dfecc903f2ea3959f1a480af87c6a1ef9a9d7c03  automake-1.16.3_0.tar.bz2
 1c7e09ac08f156960420fca1f6e8560c1855bf01b001a0648b56153d6ceb9c28  automake-1.6.3_0.tar.bz2
 444131776779d1f27628088a817bfb8c9aa85f4b036b934794a71e484ec9bd70  automake-1.6.3_1.tar.bz2
-ef08694bf8e78ffcf56f9c8a63b0f189e301c06f02ab240e15e4c7fe354c2a0d  automake-1.7_0.tar.bz2
 e8ff13753943e43972a8cf1672819f001718ed38e5497cf7b554c21a507ba22b  automake-1.7.8_0.tar.bz2
+ef08694bf8e78ffcf56f9c8a63b0f189e301c06f02ab240e15e4c7fe354c2a0d  automake-1.7_0.tar.bz2
 9922651b64ad2e29b944082f26db223008220155048f25d64df1f6d82071ff1c  automake-1.8.5_0.tar.bz2
 c5807850a377e4bb9aa4121d9781d145bdd80327626a9419630a75ce2c8d9c71  automake-1.9.6_0.tar.bz2
 ca49c0338d6aed5131f907d375384bf42e70f2875f58973da0015b4fb73156cc  bash-5.2.15_0.tar.bz2
-78c5e718510fcf0ab4296d5cfac114abb31af4a30aa5c9f2c0844d7ee5bae5c5  bc-1.07.1_0.tar.bz2
-b06a20417c7dadb007f3e6930b8385ad934651756a339d8a87e086b1139e62d8  binutils-2.24_0.tar.bz2
-aa910ea75172041b9285436c148f81b3a9fb205f61b88b5e5bbaab2c1cee9484  binutils-2.38_0.tar.bz2
-9ff9b31de7aab2b10f29bb2e0cacc4a30b31e4c0dc15d6fa1202181204aaa6e6  bison-2.3_0.tar.bz2
+438f0b623af8d7a558696d47554554d3a6c9e9a655569d059bfd1e679723d037  bc-1.07.1_0.tar.bz2
+25fc6ea74005ae5677ea790e228a710fb82a80d9a7a56b5a8ddc5789aff4e209  binutils-2.30_0.tar.bz2
+1669443c1aa95c21a98a9f13f4c011d97e71eb267c7c6502d33298cc4b7170ce  binutils-2.38_0.tar.bz2
+3adc15234e0ea7ad85f6e24f488851532831602a1ae91d77c13f570cc8e0734b  bison-2.3_0.tar.bz2
 b2e45aec68221e6874ea8aa7d5b6a0aab7879a3dbee493536e034b246a884b05  bison-3.4.1_0.tar.bz2
 4b2fa2ddde419e9cc47f68e4aad4e4bd403570664c02a7d0d488417baecafd03  bison-3.4.1_1.tar.bz2
 6a6111b1e8ca906406482053cf0af8c9dea46dc55e4bac9662c8fe47f94221cb  bison-3.4.1_2.tar.bz2
-82f898a46d0d469a0df3bc547572fa08c0866251ec35a6a8c18f8d3aaf86ee1a  bison-3.4.2_0.tar.bz2
+7bb0f997d84c190d36bf2c378ae08ebdac141c70cb0ab8ccaf776d77a72edb61  bison-3.4.2_0.tar.bz2
 c6369fcf4ba1fae200a4a67f110563a11d6c51fa8ca80792dbc4630e3dba6f4d  bzip2-1.0.8_0.tar.bz2
 ee54199d62226e22a10f9d816902d71e220ca4bcf5f7508c259702c6f480c446  ca-certificates-3.86_0.tar.bz2
 0d02d37d02d6def11b5f12eab5d97f47dc1e4abd53627deb2d99994e1ab9c6a8  coreutils-5.0_0.tar.bz2
 27d0d3e84794f080f01c7c22547a308d1d781d8ce85d5b3f682c379f17bbeb47  coreutils-6.10_0.tar.bz2
-6cb019c82dcef6db019ad2bbdf5ec70582805d363a8b285c435d25b1254e82b0  coreutils-8.32_0.tar.bz2
-83f818bc3219411d055cf2954484775b5d1ef7087c48aa7c2542ced3a78bf1f3  curl-7.83.0_0.tar.bz2
-d6a43ad9a56f21407e72820e0bafabd7b4bb3def9d9ba717203964fa2d500a00  curl-7.83.0_1.tar.bz2
-8a25ed4c278fc08ae7cdb8b396aaca0d5b5e111042c50d5d2a1046dc7e6e5dea  dhcpcd-9.4.1_0.tar.bz2
+84b86e2b2f2fbf1c729acb78b750873c18d8995263aeebf2ee07add41fefcd25  coreutils-8.32_0.tar.bz2
+b72e6a7b2ec147e2892322b1f0dcefc20f00f6ce0b5e1cee8d75192598fc67ce  curl-7.83.0_0.tar.bz2
+f66f71328c6848f5dfa3d53e3dcab29c147b0223a0f9dd1edce1db6dadd3f519  curl-7.83.0_1.tar.bz2
+0b832d3efef962c10b61559052373267e9c85bbff37572b736a6996823e2d5b2  dhcpcd-9.4.1_0.tar.bz2
 f1a17f3d1c65140a6d3043ecb710e5fffe9c019cb3d2eaa982be03706876e534  diffutils-2.7_0.tar.bz2
 de6d9df33107ae63b8e0f30902fe9d00e42f78f44a60b256bb0b3c82ff75bd45  dist-3.5-236_0.tar.bz2
-67cccd627c4f940214907c55d0a78c3b1abb996729298e2c41f7f83776e5dd0f  e2fsprogs-1.45.7_0.tar.bz2
-30998009d585c8f83ec70db2fcecc4fffcd17d7ddcd5e282a04fac005e680880  ed-1.4_0.tar.bz2
-ea3d239b97a28f6f15614037ddb19d0aa544588391ecf1f70f8dd281ce3d3270  file-5.44_0.tar.bz2
+47b1954e16d4cafd6ecb3b5751ff3716677c4f509618973d8a2aa0b4126bfd0a  e2fsprogs-1.45.7_0.tar.bz2
+a5695b0014c0f0fa8a1cb6ff85b14e578664d8d0da949007dc77fd0243755ec6  ed-1.4_0.tar.bz2
+258282c136145d8fba4d66f7e150800e7ca33e024483083a15d0dba3aeb5e86b  file-5.44_0.tar.bz2
 8a0405a66c09c6e1647078c919ae54948f069632214c8430af7adbdb176f62e2  findutils-4.2.33_0.tar.bz2
 3c85ce52e37c313d699a21cc741d24e808048461b105f58445a645a54ea55436  flex-2.5.11_0.tar.bz2
-857c77c8e8a53b8201901fa347a0c7cf44c5fea50a3204d171d49737a298fe24  flex-2.5.33_0.tar.bz2
+3095a6769c24b52d889f5d776b308afab9c0ee0f1b2d4e53fbf5942cc3e93075  flex-2.5.33_0.tar.bz2
 3ad2660bff8b84ddb47cc5f9f57f10a7370fab1e1b7f94e8e36d472a4783871c  flex-2.6.4_0.tar.bz2
 6e04827921b5f23de5c4d9367509b5644af0162189f007094447bc5f527b17c4  gawk-3.0.4_0.tar.bz2
 458b64a564ca1ef32ed1c682187caa59743a772210fc51a2bc7f11859bdc98f8  gc-8.0.4_0.tar.bz2
-d53d3945d5100228f6095821de9195cb117963a0fe95618e3e71d7f568fb4eaa  gcc-10.4.0_0.tar.bz2
-c0f07510fad60d2131ab43f5b637510c72f00c8e8a17b3c097614767427dc200  gcc-4.0.4_0.tar.bz2
-f012bdfee3d5cd2eec44bcada88194ab0289ccda305c6133b8d3d29374f5f17f  gcc-4.0.4_1.tar.bz2
-56641523fc853138f8b6901a87129e45b5c26faffe8ba37eb819ea6b3fe61e21  gcc-4.7.4_0.tar.bz2
-5d8638631eb504d11111518902273f23bf656b44a3c52275779791b4bb7e17d7  gettext-0.21_0.tar.bz2
-7a2958d5a76de040a3f585e099c7388a7378aabdb3dedf6de735231675e3eaf7  gmp-6.2.1_0.tar.bz2
-880cfcbd1757102e91e80442a8da86be4d462b9dda7003948491672e65614cee  gperf-3.1_0.tar.bz2
+5271e45a746be6e82fd42e4b403c718b1586e4fac4dc0a12107ad76ae4d26419  gcc-10.4.0_0.tar.bz2
+72b5ba8ce1f20f0e94a852b04dba147ff2e6232de75628338bc90fea89eaa492  gcc-4.0.4_0.tar.bz2
+bcc8a0549af3542b23005ea666c721a8449007b6b3954abf3eb07dad5a221e76  gcc-4.0.4_1.tar.bz2
+32e569821cf1e8335fb451242f50e815a6e3432a96448a2f03ee97c4d2a48c6d  gcc-4.7.4_0.tar.bz2
+8b202009e6adec4215476b77c7d613d345feef61f02b74b1cd8168fb61007ed8  gettext-0.21_0.tar.bz2
+5fbb65d90f3b64034ddb74fe2cf666b348356cdf2c4f437c77dea57dc0cc1c9b  gmp-6.2.1_0.tar.bz2
+02b8c1ceaafb621bea9c1e583f12dd5a40003c4b551be0790f37305f6f78cb10  gperf-3.1_0.tar.bz2
 c963b667dd0ac1e8cef4b2525fcd5d53237d83d16b6f70855c199472a0dc419f  grep-2.4_0.tar.bz2
 c3b54377ea461e73a171158cef90e3f744c4bb18d2981e2cb1cf8948dd56dcf4  grep-3.7_0.tar.bz2
-48a31f39824e88d5a7adaae5b8f622b4fcca609bf01521c5dc9fb946e41cf73f  guile-3.0.7_0.tar.bz2
+057c134b9866d1ba8da6cd24d8daefcca13da0012deb9350e4cdef2688f3ac23  guile-3.0.7_0.tar.bz2
 911d2f496ce02e8b95e0f3bf6eb94460b4b083dd13601f81d45f68b896ac9ef4  help2man-1.36.4_0.tar.bz2
-45e7a0d2b78fd6c3635e399e0de73142ff1e39a12c95cba89083e3cc3dd03d35  kbd-1.15_0.tar.bz2
-1198ca1fd2b62c34e265b9ba394670896693fde4470463cb00296fe809aa683e  kexec-tools-2.0.22_0.tar.bz2
-180ebd545ccfefdf54b5497d8c75dd65f67df9658a24530a7ca3197ee9c59c65  libarchive-3.5.2_0.tar.bz2
+e7f9cecc03f7746b67a74de6ce15f83628dcd08e7896ffbb707990cc575f6c7e  kbd-1.15_0.tar.bz2
+bc92c7cc72df7dc5190cbce3439be3ec10f461f9f85d9b0283428e467fa43e7c  kexec-tools-2.0.22_0.tar.bz2
+743d52bfe2260bd648f78e90b81c9d999576fdf1375d8e936f9a7112c2a31ca2  libarchive-3.5.2_0.tar.bz2
 e479b8ba2e13081bf31a416c463be98feb3f747630418de7ed40f309005c3412  libatomic_ops-7.6.10_0.tar.bz2
 fcf30550a8e84be824fd2296a7964c404cb54e9df2f31af484a504342342c0fe  libffi-3.3_0.tar.bz2
 daae709e98d2df2190d1d13b4e86f7f3fe90fa7a975282fe0bb03289b6539f29  libtool-2.2.4_0.tar.bz2
-fcb24c5f5906d4b4196ed39a8e84b79b889ba99a3c06e101e950388ec8f100fc  libtool-2.4.7_0.tar.bz2
+9572bfed88a59af351856cb56e7afe3ffe5c14aae50880d3a77c80eab65deac1  libtool-2.4.7_0.tar.bz2
 564fcf89cb762b99e58dddb39c3812084a701447209bd4cf0dc06661e337c265  libunistring-0.9.10_0.tar.bz2
 1d07aaf7049be45853fd409340cdb52bb3a1b6dfa4dbc8b69358c1ee966cd67f  linux-4.9.10_0.tar.bz2
 2fd5bec0c086cb89596f14894cbf078b3d1e990d297ba02b6cc4135e7d64996b  linux-headers-5.10.41_0.tar.bz2
 a8e75e491322f09b90e0685b9468c589ec38a52529c362e14516cb32e5e57fe3  m4-1.4.7_0.tar.bz2
-004db605e8f83d06ab4918f5c2fe3baac33767c8b88af82fa8c1ab9aff9cb997  make-3.82_0.tar.bz2
-fd726204b37a1dbbd698ceb2d140dd9832fe216b31e24d335de75765eb6799f5  make-4.2.1_0.tar.bz2
-1f370b1611dc94e0c83e73a067a5775e7255b04e79f0279289e96d09780e8060  mpc-1.2.1_0.tar.bz2
-ec1692e077cbd24160bb4a07dfe08e7bcfd6549c1a159f3950550fdd44f2c8f4  mpfr-4.1.0_0.tar.bz2
+128c5247064a9677d1037113707d8d4c92cea51ab21058a1f85c6df566e22162  make-3.82_0.tar.bz2
+ddbdaf535eb56c7a334e715fbdc7177abc56ec6bc2ae5594fd171c7db160f5ce  make-4.2.1_0.tar.bz2
+2d060023cb87e992746d2836690e6579c3c2990ec006e4475aadfffe15e31c72  mpc-1.2.1_0.tar.bz2
+6ddf27c49c59e241ad3dadbb5d7ef94b8c24e6de7b9f8717d5643352e46233e2  mpfr-4.1.0_0.tar.bz2
 d06f045be683f7a2cdc3eb79592f75517100d0bcda4fe7924200c065ff52c9f5  musl-1.1.24_0.tar.bz2
 280b05d6c2f7458cf3bde6985c3b2f876e9c361943b0ba3044e389e033d97622  musl-1.1.24_1.tar.bz2
-553a23cf8ac138e7482bacf2b9ddcb794607bb42354b19f81e19a3ca5e8f35aa  musl-1.1.24_2.tar.bz2
-f0339ce3cebb19dbb2e8359ba6894ca37f264579889df696bb23c6061a2ed30f  musl-1.2.3_0.tar.bz2
+a12d2442623de67e837c5f42f44bea8e15ecb534d1f23efa182c3603795515d3  musl-1.1.24_2.tar.bz2
+054c6a5f1c07d124b701e590267aa8fb2ba1c88bed9a69a473724f8534cdb728  musl-1.2.3_0.tar.bz2
 ab70ad217e736de89441817124f44eee39b0bbc7e005b67788974f08264074da  musl-1.2.3_1.tar.bz2
-eed3605356b4e8442f35cd6eae458e45f477757a403b7ebc954717418f61438d  openssl-1.1.1l_0.tar.bz2
-8a2f8ec8d559ae98560e73c729cbf8330a0f7923f9c3538d4dce0282f21db833  patch-2.7.6_0.tar.bz2
+e928ee2fc7afb0c3c70db12ab145031bb52287f70fc7aedca5bc54f0504cf808  openssl-1.1.1l_0.tar.bz2
+77bebd3a87b0f6c92837d28b9e5767e334386981c628c54da03b7c131432bfa7  patch-2.7.6_0.tar.bz2
 8edc149d22a1202938c8ed2c46488115a422fbc44ddfe606727fbe4d362fb07b  perl-5.000_0.tar.bz2
 85653922ee1fd39ef6e8ba6f3720d51c9585800767163f4f502296f4a39f4474  perl-5.003_0.tar.bz2
+8eff45c5e272ad9ff611e0704e9581cd742b7dc648ae4e28607c633e7a3bdba0  perl-5.10.1_0.tar.bz2
+e73e58f3bcb2d15a9f6738d77733b746a20d9ac8d367162fabbd6c053d0517de  perl-5.32.1_0.tar.bz2
+89ae6fb13483b93623aa42f678eee076b42d9a6e2a80147a14e20807b097f940  perl-5.6.2_0.tar.bz2
 9bba76361c28da9a0c19054ccaf8432bbf7ce779584151600ad90c439f0baef5  perl5.004-05_0.tar.bz2
 8efe3102f341c232510e6e24ab51337f15a9d1b3a344962f85131fe31bc50516  perl5.005-03_0.tar.bz2
-d8dd24d5402beaee81effc6b9dfbbdec4bc0bef469743d92c65da55081fdb9ee  perl-5.10.1_0.tar.bz2
-0035aeef386b8ae3f05467ec17a21de646c885f479d31c194bb2351b6889ceb3  perl-5.32.1_0.tar.bz2
-89ae6fb13483b93623aa42f678eee076b42d9a6e2a80147a14e20807b097f940  perl-5.6.2_0.tar.bz2
+8a8dbbe1bc878c373d646c9f1e4d8417697dd4fdab9af924a900accb8a09c5bf  pkg-config-0.29.2_0.tar.bz2
 9cca79b23473f8d2171ee84533abf24bdce976f6149967bdac8b274b9aa4e2a4  python-2.0.1_0.tar.bz2
 bd42838105f7c8c4088f95fe9248fec209f76e2614943dd611990e23b2b8c234  python-2.0.1_1.tar.bz2
 b66dcc0cb5500955009357ac48725f0e4d9f75e45c134925c579f81f36144fb6  python-2.3.7_0.tar.bz2
 201f3e4af49041bb7b7e6b64b591d838fed147b69b3e1c8f7f2923881c6c27e9  python-2.3.7_1.tar.bz2
-4dfa80d265d285bfc3bafaa3e3c744167c9cbf20780dc0ae6b86d9abae69a8ef  python-2.5.6_0.tar.bz2
-8f9eedef9abbac3eea24f9f24d087cb8966c97f6e82230aa5336ab817f1d21b5  python-3.11.1_0.tar.bz2
-9336f7159e43133f71bdc7b8d970fb0712eb80d046dd1ad7963fa390ca742510  python-3.1.5_0.tar.bz2
-ffd69a0d9ab88ca4f2d22ea4747f52610b05669e5faa87908918a1f54a3f724e  python-3.1.5_1.tar.bz2
-761e4d1bd8b5c94be213c41201426df7cb83884070ceecf478f710976bcb5bcd  python-3.3.7_0.tar.bz2
-000565c78e6678421c36f11a9f371f57b6a33723b261231494a71de0c57f4c73  python-3.4.10_0.tar.bz2
-80e1681adc1103c4a09237a351b9b6c290b04d3bcd5492fdbcc4d9923421fcd6  python-3.8.16_0.tar.bz2
-3cb05f043fe4b01804a24077f465bc7470964747493c847b0db54199c29dd08d  pkg-config-0.29.2_0.tar.bz2
+903687e7463c7c09746eee7941308c8dbd288a471c9b8e7ab372da3a08515968  python-2.5.6_0.tar.bz2
+e4eaa4a29502df433019d0c76a6783e9c43eedcedf3afc463b2c516523bd3dae  python-3.1.5_0.tar.bz2
+18300a5259fe6dcbaf212c9ff9c42862d5b5f3c80e1cb4077ce9fe8ee1a81d34  python-3.1.5_1.tar.bz2
+af7a6b0d65ee049cd7a01afc26970e9f7a88e0f0f61e3d4aedd79eaecfd32944  python-3.11.1_0.tar.bz2
+22fd33e93718ceabf9dfb8ddcf8c0f460bd70c99ff6819848849ea35456ad797  python-3.3.7_0.tar.bz2
+453ba593d4c986906d96e972356f51a4e15d9f197a4fde2aa614b19107147a23  python-3.4.10_0.tar.bz2
+f7b069492f9cc0bd403b6afdb5d0f406dfb58fef34d4684d4ca5eda2715a8cc2  python-3.8.16_0.tar.bz2
 e1eb72972dc5eb4bd0fd1fc6a477026440dd292b71f4ef0052f59d89869ab3e3  sed-4.0.9_0.tar.bz2
 4c4c0d811e43373541c2e8a684d0fd536ace7f749445d4e987d9fc3b0c6c228a  sed-4.8_0.tar.bz2
-2e1c061eaecd0de33ec696d923037d9525c33071cbddb74bafb1b0bea7e875cc  tar-1.34_0.tar.bz2
+4123d171fee4de741c4d54dd0898c86c008495150e6b56afc623d1247c15b178  tar-1.34_0.tar.bz2
 a07edeebe88d27afe01ae4b9c2fec7d26f54d87928976927f73d9dba5f50782b  tcc-0.9.27_0.tar.bz2
 6d2b9b7d7970ab06b56ec59785b7c7246ea1da4835893fa7aa0e80eebefe57ff  tcc-0.9.27_1.tar.bz2
 afe30ba8abf45ac3605c09df93ec3b2fec29c242bf5193a2086ef32340c6ebc6  tcc-0.9.27_2.tar.bz2
 90ccfdd7d8ff855183cd873af027262b525c63c65b438e49deeb9e84bef1542c  tcc-0.9.27_3.tar.bz2
-50b867379c97a45da3313c74341d3c880370b61f2ac20734e19b0714271a9861  texinfo-6.7_0.tar.bz2
-4a4c40c3ab4d9255e53c582314968980ec85a44dd4e270b32367b11f3b3242ce  util-linux-2.19.1_0.tar.bz2
+9be7c52bb8f8508bcc0aabed36cec6b5cdceb8bec4596b91bef0ced0c0d7a5a2  texinfo-6.7_0.tar.bz2
+11d471567f28e9ef67d9381246f0684d21ab33d27ea2e0d721c82c469f5f2f8b  util-linux-2.19.1_0.tar.bz2
 145bdcd8866199839f112cb1ccdef26b6d337c7aa651e95b9c8a6dc770450b3e  which-2.21_0.tar.bz2
-1ce23bc276d1148a80d36f5a95e60aa5168d22c9ef5e28705c6deb53d4b92d0f  xz-5.4.1_0.tar.bz2
-481c4b1970dbf9845be26b55c59556903b0b1f924f48efe5c728b76e482ab485  zlib-1.2.13_0.tar.bz2
+5ebfb0894b25606432d120eefabe5335abcbf123bbad23fb11871b74acd6a7e5  xz-5.4.1_0.tar.bz2
+8824a6b328f4ab0ce5d1380b1e202441edadbb70410bbd3b6cc46a6ee789f4a2  zlib-1.2.13_0.tar.bz2
diff --git a/sysa/binutils-2.24/sources b/sysa/binutils-2.24/sources
deleted file mode 100644
index 71ab9d66..00000000
--- a/sysa/binutils-2.24/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://mirrors.kernel.org/gnu/binutils/binutils-2.24.tar.bz2 e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137
diff --git a/sysa/binutils-2.24/binutils-2.24.sh b/sysa/binutils-2.30/binutils-2.30.sh
similarity index 71%
rename from sysa/binutils-2.24/binutils-2.24.sh
rename to sysa/binutils-2.30/binutils-2.30.sh
index c870bd3c..bdffe658 100755
--- a/sysa/binutils-2.24/binutils-2.24.sh
+++ b/sysa/binutils-2.30/binutils-2.30.sh
@@ -13,10 +13,11 @@ src_prepare() {
     rm etc/Makefile.in etc/configure
 
     # Regenerate files
-    for dir in bfd binutils gas gold gprof intl ld libiberty opcodes; do
+    for dir in bfd binutils gas gprof intl ld libiberty opcodes zlib; do
+    (
         cd $dir
         AUTOPOINT=true ACLOCAL=aclocal-1.11 AUTOMAKE=automake-1.11 autoreconf-2.64 -fi
-        cd ..
+    )
     done
 
     ACLOCAL=aclocal-1.11 autoreconf-2.64 -fi
@@ -26,14 +27,14 @@ src_prepare() {
     rm binutils/arparse.c binutils/arparse.h
     rm binutils/defparse.c binutils/defparse.h
     rm binutils/mcparse.c binutils/mcparse.h
-    rm binutils/nlmheader.c binutils/nlmheader.h
     rm binutils/rcparse.c binutils/rcparse.h
     rm binutils/sysinfo.c binutils/sysinfo.h
     rm gas/bfin-parse.c gas/bfin-parse.h
     rm gas/m68k-parse.c gas/rl78-parse.c
     rm gas/rl78-parse.h gas/rx-parse.c
     rm gas/rx-parse.h gas/itbl-parse.c
-    rm gas/itbl-parse.h intl/plural.c
+    rm gas/itbl-parse.h gold/yyscript.c
+    rm gold/yyscript.h intl/plural.c
     rm ld/deffilep.c ld/deffilep.h
     rm ld/ldgram.c ld/ldgram.h
 
@@ -45,7 +46,6 @@ src_prepare() {
 
     # Remove prebuilt texinfo files
     rm bfd/doc/bfd.info binutils/doc/binutils.info
-    rm etc/configure.info etc/standards.info
     rm gas/doc/as.info gprof/gprof.info ld/ld.info
 
     # Remove pregenerated opcodes files
@@ -63,12 +63,14 @@ src_prepare() {
 }
 
 src_configure() {
-    for dir in intl libiberty opcodes bfd binutils gas gprof ld; do
+    for dir in intl libiberty opcodes bfd binutils gas gprof ld zlib; do
+    (
         cd $dir
 
-        LD="true" AR="tcc -ar" RANLIB="true" CC="tcc" ./configure \
+        LD="true" AR="tcc -ar" CC="tcc" ./configure \
             --disable-nls \
             --enable-deterministic-archives \
+            --enable-64-bit-bfd \
             --build=i386-unknown-linux-gnu \
             --host=i386-unknown-linux-gnu \
             --target=i386-unknown-linux-gnu \
@@ -76,32 +78,30 @@ src_configure() {
             --prefix="${PREFIX}" \
             --libdir="${LIBDIR}" \
             --with-sysroot= \
-            --srcdir=.
-        cd ..
+            --srcdir=. \
+            --enable-compressed-debug-sections=all \
+            lt_cv_sys_max_cmd_len=32768
+    )
     done
 }
 
 src_compile() {
     make -C bfd headers
-    for dir in libiberty bfd; do
-        make -C $dir MAKEINFO=true
-    done
-    make -C opcodes i386-gen
-    for dir in opcodes binutils gas gprof ld; do
-        make -C $dir MAKEINFO=true
+    for dir in libiberty zlib bfd opcodes binutils gas gprof ld; do
+        make -C $dir tooldir=${PREFIX} CPPFLAGS="-DPLUGIN_LITTLE_ENDIAN" MAKEINFO=true
     done
 }
 
 src_install() {
-    for dir in libiberty bfd opcodes binutils gas gprof ld; do
-        make -C $dir tooldir=${PREFIX} MAKEINFO=true DESTDIR="${DESTDIR}" install
+    for dir in libiberty zlib bfd opcodes binutils gas gprof ld; do
+        make -C $dir tooldir=${PREFIX} DESTDIR="${DESTDIR}" install MAKEINFO=true
     done
 
     # Create triplet symlinks
-    local olddir=$PWD
-    cd "${DESTDIR}${PREFIX}/bin"
-    for f in *; do
-        ln -s "${PREFIX}/bin/${f}" "i386-unknown-linux-musl-${f}"
-    done
-    cd "$olddir"
+    (
+        cd "${DESTDIR}${PREFIX}/bin"
+        for f in *; do
+            ln -s "${PREFIX}/bin/${f}" "i386-unknown-linux-musl-${f}"
+        done
+    )
 }
diff --git a/sysa/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch b/sysa/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch
new file mode 100644
index 00000000..dd5b0daa
--- /dev/null
+++ b/sysa/binutils-2.30/patches/libiberty-add-missing-config-directory-reference.patch
@@ -0,0 +1,18 @@
+SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+Add missing AC_CONFIG_MACRO_DIR.
+
+Required by autoreconf to create aclocal.m4 correctly.
+
+--- /libiberty/configure.ac	2022-01-22 14:14:09.000000000 +0200
++++ libiberty/configure.ac	2022-09-04 00:01:02.941738129 +0300
+@@ -2,6 +2,7 @@
+ 
+ AC_INIT
+ AC_CONFIG_SRCDIR([xmalloc.c])
++AC_CONFIG_MACRO_DIR(../config)
+ 
+ # This works around the fact that libtool configuration may change LD
+ # for this particular configuration, but some shells, instead of
diff --git a/sysa/binutils-2.30/patches/new-gettext.patch b/sysa/binutils-2.30/patches/new-gettext.patch
new file mode 100644
index 00000000..8c0a0264
--- /dev/null
+++ b/sysa/binutils-2.30/patches/new-gettext.patch
@@ -0,0 +1,17 @@
+SPDX-FileCopyrightText: 2023 fosslinux <fosslinux@aussies.space>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+In new gettext external is required for AM_GNU_GETTEXT.
+
+--- intl/configure.ac	2023-02-07 18:57:56.350832016 +1100
++++ intl/configure.ac	2023-02-07 18:58:07.310054484 +1100
+@@ -4,7 +4,7 @@
+ AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR(../config)
+ AM_GNU_GETTEXT_VERSION(0.12.1)
+-AM_GNU_GETTEXT([], [need-ngettext])
++AM_GNU_GETTEXT([external], [need-ngettext])
+ 
+ # This replaces the extensive use of DEFS in the original Makefile.in.
+ AC_DEFINE(IN_LIBINTL, 1, [Define because this is libintl.])
diff --git a/sysa/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch b/sysa/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch
new file mode 100644
index 00000000..205fa104
--- /dev/null
+++ b/sysa/binutils-2.30/patches/opcodes-ensure-i386-init-dependencies-are-satisfied.patch
@@ -0,0 +1,17 @@
+SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+
+Ensure i386-init.h dependencies are satisfied.
+
+--- opcodes/Makefile.am	2022-01-22 14:14:09.000000000 +0200
++++ opcodes/Makefile.am	2022-09-13 21:09:04.353324699 +0300
+@@ -575,7 +575,7 @@ i386-gen.o: i386-gen.c i386-opc.h $(srcd
+ $(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h
+ 	@echo $@
+ 
+-$(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl
++$(srcdir)/i386-init.h: i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl
+ 	./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
+ 
+ i386-opc.lo: $(srcdir)/i386-tbl.h
diff --git a/sysa/binutils-2.30/sources b/sysa/binutils-2.30/sources
new file mode 100644
index 00000000..46480759
--- /dev/null
+++ b/sysa/binutils-2.30/sources
@@ -0,0 +1 @@
+https://mirrors.kernel.org/gnu/binutils/binutils-2.30.tar.bz2 efeade848067e9a03f1918b1da0d37aaffa0b0127a06b5e9236229851d9d0c09
diff --git a/sysa/linux-4.9.10/linux-4.9.10.sh b/sysa/linux-4.9.10/linux-4.9.10.sh
index 1faf6706..a893361f 100644
--- a/sysa/linux-4.9.10/linux-4.9.10.sh
+++ b/sysa/linux-4.9.10/linux-4.9.10.sh
@@ -51,6 +51,9 @@ src_compile() {
     export PATH=$PWD/usr:$PATH
     make ARCH=i386 prepare
     make ARCH=i386
+
+    # Clear up more space
+    find . -name '*.o' -delete
 }
 
 src_install() {
diff --git a/sysa/run2.sh b/sysa/run2.sh
index f747cea1..1f766b39 100755
--- a/sysa/run2.sh
+++ b/sysa/run2.sh
@@ -36,7 +36,7 @@ go_sysb() {
 
 build automake-1.15.1
 
-build binutils-2.24
+build binutils-2.30
 
 # Build musl with fewer patches
 build musl-1.1.24 binutils-rebuild.sh patches-pass3
diff --git a/sysc/init b/sysc/init
index de435e90..a8f94cd4 100755
--- a/sysc/init
+++ b/sysc/init
@@ -39,7 +39,7 @@ 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.24 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