From 7c98d2b83cc5cf3771c2cc4f5be5774f5401b83c Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 20 Jun 2017 17:45:34 +0100
Subject: [PATCH] PKG_BUILD/TOOLCHAIN cleanup (changes since master)

---
 packages/addons/addon-depends/pngquant/package.mk   | 10 +++++-----
 packages/addons/service/tvheadend/package.mk        |  4 ++--
 packages/addons/service/tvheadend42/package.mk      |  4 ++--
 packages/linux-drivers/tbs-linux-drivers/package.mk | 10 +++++-----
 packages/mediacenter/kodi/package.mk                |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/addons/addon-depends/pngquant/package.mk b/packages/addons/addon-depends/pngquant/package.mk
index 9347d26798..592b2dfe5f 100644
--- a/packages/addons/addon-depends/pngquant/package.mk
+++ b/packages/addons/addon-depends/pngquant/package.mk
@@ -35,13 +35,13 @@ configure_host() {
 }
 
 make_host() {
-  cd $ROOT/$PKG_BUILD
-  BIN=$ROOT/$PKG_BUILD/pngquant make
+  cd $PKG_BUILD
+  BIN=$PKG_BUILD/pngquant make
 
-  $STRIP $ROOT/$PKG_BUILD/pngquant
+  $STRIP $PKG_BUILD/pngquant
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp $ROOT/$PKG_BUILD/pngquant $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp $PKG_BUILD/pngquant $TOOLCHAIN/bin
 }
diff --git a/packages/addons/service/tvheadend/package.mk b/packages/addons/service/tvheadend/package.mk
index c06b30f7e1..87b4592c8f 100644
--- a/packages/addons/service/tvheadend/package.mk
+++ b/packages/addons/service/tvheadend/package.mk
@@ -49,7 +49,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --enable-bundle \
                            --enable-dvbcsa \
                            --disable-dbus_1 \
-                           --python=$ROOT/$TOOLCHAIN/bin/python"
+                           --python=$TOOLCHAIN/bin/python"
 
 post_unpack() {
   sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$PKG_ADDON_REPOVERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
@@ -57,7 +57,7 @@ post_unpack() {
 
 pre_configure_target() {
 # fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
   export CROSS_COMPILE=$TARGET_PREFIX
diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk
index 785a30a4e4..01eb5bdc2a 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -68,7 +68,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
 
 post_unpack() {
   sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$ADDON_VERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version
-  sed -e 's|'/usr/bin/pngquant'|'$ROOT/$TOOLCHAIN/bin/pngquant'|g' -i $PKG_BUILD/support/mkbundle
+  sed -e 's|'/usr/bin/pngquant'|'$TOOLCHAIN/bin/pngquant'|g' -i $PKG_BUILD/support/mkbundle
 }
 
 pre_configure_target() {
@@ -94,7 +94,7 @@ fi
 
 post_make_target() {
   $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl
-  $STRIP $ROOT/$PKG_BUILD/build.linux/tvheadend
+  $STRIP $PKG_BUILD/build.linux/tvheadend
 }
 
 makeinstall_target() {
diff --git a/packages/linux-drivers/tbs-linux-drivers/package.mk b/packages/linux-drivers/tbs-linux-drivers/package.mk
index 5a73b8d186..d66cb9566c 100644
--- a/packages/linux-drivers/tbs-linux-drivers/package.mk
+++ b/packages/linux-drivers/tbs-linux-drivers/package.mk
@@ -32,12 +32,12 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 post_unpack() {
-  tar xjf $ROOT/$PKG_BUILD/linux-tbs-drivers.tar.bz2 -C $ROOT/$PKG_BUILD
-  chmod -R u+rwX $ROOT/$PKG_BUILD/linux-tbs-drivers/*
+  tar xjf $PKG_BUILD/linux-tbs-drivers.tar.bz2 -C $PKG_BUILD
+  chmod -R u+rwX $PKG_BUILD/linux-tbs-drivers/*
 }
 
 make_target() {
-  cd $ROOT/$PKG_BUILD/linux-tbs-drivers
+  cd $PKG_BUILD/linux-tbs-drivers
   ./v4l/tbs-x86_64.sh
   LDFLAGS="" make DIR=$(kernel_path) prepare
   LDFLAGS="" make DIR=$(kernel_path)
@@ -45,7 +45,7 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/updates/tbs
-  find $ROOT/$PKG_BUILD/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$(get_module_dir)/updates/tbs \;
+  find $PKG_BUILD/linux-tbs-drivers/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$(get_module_dir)/updates/tbs \;
   mkdir -p $INSTALL/lib/firmware/
-  cp $ROOT/$PKG_BUILD/*.fw $INSTALL/lib/firmware/
+  cp $PKG_BUILD/*.fw $INSTALL/lib/firmware/
 }
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 27a75e4108..0f038e5841 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -31,7 +31,7 @@ PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or X
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/project/cmake/CMakeLists.txt"
+PKG_CMAKE_SCRIPT="$PKG_BUILD/project/cmake/CMakeLists.txt"
 
   get_graphicdrivers