From b63c7cfe41fd404c1887b28c344262ddea91d33a Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 16 Jun 2019 01:13:39 +0100
Subject: [PATCH] buildsystem: cleanup - PACKAGE_NAME is redundant

---
 scripts/build   | 16 +++++++---------
 scripts/install | 16 +++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/scripts/build b/scripts/build
index 1d068051c7..de70458d0b 100755
--- a/scripts/build
+++ b/scripts/build
@@ -29,19 +29,17 @@ if [ -n "$PKG_ARCH" ]; then
 fi
 
 if [ "${1//:/}" != "${1}" ]; then
-  PACKAGE_NAME="${1%:*}"
   TARGET="${1#*:}"
 else
-  PACKAGE_NAME="${1}"
   TARGET=
 fi
 TARGET="${TARGET:-target}"
 PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
 
-pkg_lock "${PACKAGE_NAME}:${TARGET}" "build" "${PARENT_PKG}"
+pkg_lock "${PKG_NAME}:${TARGET}" "build" "${PARENT_PKG}"
 
-mkdir -p $STAMPS/$PACKAGE_NAME
-STAMP=$STAMPS/$PACKAGE_NAME/build_$TARGET
+mkdir -p $STAMPS/$PKG_NAME
+STAMP=$STAMPS/$PKG_NAME/build_$TARGET
 if [ -f $STAMP ]; then
   . $STAMP
   PKG_DEEPHASH=$(calculate_stamp)
@@ -61,7 +59,7 @@ if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
     $SCRIPTS/unpack "${p}" "${PARENT_PKG}"
   done
 fi
-$SCRIPTS/unpack "${PACKAGE_NAME}" "${PARENT_PKG}"
+$SCRIPTS/unpack "${PKG_NAME}" "${PARENT_PKG}"
 
 # build dependencies, only when PKG_DEPENDS_? is filled
 unset _pkg_depends
@@ -88,9 +86,9 @@ fi
 
 # build this package
 if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
-  build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
+  build_msg "CLR_BUILD" "BUILD" "${PKG_NAME} $(print_color "CLR_TARGET" "(${TARGET})") [DEBUG]" "indent"
 else
-  build_msg "CLR_BUILD" "BUILD" "${PACKAGE_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
+  build_msg "CLR_BUILD" "BUILD" "${PKG_NAME} $(print_color "CLR_TARGET" "(${TARGET})")" "indent"
 fi
 
 setup_toolchain $TARGET
@@ -209,7 +207,7 @@ build_msg "CLR_TOOLCHAIN" "TOOLCHAIN" "${PKG_TOOLCHAIN}${_auto_toolchain}"
 
 # make autoreconf
 if [ "$PKG_TOOLCHAIN" = "autotools" ]; then
-  $SCRIPTS/autoreconf "${PACKAGE_NAME}" "${PARENT_PKG}"
+  $SCRIPTS/autoreconf "${PKG_NAME}" "${PARENT_PKG}"
 fi
 
 pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "build"
diff --git a/scripts/install b/scripts/install
index 375bb4c468..e06613cdbf 100755
--- a/scripts/install
+++ b/scripts/install
@@ -26,22 +26,20 @@ fi
 
 # set defaults
 if [ "${1//:/}" != "${1}" ]; then
-  PACKAGE_NAME="${1%:*}"
   TARGET="${1#*:}"
 else
-  PACKAGE_NAME="${1}"
   TARGET=
 fi
 [ -z "$TARGET" ] && TARGET="target"
 PARENT_PKG="${2:-${PKG_NAME}:${TARGET}}"
 
-pkg_lock "${PACKAGE_NAME}:${TARGET}" "install" "${PARENT_PKG}"
+pkg_lock "${PKG_NAME}:${TARGET}" "install" "${PARENT_PKG}"
 
-STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET
-[ -f $STAMP ] && pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "already installed"
+STAMP=$STAMPS_INSTALL/$PKG_NAME/install_$TARGET
+[ -f $STAMP ] && pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "install" "already installed"
 [ -f $STAMP ] && exit 0
 
-mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME
+mkdir -p $STAMPS_INSTALL/$PKG_NAME
 
 $SCRIPTS/build "${1}" "${PARENT_PKG}"
 
@@ -56,9 +54,9 @@ elif [ "$TARGET" = init ] ; then
   INSTALL=$BUILD/initramfs
 fi
 
-pkg_lock_status "ACTIVE" "${PACKAGE_NAME}:${TARGET}" "install"
+pkg_lock_status "ACTIVE" "${PKG_NAME}:${TARGET}" "install"
 
-build_msg "CLR_INSTALL" "INSTALL" "${PACKAGE_NAME} $(print_color CLR_TARGET "(${TARGET})")" "indent"
+build_msg "CLR_INSTALL" "INSTALL" "${PKG_NAME} $(print_color CLR_TARGET "(${TARGET})")" "indent"
 
 mkdir -p $INSTALL
 
@@ -144,4 +142,4 @@ fi
 
 touch $STAMP
 
-pkg_lock_status "UNLOCK" "${PACKAGE_NAME}:${TARGET}" "install" "installed"
+pkg_lock_status "UNLOCK" "${PKG_NAME}:${TARGET}" "install" "installed"