From 5fc1a2f1386c4f4fe6bfe7318c78b4d396254e2d Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <goliath@infraroot.at>
Date: Sun, 19 Apr 2020 08:38:28 +0200
Subject: [PATCH] cleanup: move rest of pkgcmd into build_pacakge

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
---
 mk.sh                 |  1 -
 util/build_package.sh | 27 +++++++++++++++++++++++++++
 util/pkgcmd.sh        | 26 --------------------------
 3 files changed, 27 insertions(+), 27 deletions(-)
 delete mode 100644 util/pkgcmd.sh

diff --git a/mk.sh b/mk.sh
index dc2135d..1a9c0c2 100755
--- a/mk.sh
+++ b/mk.sh
@@ -46,7 +46,6 @@ popd > /dev/null
 export BUILD_PATH_PREFIX_MAP="$PKGSRCDIR=src:$BUILDROOT=build"
 
 ############################# include utilities ##############################
-source "$SCRIPTDIR/util/pkgcmd.sh"
 source "$SCRIPTDIR/util/override.sh"
 source "$SCRIPTDIR/util/autotools.sh"
 source "$SCRIPTDIR/util/build_package.sh"
diff --git a/util/build_package.sh b/util/build_package.sh
index bffa6e6..35e6e80 100644
--- a/util/build_package.sh
+++ b/util/build_package.sh
@@ -1,3 +1,30 @@
+include_pkg() {
+	PKGNAME="$1"		# globally visible package name
+
+	unset -f build deploy download prepare check_update package
+	unset -v VERSION TARBALL URL SRCDIR SHA256SUM DEPENDS SUBPKG
+	source "$SCRIPTDIR/util/emptypkg.sh"
+	source "$SCRIPTDIR/pkg/$PKGNAME/build"
+
+	if [ -z "$SUBPKG" ]; then
+		SUBPKG="$PKGNAME"
+	fi
+}
+
+run_pkg_command() {
+	local FUNCTION="$1"
+	local LOGFILE="$PKGLOGDIR/${PKGNAME}-${FUNCTION}.log"
+	local SRC="$PKGSRCDIR/$SRCDIR"
+
+	echo "$PKGNAME - $FUNCTION"
+
+	pushd "$PKGBUILDDIR" > /dev/null
+	$FUNCTION "$SRC" &>> "$LOGFILE" < /dev/null
+	popd > /dev/null
+
+	gzip -f "$LOGFILE"
+}
+
 build_package() {
 	found="yes"
 
diff --git a/util/pkgcmd.sh b/util/pkgcmd.sh
deleted file mode 100644
index ea15731..0000000
--- a/util/pkgcmd.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-include_pkg() {
-	PKGNAME="$1"		# globally visible package name
-
-	unset -f build deploy download prepare check_update package
-	unset -v VERSION TARBALL URL SRCDIR SHA256SUM DEPENDS SUBPKG
-	source "$SCRIPTDIR/util/emptypkg.sh"
-	source "$SCRIPTDIR/pkg/$PKGNAME/build"
-
-	if [ -z "$SUBPKG" ]; then
-		SUBPKG="$PKGNAME"
-	fi
-}
-
-run_pkg_command() {
-	local FUNCTION="$1"
-	local LOGFILE="$PKGLOGDIR/${PKGNAME}-${FUNCTION}.log"
-	local SRC="$PKGSRCDIR/$SRCDIR"
-
-	echo "$PKGNAME - $FUNCTION"
-
-	pushd "$PKGBUILDDIR" > /dev/null
-	$FUNCTION "$SRC" &>> "$LOGFILE" < /dev/null
-	popd > /dev/null
-
-	gzip -f "$LOGFILE"
-}