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] 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 50a652f..c89356d 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 0000000..d016644
--- /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 6b5f6b2..e3ec4fc 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 d90c5d2..0000000
--- 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 915685b..de435e9 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 3238460..3ef547a 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