From ff6d9e5c0842e1a3ddbae466ca2e0800230a9ea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sun, 20 Jun 2021 23:58:04 +0100
Subject: [PATCH] Get rid of mkbuild.

---
 sysa.py                               | 24 +++++++++---------------
 sysa/bzip2-1.0.8/bzip2-1.0.8.kaem     |  1 +
 sysa/coreutils-5.0/coreutils-5.0.kaem |  1 +
 sysa/gzip-1.2.4/gzip-1.2.4.kaem       |  1 +
 sysa/make-3.80/make-3.80.kaem         |  1 +
 sysa/patch-2.5.9/patch-2.5.9.kaem     |  1 +
 sysa/sed-4.0.9/sed-4.0.9.kaem         |  1 +
 sysa/tar-1.12/tar-1.12.kaem           |  1 +
 sysa/tcc-0.9.27/tcc-0.9.27.kaem       |  1 +
 9 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/sysa.py b/sysa.py
index 6bb3cf24..4d0c120b 100755
--- a/sysa.py
+++ b/sysa.py
@@ -83,7 +83,7 @@ class SysA:
         self.check_file(abs_file_name)
         return abs_file_name
 
-    def get_file(self, url, mkbuild=False, output=None):
+    def get_file(self, url, output=None):
         """
         Download and prepare source packages
 
@@ -92,9 +92,6 @@ class SysA:
           2. list of URLs to download. In this case the first URL is the primary URL
              from which we derive the name of package directory
         output can be used to override file name of the downloaded file(s).
-
-        mkbuild=True can be used to pre-create build directories before
-        mkdir is available.
         """
         # Single URL
         if isinstance(url, str):
@@ -128,9 +125,6 @@ class SysA:
             # Install sources into target directory
             shutil.copy2(tarball, target_src_dir)
 
-        if mkbuild:
-            os.mkdir(os.path.join(self.after_dir, target_name, 'build'))
-
     def prepare(self):
         """
         Prepare directory structure for System A.
@@ -227,28 +221,28 @@ class SysA:
         self.get_file("https://lilypond.org/janneke/tcc/tcc-0.9.26-1136-g5bba73cc.tar.gz", output="tcc-0.9.26.tar.gz")
 
         # gzip 1.2.4
-        self.get_file("https://mirrors.kernel.org/gnu/gzip/gzip-1.2.4.tar", mkbuild=True)
+        self.get_file("https://mirrors.kernel.org/gnu/gzip/gzip-1.2.4.tar")
 
         # tar 1.12
-        self.get_file("https://mirrors.kernel.org/gnu/tar/tar-1.12.tar.gz", mkbuild=True)
+        self.get_file("https://mirrors.kernel.org/gnu/tar/tar-1.12.tar.gz")
 
         # sed 4.0.9
-        self.get_file("https://mirrors.kernel.org/gnu/sed/sed-4.0.9.tar.gz", mkbuild=True)
+        self.get_file("https://mirrors.kernel.org/gnu/sed/sed-4.0.9.tar.gz")
 
         # patch 2.5.9
-        self.get_file("https://ftp.gnu.org/pub/gnu/patch/patch-2.5.9.tar.gz", mkbuild=True)
+        self.get_file("https://ftp.gnu.org/pub/gnu/patch/patch-2.5.9.tar.gz")
 
         # make 3.80
-        self.get_file("https://mirrors.kernel.org/gnu/make/make-3.80.tar.gz", mkbuild=True)
+        self.get_file("https://mirrors.kernel.org/gnu/make/make-3.80.tar.gz")
 
         # bzip2 1.0.8
-        self.get_file("https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz", mkbuild=True)
+        self.get_file("https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz")
 
         # tcc 0.9.27
-        self.get_file("https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.27.tar.bz2", mkbuild=True)
+        self.get_file("https://download.savannah.gnu.org/releases/tinycc/tcc-0.9.27.tar.bz2")
 
         # coreutils 5.0
-        self.get_file("https://mirrors.kernel.org/gnu/coreutils/coreutils-5.0.tar.bz2", mkbuild=True)
+        self.get_file("https://mirrors.kernel.org/gnu/coreutils/coreutils-5.0.tar.bz2")
 
         # heirloom-devtools
         self.get_file("http://downloads.sourceforge.net/project/heirloom/heirloom-devtools/070527/heirloom-devtools-070527.tar.bz2")
diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem b/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem
index 3d64698a..b0fce99b 100755
--- a/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem
+++ b/sysa/bzip2-1.0.8/bzip2-1.0.8.kaem
@@ -7,6 +7,7 @@
 
 set -ex
 
+mkdir build
 cd build 
 
 # Extract
diff --git a/sysa/coreutils-5.0/coreutils-5.0.kaem b/sysa/coreutils-5.0/coreutils-5.0.kaem
index aae68d21..94f834b9 100755
--- a/sysa/coreutils-5.0/coreutils-5.0.kaem
+++ b/sysa/coreutils-5.0/coreutils-5.0.kaem
@@ -8,6 +8,7 @@
 
 set -ex
 
+mkdir build
 cd build
 
 # Extract
diff --git a/sysa/gzip-1.2.4/gzip-1.2.4.kaem b/sysa/gzip-1.2.4/gzip-1.2.4.kaem
index 5bde7b06..779d5584 100755
--- a/sysa/gzip-1.2.4/gzip-1.2.4.kaem
+++ b/sysa/gzip-1.2.4/gzip-1.2.4.kaem
@@ -8,6 +8,7 @@
 
 set -ex
 
+mkdir build
 cd build
 
 # Extract
diff --git a/sysa/make-3.80/make-3.80.kaem b/sysa/make-3.80/make-3.80.kaem
index 89e60946..d493a753 100755
--- a/sysa/make-3.80/make-3.80.kaem
+++ b/sysa/make-3.80/make-3.80.kaem
@@ -6,6 +6,7 @@
 
 set -ex
 
+mkdir build
 cd build 
 
 # Extract
diff --git a/sysa/patch-2.5.9/patch-2.5.9.kaem b/sysa/patch-2.5.9/patch-2.5.9.kaem
index 86df0b68..d0849925 100755
--- a/sysa/patch-2.5.9/patch-2.5.9.kaem
+++ b/sysa/patch-2.5.9/patch-2.5.9.kaem
@@ -6,6 +6,7 @@
 
 set -ex
 
+mkdir build
 cd build
 
 # Extract
diff --git a/sysa/sed-4.0.9/sed-4.0.9.kaem b/sysa/sed-4.0.9/sed-4.0.9.kaem
index 9d3b8c7d..3d195a31 100755
--- a/sysa/sed-4.0.9/sed-4.0.9.kaem
+++ b/sysa/sed-4.0.9/sed-4.0.9.kaem
@@ -8,6 +8,7 @@
 
 set -ex
 
+mkdir build
 cd build
 
 # Extract
diff --git a/sysa/tar-1.12/tar-1.12.kaem b/sysa/tar-1.12/tar-1.12.kaem
index f8db04fb..979a66c0 100755
--- a/sysa/tar-1.12/tar-1.12.kaem
+++ b/sysa/tar-1.12/tar-1.12.kaem
@@ -8,6 +8,7 @@
 
 set -ex
 
+mkdir build
 cd build
 
 # Extract
diff --git a/sysa/tcc-0.9.27/tcc-0.9.27.kaem b/sysa/tcc-0.9.27/tcc-0.9.27.kaem
index 4ebcad83..3a36e2c7 100755
--- a/sysa/tcc-0.9.27/tcc-0.9.27.kaem
+++ b/sysa/tcc-0.9.27/tcc-0.9.27.kaem
@@ -7,6 +7,7 @@
 
 set -ex
 
+mkdir build
 cd build
 
 # Extract