From 9961c4b75fdd9dfd5f91288076418138c98b38ae Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 31 Jan 2021 21:06:26 +1100
Subject: [PATCH] Remove sources/ directory

---
 rootfs.sh                             | 41 ++++++++++++++-------------
 sources/.placeholder                  |  0
 sysa/bash-2.05b/src/.placeholder      |  0
 sysa/bzip2-1.0.8/build/.placeholder   |  0
 sysa/bzip2-1.0.8/src/.placeholder     |  0
 sysa/coreutils-5.0/build/.placeholder |  0
 sysa/coreutils-5.0/src/.placeholder   |  0
 sysa/diffutils-2.7/build/.placeholder |  0
 sysa/diffutils-2.7/src/.placeholder   |  0
 sysa/grep-2.4/src/.placeholder        |  0
 sysa/gzip-1.2.4/build/.placeholder    |  0
 sysa/gzip-1.2.4/src/.placeholder      |  0
 sysa/m4-1.4/src/.placeholder          |  0
 sysa/make-3.80/build/.placeholder     |  0
 sysa/make-3.80/src/.placeholder       |  0
 sysa/patch-2.5.9/build/.placeholder   |  0
 sysa/patch-2.5.9/src/.placeholder     |  0
 sysa/tar-1.12/src/.placeholder        |  0
 sysa/tcc-0.9.27/build/.placeholder    |  0
 19 files changed, 21 insertions(+), 20 deletions(-)
 delete mode 100644 sources/.placeholder
 delete mode 100644 sysa/bash-2.05b/src/.placeholder
 delete mode 100644 sysa/bzip2-1.0.8/build/.placeholder
 delete mode 100644 sysa/bzip2-1.0.8/src/.placeholder
 delete mode 100644 sysa/coreutils-5.0/build/.placeholder
 delete mode 100644 sysa/coreutils-5.0/src/.placeholder
 delete mode 100644 sysa/diffutils-2.7/build/.placeholder
 delete mode 100644 sysa/diffutils-2.7/src/.placeholder
 delete mode 100644 sysa/grep-2.4/src/.placeholder
 delete mode 100644 sysa/gzip-1.2.4/build/.placeholder
 delete mode 100644 sysa/gzip-1.2.4/src/.placeholder
 delete mode 100644 sysa/m4-1.4/src/.placeholder
 delete mode 100644 sysa/make-3.80/build/.placeholder
 delete mode 100644 sysa/make-3.80/src/.placeholder
 delete mode 100644 sysa/patch-2.5.9/build/.placeholder
 delete mode 100644 sysa/patch-2.5.9/src/.placeholder
 delete mode 100644 sysa/tar-1.12/src/.placeholder
 delete mode 100644 sysa/tcc-0.9.27/build/.placeholder

diff --git a/rootfs.sh b/rootfs.sh
index 89f2d02..6f62318 100755
--- a/rootfs.sh
+++ b/rootfs.sh
@@ -70,25 +70,20 @@ cp -r tcc-0.9.27 tmp/after/
 # sed 4.0.7
 cp -r sed-4.0.7 tmp/after/
 
-mkdir -p ../sources
-
 # tar 1.12
 url=https://ftp.gnu.org/gnu/tar/tar-1.12.tar.gz
-pushd ../sources
+cp -r tar-1.12 tmp/after
+mkdir tmp/after/tar-1.12/{src,build}
+pushd tmp/after/tar-1.12/src
 if [ ! -f "$(basename $url)" ]; then
     wget "$url"
 fi
 popd
-cp -r tar-1.12 tmp/after
-tar -C tmp/after/tar-1.12/src -xf "../sources/$(basename $url)" --strip-components=1
+tar -C tmp/after/tar-1.12/src -xf "tmp/after/tar-1.12/src/$(basename $url)" --strip-components=1
 
 get_file() {
     url=$1
-    pushd ../sources
-    if [ ! -f "$(basename "$url")" ]; then
-        wget "$url"
-    fi
-    popd
+    make_build=${2:-0}
     ext="${url##*.}"
     if [ "$ext" = "tar" ]; then
         bname=$(basename "$url" ".tar")
@@ -96,26 +91,35 @@ get_file() {
         bname=$(basename "$url" ".tar.${ext}")
     fi
     cp -r "${bname}" tmp/after/
-    cp "../sources/$(basename "$url")" "tmp/after/${bname}/src/"
+    target="tmp/after/${bname}"
+    mkdir -p "${target}/src"
+    if [ "${make_build}" -ne 0 ]; then
+        mkdir "${target}/build"
+    fi
+    pushd "tmp/after/${bname}/src"
+    if [ ! -f "$(basename "$url")" ]; then
+        wget "$url"
+    fi
+    popd
 }
 
 # gzip 1.2.4
-get_file https://ftp.gnu.org/gnu/gzip/gzip-1.2.4.tar
+get_file https://ftp.gnu.org/gnu/gzip/gzip-1.2.4.tar 1
 
 # diffutils 2.7
-get_file https://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz
+get_file https://ftp.gnu.org/gnu/diffutils/diffutils-2.7.tar.gz 1
 
 # patch 2.5.9
-get_file https://ftp.gnu.org/pub/gnu/patch/patch-2.5.9.tar.gz
+get_file https://ftp.gnu.org/pub/gnu/patch/patch-2.5.9.tar.gz 1
 
 # make 3.80
-get_file https://ftp.gnu.org/gnu/make/make-3.80.tar.gz
+get_file https://ftp.gnu.org/gnu/make/make-3.80.tar.gz 1
 
 # bzip2 1.0.8
-get_file ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
+get_file ftp://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz 1
 
 # coreutils 5.0
-get_file https://ftp.gnu.org/gnu/coreutils/coreutils-5.0.tar.bz2
+get_file https://ftp.gnu.org/gnu/coreutils/coreutils-5.0.tar.bz2 1
 
 # grep 2.4
 get_file https://ftp.gnu.org/gnu/grep/grep-2.4.tar.gz
@@ -168,8 +172,5 @@ esac
 
 cd ../..
 
-# eventually keep logfile before unmount:
-echo "see logfile: $LOGFILE"
-
 # Cleanup
 sudo umount sysa/tmp
diff --git a/sources/.placeholder b/sources/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/bash-2.05b/src/.placeholder b/sysa/bash-2.05b/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/bzip2-1.0.8/build/.placeholder b/sysa/bzip2-1.0.8/build/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/bzip2-1.0.8/src/.placeholder b/sysa/bzip2-1.0.8/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/coreutils-5.0/build/.placeholder b/sysa/coreutils-5.0/build/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/coreutils-5.0/src/.placeholder b/sysa/coreutils-5.0/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/diffutils-2.7/build/.placeholder b/sysa/diffutils-2.7/build/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/diffutils-2.7/src/.placeholder b/sysa/diffutils-2.7/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/grep-2.4/src/.placeholder b/sysa/grep-2.4/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/gzip-1.2.4/build/.placeholder b/sysa/gzip-1.2.4/build/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/gzip-1.2.4/src/.placeholder b/sysa/gzip-1.2.4/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/m4-1.4/src/.placeholder b/sysa/m4-1.4/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/make-3.80/build/.placeholder b/sysa/make-3.80/build/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/make-3.80/src/.placeholder b/sysa/make-3.80/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/patch-2.5.9/build/.placeholder b/sysa/patch-2.5.9/build/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/patch-2.5.9/src/.placeholder b/sysa/patch-2.5.9/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/tar-1.12/src/.placeholder b/sysa/tar-1.12/src/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/sysa/tcc-0.9.27/build/.placeholder b/sysa/tcc-0.9.27/build/.placeholder
deleted file mode 100644
index e69de29..0000000