From afd023802f43fd85d3d1a7df991eb503483b6f56 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Sat, 16 Mar 2019 23:32:59 +0100 Subject: [PATCH] cleanup: merge package download/build phases Signed-off-by: David Oberhollenzer --- mk.sh | 8 -------- util/build_package.sh | 2 ++ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mk.sh b/mk.sh index b98cee9..8869a30 100755 --- a/mk.sh +++ b/mk.sh @@ -64,7 +64,6 @@ echo "--- boot strap phase ---" for pkg in tc-pkgtool; do include_pkg "$pkg" - fetch_package build_package done @@ -87,13 +86,6 @@ pkg buildstrategy -p "$PROVIDESLIST" -d "$DEPENDSLIST" "$RELEASEPKG" \ > "$PACKAGELIST" cat "$PACKAGELIST" -echo "--- downloading package files ---" - -while read pkg; do - include_pkg "$pkg" - fetch_package -done < "$PACKAGELIST" - echo "--- building packages ---" while read pkg; do diff --git a/util/build_package.sh b/util/build_package.sh index c6bde00..e3da7a6 100644 --- a/util/build_package.sh +++ b/util/build_package.sh @@ -16,6 +16,8 @@ build_package() { rm -f "$REPODIR/${f}.pkg" done + fetch_package + rm -rf "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR" mkdir -p "$TCDIR/$TARGET" "$PKGBUILDDIR" "$PKGDEPLOYDIR"