diff --git a/config/functions b/config/functions
index dbfcf1eb98..e0263de80c 100644
--- a/config/functions
+++ b/config/functions
@@ -17,16 +17,16 @@ setup_toolchain() {
       export CFLAGS="$TARGET_CFLAGS"
       export CXXFLAGS="$TARGET_CXXFLAGS"
       export LDFLAGS="$TARGET_LDFLAGS"
-      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
+      export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
       export PKG_CONFIG_PATH=""
       export PKG_CONFIG_LIBDIR="$SYSROOT_PREFIX/usr/lib/pkgconfig:$SYSROOT_PREFIX/usr/share/pkgconfig"
       export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
       export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
       export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-      export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
+      export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf
       export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=/usr"
       if [ ! -f $CMAKE_CONF ] ; then
-        mkdir -p $ROOT/$TOOLCHAIN/etc
+        mkdir -p $TOOLCHAIN/etc
         echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
         echo "SET(CMAKE_SYSTEM_VERSION 1)"  >> $CMAKE_CONF
         echo "SET(CMAKE_SYSTEM_PROCESSOR  $TARGET_ARCH)" >> $CMAKE_CONF
@@ -39,8 +39,8 @@ setup_toolchain() {
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)"  >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)"  >> $CMAKE_CONF
       fi
-      export HOST_CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
-      export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      export HOST_CC="$TOOLCHAIN/bin/host-gcc"
+      export HOST_CXX="$TOOLCHAIN/bin/host-g++"
       export HOSTCC="$HOST_CC"
       export HOSTCXX="$HOST_CXX"
       export CC_FOR_BUILD="$HOST_CC"
@@ -54,8 +54,8 @@ setup_toolchain() {
     host|bootstrap)
       export DESTIMAGE="host"
       export AWK="gawk"
-      export CC="$ROOT/$TOOLCHAIN/bin/host-gcc"
-      export CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      export CC="$TOOLCHAIN/bin/host-gcc"
+      export CXX="$TOOLCHAIN/bin/host-g++"
       export CPP="cpp"
       export LD="ld"
       export AS="as"
@@ -69,14 +69,14 @@ setup_toolchain() {
       export CFLAGS="$HOST_CFLAGS"
       export CXXFLAGS="$HOST_CXXFLAGS"
       export LDFLAGS="$HOST_LDFLAGS"
-      export PKG_CONFIG="$ROOT/$TOOLCHAIN/bin/pkg-config"
+      export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
       export PKG_CONFIG_PATH=""
-      export PKG_CONFIG_LIBDIR="$ROOT/$TOOLCHAIN/lib/pkgconfig:$ROOT/$TOOLCHAIN/share/pkgconfig"
+      export PKG_CONFIG_LIBDIR="$TOOLCHAIN/lib/pkgconfig:$TOOLCHAIN/share/pkgconfig"
       export PKG_CONFIG_SYSROOT_DIR=""
       unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
       unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
-      export CMAKE_CONF=$ROOT/$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
-      export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN"
+      export CMAKE_CONF=$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
+      export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$TOOLCHAIN"
       if [ ! -f $CMAKE_CONF ] ; then
         mkdir -p $TOOLCHAIN/etc
         echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
@@ -85,7 +85,7 @@ setup_toolchain() {
         echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF
         echo "SET(CMAKE_AR $AR CACHE FILEPATH "Archiver")" >> $CMAKE_CONF # hum?
-        echo "SET(CMAKE_FIND_ROOT_PATH  $ROOT/$TOOLCHAIN)" >> $CMAKE_CONF
+        echo "SET(CMAKE_FIND_ROOT_PATH  $TOOLCHAIN)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)" >> $CMAKE_CONF
         echo "SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)" >> $CMAKE_CONF
@@ -120,7 +120,7 @@ get_module_dir() {
 get_build_dir() {
   local _PKG_NAME="$(get_pkg_variable "$1" PKG_NAME)" _PKG_VERSION="$(get_pkg_version "$1")"
   if [ -n "$_PKG_NAME" -a -n "$_PKG_VERSION" ]; then
-    echo $ROOT/$BUILD/${_PKG_NAME}-${_PKG_VERSION}
+    echo $BUILD/${_PKG_NAME}-${_PKG_VERSION}
   fi
 }
 
@@ -182,41 +182,41 @@ add_group() {
 do_autoreconf() {
   export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoconf" ]; then
-    export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
+  if [ -e "$TOOLCHAIN/bin/autoconf" ]; then
+    export AUTOCONF=$TOOLCHAIN/bin/autoconf
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/automake" ]; then
-    export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
+  if [ -e "$TOOLCHAIN/bin/automake" ]; then
+    export AUTOMAKE=$TOOLCHAIN/bin/automake
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autopoint" ]; then
-    export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
+  if [ -e "$TOOLCHAIN/bin/autopoint" ]; then
+    export AUTOPOINT=$TOOLCHAIN/bin/autopoint
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/libtoolize" ]; then
-    export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
+  if [ -e "$TOOLCHAIN/bin/libtoolize" ]; then
+    export LIBTOOLIZE=$TOOLCHAIN/bin/libtoolize
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/intltoolize" ]; then
-    export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
+  if [ -e "$TOOLCHAIN/bin/intltoolize" ]; then
+    export INTLTOOLIZE=$TOOLCHAIN/bin/intltoolize
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/aclocal" ]; then
-    export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
+  if [ -e "$TOOLCHAIN/bin/aclocal" ]; then
+    export ACLOCAL="$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoheader" ]; then
-    export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
+  if [ -e "$TOOLCHAIN/bin/autoheader" ]; then
+    export AUTOHEADER=$TOOLCHAIN/bin/autoheader
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/libtool" ]; then
-    export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
+  if [ -e "$TOOLCHAIN/bin/libtool" ]; then
+    export LIBTOOL=$TOOLCHAIN/bin/libtool
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
+  if [ -e "$TOOLCHAIN/bin/autoreconf" -a -e "$INTLTOOLIZE" ]; then
     mkdir -p $ACLOCAL_DIR
-    export AUTORECONF="$ROOT/$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
+    export AUTORECONF="$TOOLCHAIN/bin/autoreconf --verbose --force --install -I $ACLOCAL_DIR"
     $AUTORECONF $@
   fi
 }
@@ -507,7 +507,7 @@ show_config() {
 # strip
 debug_strip() {
   if [ ! "$DEBUG" = yes ]; then
-    find $* -type f -executable | xargs $STRIP 1>/dev/null || :
+    find $* -type f -executable | xargs $STRIP 2>/dev/null || :
   fi
 }
 
diff --git a/config/optimize b/config/optimize
index 2c395a57f1..a68d1a6b3e 100644
--- a/config/optimize
+++ b/config/optimize
@@ -28,10 +28,10 @@ TARGET_LIBDIR="$SYSROOT_PREFIX/lib $SYSROOT_PREFIX/usr/lib"
 TARGET_INCDIR="$SYSROOT_PREFIX/include $SYSROOT_PREFIX/usr/include"
 
 HOST_CPPFLAGS=""
-HOST_CFLAGS="-O2 -Wall -pipe -I$ROOT/$TOOLCHAIN/include"
+HOST_CFLAGS="-O2 -Wall -pipe -I$TOOLCHAIN/include"
 HOST_CXXFLAGS="$HOST_CFLAGS"
-HOST_LDFLAGS="-Wl,-rpath,$ROOT/$TOOLCHAIN/lib -L$ROOT/$TOOLCHAIN/lib"
-HOST_LIBDIR="$ROOT/$TOOLCHAIN/lib"
+HOST_LDFLAGS="-Wl,-rpath,$TOOLCHAIN/lib -L$TOOLCHAIN/lib"
+HOST_LIBDIR="$TOOLCHAIN/lib"
 
 # work around Ubuntu default C*FLAGS 
 # see https://wiki.ubuntu.com/ToolChain/CompilerFlags#A-Wformat_-Wformat-security
@@ -70,4 +70,4 @@ HOST_CXXFLAGS="$HOST_CXXFLAGS -Wno-format-security"
 
   # default dirs
     HOST_LIBDIR="$HOST_LIBDIR /lib /usr/lib"
-    HOST_INCDIR="$ROOT/$TOOLCHAIN/include /usr/include"
+    HOST_INCDIR="$TOOLCHAIN/include /usr/include"
diff --git a/config/path b/config/path
index 4e853342b3..36b3080478 100644
--- a/config/path
+++ b/config/path
@@ -20,14 +20,14 @@ HOST_NAME=`$LOCAL_CC -dumpmachine`
 TARGET_NAME=$TARGET_GCC_ARCH-libreelec-linux-gnu${TARGET_ABI}
 
 if [ -n "$DEVICE" ]; then
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION
+  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$LIBREELEC_VERSION
   if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
+    BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$DEVICE.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
   fi
 else
-  BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
+  BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$LIBREELEC_VERSION
   if [ "$LIBREELEC_VERSION" = "devel" ] ; then
-    BUILD=$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
+    BUILD=$ROOT/$BUILD_BASE.$DISTRONAME-$PROJECT.$TARGET_ARCH-$OS_VERSION-$LIBREELEC_VERSION
   fi
 fi
 
@@ -43,11 +43,11 @@ STAMPS=$BUILD/.stamps
 STAMPS_INSTALL=$BUILD/image/.stamps
 DOCS=DOCS
 TOOLCHAIN=$BUILD/toolchain
-SYSROOT_PREFIX=$ROOT/$TOOLCHAIN/$TARGET_NAME/sysroot
+SYSROOT_PREFIX=$TOOLCHAIN/$TARGET_NAME/sysroot
 LIB_PREFIX=$SYSROOT_PREFIX/usr
-TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
+TARGET_PREFIX=$TOOLCHAIN/bin/$TARGET_NAME-
 
-FAKEROOT_SCRIPT=$ROOT/.fakeroot.$BUILD
+FAKEROOT_SCRIPT=$BUILD/.fakeroot
 
 if [ -z "$INSTALL" ]; then
   INSTALL=$BUILD/image/system
@@ -56,8 +56,8 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
 
 . config/sources
 
-MAKE="$ROOT/$TOOLCHAIN/bin/make"
-MAKEINSTALL="$ROOT/$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
+MAKE="$TOOLCHAIN/bin/make"
+MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
 SED="sed -i"
 
 # set package metadata
@@ -79,6 +79,8 @@ SED="sed -i"
   PKG_LONGDESC=""
   PKG_IS_ADDON="no"
   PKG_PATCH_DIRS=""
+  PKG_NEED_UNPACK=""
+  PKG_SHA256=""
 
   if [ -n "$1" ]; then
     _PKG_ROOT_NAME=${1%:*}
@@ -141,6 +143,7 @@ SED="sed -i"
 
   if [ "$PKG_IS_ADDON" = "yes" ] ; then
     [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="`echo $PKG_SECTION | sed 's,/,.,g'`.$PKG_NAME"
+    PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
   fi
 
   # Automatically set PKG_SOURCE_NAME unless it is already defined.
@@ -187,17 +190,17 @@ XORG_PATH_DRIVERS=/usr/lib/xorg/modules/drivers
 . config/optimize
 
 if [ -z "$CCACHE_DIR" ]; then
-  export CCACHE_DIR=$ROOT/$BUILD/.ccache
+  export CCACHE_DIR=$BUILD/.ccache
 fi
 export MAKEFLAGS=-j$CONCURRENCY_MAKE_LEVEL
-export PKG_CONFIG=$ROOT/$TOOLCHAIN/bin/pkg-config
+export PKG_CONFIG=$TOOLCHAIN/bin/pkg-config
 
-if [ -z "$PATH" -o "$PATH" = "${PATH#$ROOT/$TOOLCHAIN/bin:}" ]; then
-  export PATH="$ROOT/$TOOLCHAIN/bin:$ROOT/$TOOLCHAIN/sbin:$PATH"
+if [ -z "$PATH" -o "$PATH" = "${PATH#$TOOLCHAIN/bin:}" ]; then
+  export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin:$PATH"
 fi
 
-if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
-  export LD_LIBRARY_PATH="$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
+if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$TOOLCHAIN/lib:}" ]; then
+  export LD_LIBRARY_PATH="$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH
diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk
index cc16649acd..98bf9995a0 100644
--- a/packages/addons/addon-depends/containerd/package.mk
+++ b/packages/addons/addon-depends/containerd/package.mk
@@ -57,12 +57,12 @@ pre_make_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD.gopath:$PKG_BUILD/vendor/
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/containerd
+  ln -fs $PKG_BUILD $PKG_BUILD/vendor/src/github.com/docker/containerd
 }
 
 make_target() {
diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk
index 68d9bd4424..deda4bc885 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/dvb-fe-tool/package.mk
@@ -42,17 +42,17 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
             --without-libintl-prefix"
 
 post_patch() {
-  mkdir -p $ROOT/$PKG_BUILD/build-aux/
-    touch $ROOT/$PKG_BUILD/build-aux/config.rpath
-    touch $ROOT/$PKG_BUILD/libdvbv5-po/Makefile.in.in
-    touch $ROOT/$PKG_BUILD/v4l-utils-po/Makefile.in.in
+  mkdir -p $PKG_BUILD/build-aux/
+    touch $PKG_BUILD/build-aux/config.rpath
+    touch $PKG_BUILD/libdvbv5-po/Makefile.in.in
+    touch $PKG_BUILD/v4l-utils-po/Makefile.in.in
 }
 
 make_target() {
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME/lib/libdvbv5
+  cd $PKG_BUILD/.$TARGET_NAME/lib/libdvbv5
   make CFLAGS="$TARGET_CFLAGS"
 
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME/utils/dvb
+  cd $PKG_BUILD/.$TARGET_NAME/utils/dvb
   make CFLAGS="$TARGET_CFLAGS"
 }
 
diff --git a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk
index feb3d23057..2d6c2c4eee 100644
--- a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk
+++ b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk
@@ -31,7 +31,7 @@ PKG_AUTORECONF="yes"
 # aml 3.14 is meh
 pre_configure_target() {
 if [ "$TARGET_ARCH" = "aarch64" ]; then
-  sed -i 's/DVB_HEADER=0/DVB_HEADER=1/g' $ROOT/$PKG_BUILD/configure*
-  sed -i 's/HAS_DVB_API5=0/HAS_DVB_API5=1/g' $ROOT/$PKG_BUILD/configure*
+  sed -i 's/DVB_HEADER=0/DVB_HEADER=1/g' $PKG_BUILD/configure*
+  sed -i 's/HAS_DVB_API5=0/HAS_DVB_API5=1/g' $PKG_BUILD/configure*
 fi
 }
diff --git a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
index 75f4263cd0..5bd60c9c12 100644
--- a/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/emby-depends/ffmpegx/package.mk
@@ -25,7 +25,7 @@ PKG_DEPENDS_TARGET="toolchain ffmpeg lame x264"
 PKG_LONGDESC="FFmpeg built static with additional features"
 
 pre_configure_target() {
-  cd "$ROOT/$PKG_BUILD"
+  cd "$PKG_BUILD"
   rm -rf ".$TARGET_NAME"
   cp -PR $(get_build_dir ffmpeg)/* .
   make clean
@@ -80,7 +80,7 @@ configure_target() {
     --as="$CC" \
     --cc="$CC" \
     --ld="$CC" \
-    --pkg-config="$ROOT/$TOOLCHAIN/bin/pkg-config" \
+    --pkg-config="$TOOLCHAIN/bin/pkg-config" \
     --host-cc="$HOST_CC" \
     --host-cflags="$HOST_CFLAGS" \
     --host-ldflags="$HOST_LDFLAGS" \
diff --git a/packages/addons/addon-depends/emby-depends/x264/package.mk b/packages/addons/addon-depends/emby-depends/x264/package.mk
index 94b20857bf..e7255f4b20 100644
--- a/packages/addons/addon-depends/emby-depends/x264/package.mk
+++ b/packages/addons/addon-depends/emby-depends/x264/package.mk
@@ -25,7 +25,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="x264"
 
 pre_configure_target() {
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 }
 
diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk
index 362d6a8e6c..377ea9cf48 100644
--- a/packages/addons/addon-depends/go/package.mk
+++ b/packages/addons/addon-depends/go/package.mk
@@ -42,22 +42,22 @@ PKG_AUTORECONF="no"
 
 configure_host() {
   export GOOS=linux
-  export GOROOT_FINAL=$ROOT/$TOOLCHAIN/lib/golang
+  export GOROOT_FINAL=$TOOLCHAIN/lib/golang
   export GOROOT_BOOTSTRAP=/usr/lib/golang
   export GOARCH=amd64
 }
 
 make_host() {
-  cd $ROOT/$PKG_BUILD/src
+  cd $PKG_BUILD/src
   bash make.bash --no-banner
 }
 
 pre_makeinstall_host() {
   # need to cleanup old golang version when updating to a new version
-  rm -rf $ROOT/$TOOLCHAIN/lib/golang
+  rm -rf $TOOLCHAIN/lib/golang
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib/golang
-  cp -av $ROOT/$PKG_BUILD/* $ROOT/$TOOLCHAIN/lib/golang/
+  mkdir -p $TOOLCHAIN/lib/golang
+  cp -av $PKG_BUILD/* $TOOLCHAIN/lib/golang/
 }
diff --git a/packages/addons/addon-depends/gtk+/package.mk b/packages/addons/addon-depends/gtk+/package.mk
index 0e697f5705..5a1cfca534 100644
--- a/packages/addons/addon-depends/gtk+/package.mk
+++ b/packages/addons/addon-depends/gtk+/package.mk
@@ -32,7 +32,7 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
 
-PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_GLIB_GENMARSHAL=$ROOT/$TOOLCHAIN/bin/glib-genmarshal \
+PKG_CONFIGURE_OPTS_TARGET="ac_cv_path_GLIB_GENMARSHAL=$TOOLCHAIN/bin/glib-genmarshal \
                            --disable-glibtest \
                            --enable-modules \
                            --enable-explicit-deps=no \
diff --git a/packages/addons/addon-depends/icu/package.mk b/packages/addons/addon-depends/icu/package.mk
index 48766b512b..114bbc6183 100644
--- a/packages/addons/addon-depends/icu/package.mk
+++ b/packages/addons/addon-depends/icu/package.mk
@@ -35,7 +35,7 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared \
-                           --with-cross-build=$ROOT/$PKG_BUILD/.$HOST_NAME"
+                           --with-cross-build=$PKG_BUILD/.$HOST_NAME"
 
 PKG_CONFIGURE_SCRIPT="source/configure"
 
diff --git a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
index 1233858125..872e0d52d9 100644
--- a/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
+++ b/packages/addons/addon-depends/lcdd-depends/serdisplib/package.mk
@@ -38,7 +38,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=$SYSROOT_PREFIX/usr \
 
 pre_configure_target() {
   # serdisplib fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rmdir .$TARGET_NAME
 
   # use libusb-config from sysroot
diff --git a/packages/addons/addon-depends/libimobiledevice/package.mk b/packages/addons/addon-depends/libimobiledevice/package.mk
index 0499d165d5..45817d1290 100644
--- a/packages/addons/addon-depends/libimobiledevice/package.mk
+++ b/packages/addons/addon-depends/libimobiledevice/package.mk
@@ -34,5 +34,5 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-largefile"
 
 post_makeinstall_target() {
-  cp $ROOT/$PKG_BUILD/common/utils.h $SYSROOT_PREFIX/usr/include/libimobiledevice/
+  cp $PKG_BUILD/common/utils.h $SYSROOT_PREFIX/usr/include/libimobiledevice/
 }
diff --git a/packages/addons/addon-depends/libnetwork/package.mk b/packages/addons/addon-depends/libnetwork/package.mk
index 7a8d21fb4d..74af531e02 100644
--- a/packages/addons/addon-depends/libnetwork/package.mk
+++ b/packages/addons/addon-depends/libnetwork/package.mk
@@ -58,9 +58,9 @@ pre_make_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD.gopath
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD.gopath
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 }
 
diff --git a/packages/addons/addon-depends/moonlight-embedded/package.mk b/packages/addons/addon-depends/moonlight-embedded/package.mk
index fe8e0c9b8a..3da2bbc5e8 100644
--- a/packages/addons/addon-depends/moonlight-embedded/package.mk
+++ b/packages/addons/addon-depends/moonlight-embedded/package.mk
@@ -45,7 +45,7 @@ fi
 PKG_CMAKE_OPTS_TARGET="$FREESCALE_V4L_INCLUDE"
 
 pre_build_target() {
-  cp -a $(get_build_dir moonlight-common-c)/* $ROOT/$PKG_BUILD/third_party/moonlight-common-c
+  cp -a $(get_build_dir moonlight-common-c)/* $PKG_BUILD/third_party/moonlight-common-c
 }
 
 pre_configure_target() {
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk
index 93abb06a60..74063b324e 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk
@@ -53,5 +53,5 @@ post_makeinstall_target() {
     mkdir -p $SYSROOT_PREFIX/usr/include/MediaInfo/$i/
     cp -aP ../../../Source/MediaInfo/$i/*.h $SYSROOT_PREFIX/usr/include/MediaInfo/$i/
   done
-  cp -P libmediainfo-config $ROOT/$TOOLCHAIN/bin
+  cp -P libmediainfo-config $TOOLCHAIN/bin
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk
index ec48e55de4..d5d925d38c 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk
@@ -50,5 +50,5 @@ post_makeinstall_target() {
     mkdir -p $SYSROOT_PREFIX/usr/include/ZenLib/$i/
     cp -aP ../../../Source/ZenLib/$i/*.h $SYSROOT_PREFIX/usr/include/ZenLib/$i/
   done
-  cp -P libzen-config $ROOT/$TOOLCHAIN/bin
+  cp -P libzen-config $TOOLCHAIN/bin
 }
diff --git a/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
index fe9661d36f..56c0d96d93 100644
--- a/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
@@ -29,5 +29,5 @@ PKG_LONGDESC="OpenCaster is a free and open source MPEG2 transport stream data g
 PKG_AUTORECONF="no"
 
 pre_makeinstall_target() {
-  mkdir -p $ROOT/$PKG_BUILD/.install_pkg
+  mkdir -p $PKG_BUILD/.install_pkg
 }
diff --git a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk
index ba675439cf..3158fe08fa 100644
--- a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk
@@ -40,7 +40,7 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
         --without-sco"
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -I$ROOT/$PKG_BUILD"
+  export CFLAGS="$CFLAGS -I$PKG_BUILD"
   export LIBS="-ltermcap"
 }
 
diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
index ccd68779b0..116a20a62d 100644
--- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk
@@ -38,7 +38,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
 
 pre_configure_target() {
 # nmap fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 
   export CPPFLAGS="$CPPFLAGS -Iliblua"
diff --git a/packages/addons/addon-depends/ninja/package.mk b/packages/addons/addon-depends/ninja/package.mk
index a8c9932e2d..5f23ba5f4a 100644
--- a/packages/addons/addon-depends/ninja/package.mk
+++ b/packages/addons/addon-depends/ninja/package.mk
@@ -38,5 +38,5 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp ninja $ROOT/$TOOLCHAIN/bin/
+  cp ninja $TOOLCHAIN/bin/
 }
diff --git a/packages/addons/addon-depends/nspr/package.mk b/packages/addons/addon-depends/nspr/package.mk
index 813e26919c..6c8706f5d8 100644
--- a/packages/addons/addon-depends/nspr/package.mk
+++ b/packages/addons/addon-depends/nspr/package.mk
@@ -37,8 +37,8 @@ if [ "$TARGET_ARCH" = "x86_64" ] ; then
 fi
 
 PKG_CONFIGURE_OPTS_TARGET="--with-pthreads $TARGET_USE_64"
-PKG_MAKE_OPTS_TARGET="NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall"
-PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall"
+PKG_MAKE_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall"
+PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall"
 
 configure_target() {
   cd $(get_build_dir nss)/nspr
diff --git a/packages/addons/addon-depends/nss/package.mk b/packages/addons/addon-depends/nss/package.mk
index 8c015bd890..3c15e2f553 100644
--- a/packages/addons/addon-depends/nss/package.mk
+++ b/packages/addons/addon-depends/nss/package.mk
@@ -34,7 +34,7 @@ PKG_AUTORECONF="no"
 MAKEFLAGS=-j1
 
 make_host() {
-  cd $ROOT/$PKG_BUILD/nss
+  cd $PKG_BUILD/nss
 
   [ "$TARGET_ARCH" = "x86_64" ] && export USE_64=1
 
@@ -42,15 +42,15 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/*/nsinstall $ROOT/$TOOLCHAIN/bin
+  cp $PKG_BUILD/nss/coreconf/nsinstall/*/nsinstall $TOOLCHAIN/bin
 }
 
 post_makeinstall_host() {
-  rm -rf $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/Linux*
+  rm -rf $PKG_BUILD/nss/coreconf/nsinstall/Linux*
 }
 
 make_target() {
-  cd $ROOT/$PKG_BUILD/nss
+  cd $PKG_BUILD/nss
 
   [ "$TARGET_ARCH" = "x86_64" ] && TARGET_USE_64="USE_64=1"
 
@@ -59,14 +59,14 @@ make_target() {
      USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
      OS_TEST=$TARGET_ARCH \
      NSS_TESTS="dummy" \
-     NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall \
+     NSINSTALL=$TOOLCHAIN/bin/nsinstall \
      CPU_ARCH_TAG=$TARGET_ARCH \
      CC=$CC LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib" \
      V=1
 }
 
 makeinstall_target() {
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   $STRIP dist/Linux*/lib/*.so
   cp -L dist/Linux*/lib/*.so $SYSROOT_PREFIX/usr/lib
   cp -L dist/Linux*/lib/libcrmf.a $SYSROOT_PREFIX/usr/lib
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/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk
index c648ce75aa..3ce80b3250 100644
--- a/packages/addons/addon-depends/protobuf/package.mk
+++ b/packages/addons/addon-depends/protobuf/package.mk
@@ -28,7 +28,7 @@ PKG_LONGDESC="protobuf: Protocol Buffers - Google's data interchange format"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/cmake/CMakeLists.txt"
+PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt"
 
 PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
                      -DBUILD_SHARED_LIBS=0 \
diff --git a/packages/addons/addon-depends/qtbase/package.mk b/packages/addons/addon-depends/qtbase/package.mk
index f7db62fe2e..5e7ac3e4b6 100644
--- a/packages/addons/addon-depends/qtbase/package.mk
+++ b/packages/addons/addon-depends/qtbase/package.mk
@@ -30,7 +30,7 @@ PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_TARGET="-prefix /usr
                            -sysroot $SYSROOT_PREFIX
-                           -hostprefix $ROOT/$TOOLCHAIN
+                           -hostprefix $TOOLCHAIN
                            -device linux-libreelec-g++
                            -opensource -confirm-license
                            -release
diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk
index 27d77f8e4f..46dee4573c 100644
--- a/packages/addons/addon-depends/runc/package.mk
+++ b/packages/addons/addon-depends/runc/package.mk
@@ -57,12 +57,12 @@ pre_make_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -X main.version=$(cat ./VERSION) -extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/Godeps/_workspace/
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD.gopath:$PKG_BUILD/Godeps/_workspace/
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/Godeps/_workspace/src/github.com/opencontainers/runc
+  ln -fs $PKG_BUILD $PKG_BUILD/Godeps/_workspace/src/github.com/opencontainers/runc
 }
 
 make_target() {
diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
index 75f4d453ac..b39972da1d 100644
--- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
@@ -40,7 +40,7 @@ pre_configure_target() {
   export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
 
 # screen fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 }
 
diff --git a/packages/addons/addon-depends/tini/package.mk b/packages/addons/addon-depends/tini/package.mk
index 3b43719464..cd6b84d275 100644
--- a/packages/addons/addon-depends/tini/package.mk
+++ b/packages/addons/addon-depends/tini/package.mk
@@ -36,7 +36,7 @@ PKG_CMAKE_TARGET_OPTS="-DMINIMAL=ON"
 PKG_MAKE_TARGET_OPTS="tini-static"
 
 pre_configure_target(){
-  sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" $ROOT/$PKG_BUILD/src/tiniConfig.h.in
+  sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" $PKG_BUILD/src/tiniConfig.h.in
 }
 
 makeinstall_target() {
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
index 94ff0409f1..d79e76f4d8 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk
@@ -53,7 +53,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
index bcc3151be4..38106d19c2 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk
@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
index 034aef401d..8d3d6d565e 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk
@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
index 77aac3ddee..c98f7b8b58 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk
@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
index 85b2396726..ab40a6b46d 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk
@@ -46,7 +46,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
index 4fa4396700..71af66d3f4 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk
@@ -52,7 +52,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
index 32b0fdb4fa..cef310c33f 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk
@@ -47,7 +47,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
index 178613b67b..2c3fc50279 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk
@@ -46,8 +46,8 @@ post_make_target() {
   VDR_DIR=$(get_build_dir vdr)
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
-  cp --remove-destination $ROOT/$PKG_BUILD/server/${LIB_NAME}-server.so $ROOT/$PKG_BUILD/server/${LIB_NAME}-server.so.${VDR_APIVERSION}
-  cp --remove-destination $ROOT/$PKG_BUILD/client/${LIB_NAME}-client.so $ROOT/$PKG_BUILD/client/${LIB_NAME}-client.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/server/${LIB_NAME}-server.so $PKG_BUILD/server/${LIB_NAME}-server.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/client/${LIB_NAME}-client.so $PKG_BUILD/client/${LIB_NAME}-client.so.${VDR_APIVERSION}
 
   $STRIP client/libvdr-*.so*
   $STRIP server/libvdr-*.so*
diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
index 20cecb30b6..069ef54d15 100644
--- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk
@@ -46,7 +46,7 @@ post_make_target() {
   VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
   LIB_NAME=lib${PKG_NAME/-plugin/}
 
-  cp --remove-destination $ROOT/$PKG_BUILD/${LIB_NAME}.so $ROOT/$PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+  cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
   $STRIP libvdr-*.so*
 }
 
diff --git a/packages/addons/browser/chromium/package.mk b/packages/addons/browser/chromium/package.mk
index f6843953dc..76751f360f 100644
--- a/packages/addons/browser/chromium/package.mk
+++ b/packages/addons/browser/chromium/package.mk
@@ -47,7 +47,7 @@ make_target() {
   export LD=$CXX
 
   # Use Python 2
-  find . -name '*.py' -exec sed -i -r "s|/usr/bin/python$|$ROOT/$TOOLCHAIN/bin/python|g" {} +
+  find . -name '*.py' -exec sed -i -r "s|/usr/bin/python$|$TOOLCHAIN/bin/python|g" {} +
 
   # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
   # Note: These are for OpenELEC use ONLY. For your own distribution, please
@@ -114,7 +114,7 @@ make_target() {
   ./third_party/libaddressinput/chromium/tools/update-strings.py
 
   ./tools/gn/bootstrap/bootstrap.py --gn-gen-args "${_flags[*]}"
-  ./out/Release/gn gen out/Release --args="${_flags[*]}" --script-executable=$ROOT/$TOOLCHAIN/bin/python
+  ./out/Release/gn gen out/Release --args="${_flags[*]}" --script-executable=$TOOLCHAIN/bin/python
 
   ninja -C out/Release chrome chrome_sandbox widevinecdmadapter
 }
diff --git a/packages/addons/driver/steamcontroller/package.mk b/packages/addons/driver/steamcontroller/package.mk
index 191992b079..629f51597d 100644
--- a/packages/addons/driver/steamcontroller/package.mk
+++ b/packages/addons/driver/steamcontroller/package.mk
@@ -61,6 +61,6 @@ addon() {
     fi
     cp $(get_build_dir linux)/usr/include/linux/input.h $ADDON_BUILD/$PKG_ADDON_ID/include/linux/
 
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $ADDON_BUILD/$PKG_ADDON_ID/lib/ -f 1>/dev/null
+  python -Wi -t -B $TOOLCHAIN/lib/python2.7/compileall.py $ADDON_BUILD/$PKG_ADDON_ID/lib/ -f 1>/dev/null
   find $ADDON_BUILD/$PKG_ADDON_ID/lib/ -name '*.py' -exec rm {} \;
 }
diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk
index fa16c557b3..c252b2d88a 100644
--- a/packages/addons/driver/sundtek-mediatv/package.mk
+++ b/packages/addons/driver/sundtek-mediatv/package.mk
@@ -34,8 +34,8 @@ PKG_ADDON_TYPE="xbmc.service"
 PKG_AUTORECONF="no"
 
 make_target() {
-  mkdir -p $ROOT/$PKG_BUILD
-  cd $ROOT/$PKG_BUILD
+  mkdir -p $PKG_BUILD
+  cd $PKG_BUILD
 
   case $TARGET_ARCH in
     x86_64)
diff --git a/packages/addons/script/moonlight/package.mk b/packages/addons/script/moonlight/package.mk
index d5fc7afb9c..3d3d46826b 100644
--- a/packages/addons/script/moonlight/package.mk
+++ b/packages/addons/script/moonlight/package.mk
@@ -38,8 +38,8 @@ PKG_ADDON_PROVIDES="executable"
 
 post_unpack() {
   # don't use the files from the script
-  rm $ROOT/$PKG_BUILD/script.moonlight/icon.png
-  rm $ROOT/$PKG_BUILD/script.moonlight/changelog.txt
+  rm $PKG_BUILD/script.moonlight/icon.png
+  rm $PKG_BUILD/script.moonlight/changelog.txt
 }
 
 make_target() {
@@ -52,7 +52,7 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
-    cp -PR $ROOT/$PKG_BUILD/script.moonlight/* $ADDON_BUILD/$PKG_ADDON_ID
+    cp -PR $PKG_BUILD/script.moonlight/* $ADDON_BUILD/$PKG_ADDON_ID
 
     # use our own changelog.txt
     cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index 4865bff748..9ef236381a 100644
--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -68,16 +68,16 @@ configure_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD/.gopath
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD/.gopath
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  mkdir -p $ROOT/$PKG_BUILD/.gopath
-  if [ -d $ROOT/$PKG_BUILD/vendor ]; then
-    mv $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/.gopath/src
+  mkdir -p $PKG_BUILD/.gopath
+  if [ -d $PKG_BUILD/vendor ]; then
+    mv $PKG_BUILD/vendor $PKG_BUILD/.gopath/src
   fi
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/.gopath/src/github.com/docker/docker
+  ln -fs $PKG_BUILD $PKG_BUILD/.gopath/src/github.com/docker/docker
 
   # used for docker version
   export GITCOMMIT=$PKG_VERSION
@@ -98,8 +98,8 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $ROOT/$PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $ROOT/$PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $PKG_BUILD/bin/docker $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # containerd
     cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd
diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk
index e599ae2e0e..a619b7398f 100644
--- a/packages/addons/service/hyperion/package.mk
+++ b/packages/addons/service/hyperion/package.mk
@@ -49,7 +49,7 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then
 fi
 
 pre_build_target() {
-  cp -a $(get_build_dir rpi_ws281x)/* $ROOT/$PKG_BUILD/dependencies/external/rpi_ws281x
+  cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x
 }
 
 pre_configure_target() {
diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk
index b7838ee251..2c1241474e 100644
--- a/packages/addons/service/lcdd/package.mk
+++ b/packages/addons/service/lcdd/package.mk
@@ -49,7 +49,7 @@ pre_make_target() {
 }
 
 addon() {
-  drivers="none|$(cat $ROOT/$PKG_BUILD/.$TARGET_NAME/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')"
+  drivers="none|$(cat $PKG_BUILD/.$TARGET_NAME/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')"
 
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
 
diff --git a/packages/addons/service/net-snmp/package.mk b/packages/addons/service/net-snmp/package.mk
index 74c74976da..7994d8a74a 100644
--- a/packages/addons/service/net-snmp/package.mk
+++ b/packages/addons/service/net-snmp/package.mk
@@ -61,7 +61,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  make install INSTALL_PREFIX=$ROOT/$PKG_BUILD/.$TARGET_NAME
+  make install INSTALL_PREFIX=$PKG_BUILD/.$TARGET_NAME
 }
 
 addon() {
diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk
index 9bec2884d0..f388961c3c 100644
--- a/packages/addons/service/proftpd/package.mk
+++ b/packages/addons/service/proftpd/package.mk
@@ -57,8 +57,8 @@ pre_build_target() {
 }
 
 pre_configure_target() {
-  export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$SYSROOT_PREFIX/usr/include/ncurses -I$ROOT/$PKG_BUILD/.$TARGET_NAME/include/"
-  export LDFLAGS="$LDFLAGS -L$ROOT/$PKG_BUILD/.$TARGET_NAME/lib"
+  export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$SYSROOT_PREFIX/usr/include/ncurses -I$PKG_BUILD/.$TARGET_NAME/include/"
+  export LDFLAGS="$LDFLAGS -L$PKG_BUILD/.$TARGET_NAME/lib"
 }
 
 makeinstall_target() {
diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk
index bc96dcf4f2..6efc2e5935 100644
--- a/packages/addons/service/syncthing/package.mk
+++ b/packages/addons/service/syncthing/package.mk
@@ -40,16 +40,16 @@ configure_target() {
   export CGO_NO_EMULATION=1
   export CGO_CFLAGS=$CFLAGS
   export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC -X main.Version=v$PKG_VERSION"
-  export GOLANG=$ROOT/$TOOLCHAIN/lib/golang/bin/go
-  export GOPATH=$ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing:$ROOT/$PKG_BUILD/vendor:$ROOT/$PKG_BUILD/Godeps/_workspace
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD/src/github.com/syncthing/syncthing:$PKG_BUILD/vendor:$PKG_BUILD/Godeps/_workspace
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
-  $ROOT/$TOOLCHAIN/lib/golang/bin/go run build.go assets
+  $TOOLCHAIN/lib/golang/bin/go run build.go assets
 
-  mkdir -p $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing
-  ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
-  ln -fs $ROOT/$PKG_BUILD/vendor $ROOT/$PKG_BUILD/vendor/src
+  mkdir -p $PKG_BUILD $PKG_BUILD/src/github.com/syncthing
+  ln -fs $PKG_BUILD $PKG_BUILD/src/github.com/syncthing/syncthing
+  ln -fs $PKG_BUILD/vendor $PKG_BUILD/vendor/src
 
   case $TARGET_ARCH in
     x86_64)
@@ -70,10 +70,20 @@ configure_target() {
       esac
       ;;
   esac
+
+  export GOOS=linux
+  export CGO_ENABLED=1
+  export CGO_NO_EMULATION=1
+  export CGO_CFLAGS=$CFLAGS
+  export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC -X main.Version=v$PKG_VERSION"
+  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
+  export GOPATH=$PKG_BUILD/src/github.com/syncthing/syncthing:$PKG_BUILD/vendor:$PKG_BUILD/Godeps/_workspace
+  export GOROOT=$TOOLCHAIN/lib/golang
+  export PATH=$PATH:$GOROOT/bin
 }
 
 make_target() {
-  cd $ROOT/$PKG_BUILD/src/github.com/syncthing/syncthing
+  cd $PKG_BUILD/src/github.com/syncthing/syncthing
   mkdir -p bin
   $GOLANG build -v -o bin/syncthing -a -ldflags "$LDFLAGS" ./cmd/syncthing
 }
@@ -84,5 +94,5 @@ makeinstall_target() {
 
 addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $ROOT/$PKG_BUILD/bin/syncthing $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/bin/syncthing $ADDON_BUILD/$PKG_ADDON_ID/bin
 }
diff --git a/packages/addons/service/tinc/package.mk b/packages/addons/service/tinc/package.mk
index 78257b6f14..6785befd48 100644
--- a/packages/addons/service/tinc/package.mk
+++ b/packages/addons/service/tinc/package.mk
@@ -40,7 +40,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-curses   \
 
 pre_configure_target() {
   # tinc fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 }
 
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 75f42377a6..01eb5bdc2a 100644
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@@ -64,21 +64,21 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --enable-trace \
                            --nowerror \
                            --disable-bintray_cache \
-                           --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'$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() {
 # fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
 # transcoding
   if [ "$TARGET_ARCH" = x86_64 ]; then
-    export AS=$ROOT/$TOOLCHAIN/bin/yasm
+    export AS=$TOOLCHAIN/bin/yasm
   fi
 
   export CROSS_COMPILE=$TARGET_PREFIX
@@ -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/addons/tools/mono/package.mk b/packages/addons/tools/mono/package.mk
index d27c286d33..70f60f258e 100644
--- a/packages/addons/tools/mono/package.mk
+++ b/packages/addons/tools/mono/package.mk
@@ -64,8 +64,8 @@ configure_target() {
 }
 
 makeinstall_target() {
-  make -C "$ROOT/$PKG_BUILD/.$HOST_NAME" install DESTDIR="$INSTALL"
-  make -C "$ROOT/$PKG_BUILD/.$TARGET_NAME" install DESTDIR="$INSTALL"
+  make -C "$PKG_BUILD/.$HOST_NAME" install DESTDIR="$INSTALL"
+  make -C "$PKG_BUILD/.$TARGET_NAME" install DESTDIR="$INSTALL"
   $STRIP "$INSTALL/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME/bin/mono"
 }
 
diff --git a/packages/audio/sidplay-libs/package.mk b/packages/audio/sidplay-libs/package.mk
index eb42fe5be4..c396dba803 100644
--- a/packages/audio/sidplay-libs/package.mk
+++ b/packages/audio/sidplay-libs/package.mk
@@ -34,7 +34,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static"
 
 pre_configure_target() {
   # fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
   export CXXFLAGS="$CXXFLAGS -Wno-narrowing"
diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk
index ce3456ab6e..6a45c033e9 100644
--- a/packages/compress/bzip2/package.mk
+++ b/packages/compress/bzip2/package.mk
@@ -32,26 +32,26 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 pre_build_host() {
-  mkdir -p $ROOT/$PKG_BUILD/.$HOST_NAME
-  cp -r $ROOT/$PKG_BUILD/* $ROOT/$PKG_BUILD/.$HOST_NAME
+  mkdir -p $PKG_BUILD/.$HOST_NAME
+  cp -r $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
 }
 
 make_host() {
-  cd $ROOT/$PKG_BUILD/.$HOST_NAME
+  cd $PKG_BUILD/.$HOST_NAME
   make -f Makefile-libbz2_so CC=$HOST_CC CFLAGS="$CFLAGS -fPIC -DPIC"
 }
 
 makeinstall_host() {
-  make install PREFIX=$ROOT/$TOOLCHAIN
+  make install PREFIX=$TOOLCHAIN
 }
 
 pre_build_target() {
-  mkdir -p $ROOT/$PKG_BUILD/.$TARGET_NAME
-  cp -r $ROOT/$PKG_BUILD/* $ROOT/$PKG_BUILD/.$TARGET_NAME
+  mkdir -p $PKG_BUILD/.$TARGET_NAME
+  cp -r $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
 }
 
 pre_make_target() {
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME
+  cd $PKG_BUILD/.$TARGET_NAME
   sed -e "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$PKG_VERSION libbz2.so,g" -i Makefile-libbz2_so
 }
 
diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk
index 1d829cebd4..5530555041 100644
--- a/packages/compress/zlib/package.mk
+++ b/packages/compress/zlib/package.mk
@@ -34,22 +34,22 @@ PKG_AUTORECONF="no"
 post_configure_target() {
  ## configure minizip
  (
-  cd $ROOT/$PKG_BUILD/contrib/minizip
+  cd $PKG_BUILD/contrib/minizip
   rm Makefile
   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:../../"
   do_autoreconf
-  cp $ROOT/$PKG_BUILD/.$TARGET_NAME/zconf.h ./
+  cp $PKG_BUILD/.$TARGET_NAME/zconf.h ./
   ./configure --host=$TARGET_NAME --build=$HOST_NAME $TARGET_CONFIGURE_OPTS --disable-shared --enable-static
  )
 }
 
 post_make_target() {
  # make minizip
- make -C $ROOT/$PKG_BUILD/contrib/minizip
+ make -C $PKG_BUILD/contrib/minizip
 }
 
 post_makeinstall_target() {
  # Install minizip
- make -C $ROOT/$PKG_BUILD/contrib/minizip DESTDIR=$SYSROOT_PREFIX install
+ make -C $PKG_BUILD/contrib/minizip DESTDIR=$SYSROOT_PREFIX install
 }
 
diff --git a/packages/databases/mysql/package.mk b/packages/databases/mysql/package.mk
index 58c80512f1..6bfa52de44 100644
--- a/packages/databases/mysql/package.mk
+++ b/packages/databases/mysql/package.mk
@@ -32,13 +32,13 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 post_unpack() {
-  sed -i 's|OPENSSL_MAJOR_VERSION STREQUAL "1"|OPENSSL_MAJOR_VERSION STREQUAL "2"|' $ROOT/$PKG_BUILD/cmake/ssl.cmake
-  sed -i 's|GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)|SET(LIBMYSQL_OS_OUTPUT_NAME "mysqlclient")|' $ROOT/$PKG_BUILD/scripts/CMakeLists.txt
-  sed -i "s|COMMAND comp_err|COMMAND $ROOT/$TOOLCHAIN/bin/comp_err|" $ROOT/$PKG_BUILD/extra/CMakeLists.txt
-  sed -i "s|COMMAND comp_sql|COMMAND $ROOT/$TOOLCHAIN/bin/comp_sql|" $ROOT/$PKG_BUILD/scripts/CMakeLists.txt
-  sed -i "s|COMMAND gen_lex_hash|COMMAND $ROOT/$TOOLCHAIN/bin/gen_lex_hash|" $ROOT/$PKG_BUILD/sql/CMakeLists.txt
+  sed -i 's|OPENSSL_MAJOR_VERSION STREQUAL "1"|OPENSSL_MAJOR_VERSION STREQUAL "2"|' $PKG_BUILD/cmake/ssl.cmake
+  sed -i 's|GET_TARGET_PROPERTY(LIBMYSQL_OS_OUTPUT_NAME libmysql OUTPUT_NAME)|SET(LIBMYSQL_OS_OUTPUT_NAME "mysqlclient")|' $PKG_BUILD/scripts/CMakeLists.txt
+  sed -i "s|COMMAND comp_err|COMMAND $TOOLCHAIN/bin/comp_err|" $PKG_BUILD/extra/CMakeLists.txt
+  sed -i "s|COMMAND comp_sql|COMMAND $TOOLCHAIN/bin/comp_sql|" $PKG_BUILD/scripts/CMakeLists.txt
+  sed -i "s|COMMAND gen_lex_hash|COMMAND $TOOLCHAIN/bin/gen_lex_hash|" $PKG_BUILD/sql/CMakeLists.txt
 
-  sed -i '/^IF(NOT BOOST_MINOR_VERSION.*$/,/^ENDIF()$/d' $ROOT/$PKG_BUILD/cmake/boost.cmake
+  sed -i '/^IF(NOT BOOST_MINOR_VERSION.*$/,/^ENDIF()$/d' $PKG_BUILD/cmake/boost.cmake
 }
 
 PKG_CMAKE_OPTS_HOST="-DCMAKE_BUILD_TYPE=Release \
@@ -70,9 +70,9 @@ post_make_host() {
 }
 
 makeinstall_host() {
-  cp -P extra/comp_err $ROOT/$TOOLCHAIN/bin
-  cp -P sql/gen_lex_hash $ROOT/$TOOLCHAIN/bin
-  cp -P scripts/comp_sql $ROOT/$TOOLCHAIN/bin
+  cp -P extra/comp_err $TOOLCHAIN/bin
+  cp -P sql/gen_lex_hash $TOOLCHAIN/bin
+  cp -P scripts/comp_sql $TOOLCHAIN/bin
 }
 
 PKG_CMAKE_OPTS_TARGET="-DINSTALL_INCLUDEDIR=include/mysql \
@@ -100,7 +100,7 @@ post_makeinstall_target() {
   sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config
   sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config
   cp scripts/mysql_config $SYSROOT_PREFIX/usr/bin
-  ln -sf $SYSROOT_PREFIX/usr/bin/mysql_config $ROOT/$TOOLCHAIN/bin/mysql_config
+  ln -sf $SYSROOT_PREFIX/usr/bin/mysql_config $TOOLCHAIN/bin/mysql_config
 
   rm -rf $INSTALL
 }
diff --git a/packages/devel/attr/package.mk b/packages/devel/attr/package.mk
index 7db940ea0a..cd472a315f 100644
--- a/packages/devel/attr/package.mk
+++ b/packages/devel/attr/package.mk
@@ -44,7 +44,7 @@ fi
 
 pre_configure_target() {
 # attr fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 }
 
diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk
index e3c0c147f4..4313297e92 100644
--- a/packages/devel/autoconf-archive/package.mk
+++ b/packages/devel/autoconf-archive/package.mk
@@ -30,7 +30,7 @@ PKG_LONGDESC="autoconf-archive is an package of m4 macros"
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --prefix=$ROOT/$TOOLCHAIN"
+PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --prefix=$TOOLCHAIN"
 
 makeinstall_host() {
 # make install
diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk
index 5f29573135..4f6b07f8b2 100644
--- a/packages/devel/autoconf/package.mk
+++ b/packages/devel/autoconf/package.mk
@@ -31,7 +31,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_HOST="EMACS=no \
-                         ac_cv_path_M4=$ROOT/$TOOLCHAIN/bin/m4 \
+                         ac_cv_path_M4=$TOOLCHAIN/bin/m4 \
                          ac_cv_prog_gnu_m4_gnu=no \
                          --target=$TARGET_NAME"
 
diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk
index fe4237ecc1..5376b0ec11 100644
--- a/packages/devel/boost/package.mk
+++ b/packages/devel/boost/package.mk
@@ -38,8 +38,8 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp bin.*/bjam $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp bin.*/bjam $TOOLCHAIN/bin
 }
 
 pre_configure_target() {
@@ -50,8 +50,8 @@ pre_configure_target() {
 
 configure_target() {
   sh bootstrap.sh --prefix=/usr \
-                  --with-bjam=$ROOT/$TOOLCHAIN/bin/bjam \
-                  --with-python=$ROOT/$TOOLCHAIN/bin/python \
+                  --with-bjam=$TOOLCHAIN/bin/bjam \
+                  --with-python=$TOOLCHAIN/bin/python \
 
   echo "using gcc : `$CC -v 2>&1  | tail -n 1 |awk '{print $3}'` : $CC  : <compileflags>\"$CFLAGS\" <linkflags>\"$LDFLAGS\" ;" \
     > tools/build/src/user-config.jam
@@ -62,7 +62,7 @@ make_target() {
 }
 
 makeinstall_target() {
-  $ROOT/$TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
+  $TOOLCHAIN/bin/bjam -d2 --toolset=gcc link=static \
                                 --prefix=$SYSROOT_PREFIX/usr \
                                 --ignore-site-config \
                                 --layout=system \
diff --git a/packages/devel/ccache/package.mk b/packages/devel/ccache/package.mk
index 6ec070fd79..9854e3b5fd 100644
--- a/packages/devel/ccache/package.mk
+++ b/packages/devel/ccache/package.mk
@@ -38,20 +38,20 @@ PKG_CONFIGURE_OPTS_HOST="--with-bundled-zlib"
 post_makeinstall_host() {
 # setup ccache
   if [ -z "$CCACHE_DISABLE" ]; then
-    $ROOT/$TOOLCHAIN/bin/ccache --max-size=$CCACHE_CACHE_SIZE
+    $TOOLCHAIN/bin/ccache --max-size=$CCACHE_CACHE_SIZE
   fi
 
-  cat > $ROOT/$TOOLCHAIN/bin/host-gcc <<EOF
+  cat > $TOOLCHAIN/bin/host-gcc <<EOF
 #!/bin/sh
-$ROOT/$TOOLCHAIN/bin/ccache $CC "\$@"
+$TOOLCHAIN/bin/ccache $CC "\$@"
 EOF
 
-  chmod +x $ROOT/$TOOLCHAIN/bin/host-gcc
+  chmod +x $TOOLCHAIN/bin/host-gcc
 
-  cat > $ROOT/$TOOLCHAIN/bin/host-g++ <<EOF
+  cat > $TOOLCHAIN/bin/host-g++ <<EOF
 #!/bin/sh
-$ROOT/$TOOLCHAIN/bin/ccache $CXX "\$@"
+$TOOLCHAIN/bin/ccache $CXX "\$@"
 EOF
 
-  chmod +x $ROOT/$TOOLCHAIN/bin/host-g++
+  chmod +x $TOOLCHAIN/bin/host-g++
 }
diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk
index 27f9803c1e..30636456fa 100644
--- a/packages/devel/cmake/package.mk
+++ b/packages/devel/cmake/package.mk
@@ -31,7 +31,7 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 configure_host() {
-  ../configure --prefix=$ROOT/$TOOLCHAIN \
+  ../configure --prefix=$TOOLCHAIN \
                --no-qt-gui --no-system-libs \
                -- \
                -DCMAKE_C_FLAGS="-O2 -Wall -pipe -Wno-format-security" \
diff --git a/packages/devel/configtools/package.mk b/packages/devel/configtools/package.mk
index 0ae46b7778..7cfe742fd1 100644
--- a/packages/devel/configtools/package.mk
+++ b/packages/devel/configtools/package.mk
@@ -29,6 +29,6 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/configtools
-  cp config.* $ROOT/$TOOLCHAIN/configtools
+  mkdir -p $TOOLCHAIN/configtools
+  cp config.* $TOOLCHAIN/configtools
 }
diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
index a526085879..3eccb34842 100644
--- a/packages/devel/flex/package.mk
+++ b/packages/devel/flex/package.mk
@@ -33,10 +33,10 @@ PKG_AUTORECONF="no"
 PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared --disable-rpath --with-gnu-ld"
 
 post_makeinstall_host() {
-  cat > $ROOT/$TOOLCHAIN/bin/lex << "EOF"
+  cat > $TOOLCHAIN/bin/lex << "EOF"
 #!/bin/sh
 exec flex "$@"
 EOF
 
-  chmod -v 755 $ROOT/$TOOLCHAIN/bin/lex
+  chmod -v 755 $TOOLCHAIN/bin/lex
 }
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index 00daa753cb..31fb59aeda 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -138,7 +138,7 @@ post_makeinstall_target() {
 # add UTF-8 charmap for Generic (charmap is needed for installer)
   if [ "$PROJECT" = "Generic" ]; then
     mkdir -p $INSTALL/usr/share/i18n/charmaps
-    cp -PR $ROOT/$PKG_BUILD/localedata/charmaps/UTF-8 $INSTALL/usr/share/i18n/charmaps
+    cp -PR $PKG_BUILD/localedata/charmaps/UTF-8 $INSTALL/usr/share/i18n/charmaps
     gzip $INSTALL/usr/share/i18n/charmaps/UTF-8
   fi
 
@@ -146,7 +146,7 @@ post_makeinstall_target() {
     rm -rf $INSTALL/usr/share/i18n/locales
 
     mkdir -p $INSTALL/usr/share/i18n/locales
-      cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
+      cp -PR $PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales
   fi
 
 # create default configs
@@ -161,8 +161,8 @@ post_makeinstall_target() {
 }
 
 configure_init() {
-  cd $ROOT/$PKG_BUILD
-    rm -rf $ROOT/$PKG_BUILD/.$TARGET_NAME-init
+  cd $PKG_BUILD
+    rm -rf $PKG_BUILD/.$TARGET_NAME-init
 }
 
 make_init() {
@@ -171,11 +171,11 @@ make_init() {
 
 makeinstall_init() {
   mkdir -p $INSTALL/usr/lib
-    cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/usr/lib
-    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/libc.so.6 $INSTALL/usr/lib
-    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/usr/lib
-    cp $ROOT/$PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so.0 $INSTALL/usr/lib
-    cp -PR $ROOT/$PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/usr/lib
+    cp -PR $PKG_BUILD/.$TARGET_NAME/elf/ld*.so* $INSTALL/usr/lib
+    cp -PR $PKG_BUILD/.$TARGET_NAME/libc.so* $INSTALL/usr/lib
+    cp -PR $PKG_BUILD/.$TARGET_NAME/math/libm.so* $INSTALL/usr/lib
+    cp -PR $PKG_BUILD/.$TARGET_NAME/nptl/libpthread.so* $INSTALL/usr/lib
+    cp -PR $PKG_BUILD/.$TARGET_NAME/rt/librt.so* $INSTALL/usr/lib
 
     if [ "$TARGET_ARCH" = "arm" -a "$TARGET_FLOAT" = "hard" ]; then
       ln -sf ld.so $INSTALL/usr/lib/ld-linux.so.3
diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk
index f74fdf9c42..c4c23064c1 100644
--- a/packages/devel/libcap/package.mk
+++ b/packages/devel/libcap/package.mk
@@ -33,47 +33,47 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 post_unpack() {
-  mkdir -p $ROOT/$PKG_BUILD/.$HOST_NAME
-  cp -r $ROOT/$PKG_BUILD/* $ROOT/$PKG_BUILD/.$HOST_NAME
-  mkdir -p $ROOT/$PKG_BUILD/.$TARGET_NAME 
-  cp -r $ROOT/$PKG_BUILD/* $ROOT/$PKG_BUILD/.$TARGET_NAME
+  mkdir -p $PKG_BUILD/.$HOST_NAME
+  cp -r $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME
+  mkdir -p $PKG_BUILD/.$TARGET_NAME 
+  cp -r $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
 }
 
 
 make_host() {
-  cd $ROOT/$PKG_BUILD/.$HOST_NAME
+  cd $PKG_BUILD/.$HOST_NAME
   make CC=$CC \
        AR=$AR \
        RANLIB=$RANLIB \
        CFLAGS="$HOST_CFLAGS" \
-       BUILD_CFLAGS="$HOST_CFLAGS -I$ROOT/$PKG_BUILD/libcap/include" \
+       BUILD_CFLAGS="$HOST_CFLAGS -I$PKG_BUILD/libcap/include" \
        PAM_CAP=no \
        lib=/lib \
        -C libcap libcap.pc libcap.a
 }
 
 make_target() {
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME
+  cd $PKG_BUILD/.$TARGET_NAME
   make CC=$CC \
        AR=$AR \
        RANLIB=$RANLIB \
        CFLAGS="$TARGET_CFLAGS" \
        BUILD_CC=$HOST_CC \
-       BUILD_CFLAGS="$HOST_CFLAGS -I$ROOT/$PKG_BUILD/libcap/include" \
+       BUILD_CFLAGS="$HOST_CFLAGS -I$PKG_BUILD/libcap/include" \
        PAM_CAP=no \
        lib=/lib \
        -C libcap libcap.pc libcap.a
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib
-    cp libcap/libcap.a $ROOT/$TOOLCHAIN/lib
+  mkdir -p $TOOLCHAIN/lib
+    cp libcap/libcap.a $TOOLCHAIN/lib
 
-  mkdir -p $ROOT/$TOOLCHAIN/lib/pkgconfig
-    cp libcap/libcap.pc $ROOT/$TOOLCHAIN/lib/pkgconfig
+  mkdir -p $TOOLCHAIN/lib/pkgconfig
+    cp libcap/libcap.pc $TOOLCHAIN/lib/pkgconfig
 
-  mkdir -p $ROOT/$TOOLCHAIN/include/sys
-    cp libcap/include/sys/capability.h $ROOT/$TOOLCHAIN/include/sys
+  mkdir -p $TOOLCHAIN/include/sys
+    cp libcap/include/sys/capability.h $TOOLCHAIN/include/sys
 }
 
 makeinstall_target() {
diff --git a/packages/devel/make/package.mk b/packages/devel/make/package.mk
index 6dbe879f62..a250a28c6a 100644
--- a/packages/devel/make/package.mk
+++ b/packages/devel/make/package.mk
@@ -33,5 +33,5 @@ PKG_AUTORECONF="no"
 export CC=$LOCAL_CC
 
 post_makeinstall_host() {
-  ln -sf make $ROOT/$TOOLCHAIN/bin/gmake
+  ln -sf make $TOOLCHAIN/bin/gmake
 }
diff --git a/packages/devel/mpc/package.mk b/packages/devel/mpc/package.mk
index 8eee8475cc..a15871e332 100644
--- a/packages/devel/mpc/package.mk
+++ b/packages/devel/mpc/package.mk
@@ -32,5 +32,5 @@ PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --enable-static --disable-shared \
-                         --with-gmp=$ROOT/$TOOLCHAIN \
-                         --with-mpfr=$ROOT/$TOOLCHAIN"
+                         --with-gmp=$TOOLCHAIN \
+                         --with-mpfr=$TOOLCHAIN"
diff --git a/packages/devel/mpfr/package.mk b/packages/devel/mpfr/package.mk
index c0ecf0ceac..d4dec287c3 100644
--- a/packages/devel/mpfr/package.mk
+++ b/packages/devel/mpfr/package.mk
@@ -32,6 +32,6 @@ PKG_AUTORECONF="no"
 
 PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
                          --enable-static --disable-shared \
-                         --prefix=$ROOT/$TOOLCHAIN \
-                         --with-gmp-lib=$ROOT/$TOOLCHAIN/lib \
-                         --with-gmp-include=$ROOT/$TOOLCHAIN/include"
+                         --prefix=$TOOLCHAIN \
+                         --with-gmp-lib=$TOOLCHAIN/lib \
+                         --with-gmp-include=$TOOLCHAIN/include"
diff --git a/packages/devel/pcre/package.mk b/packages/devel/pcre/package.mk
index 9bd161de28..a4e7119e2e 100644
--- a/packages/devel/pcre/package.mk
+++ b/packages/devel/pcre/package.mk
@@ -32,7 +32,7 @@ PKG_IS_ADDON="no"
 PKG_USE_CMAKE="no"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_HOST="--prefix=$ROOT/$TOOLCHAIN \
+PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN \
              --enable-utf8 \
              --enable-unicode-properties \
              --with-gnu-ld"
diff --git a/packages/devel/popt/package.mk b/packages/devel/popt/package.mk
index d64420b235..10155538ce 100644
--- a/packages/devel/popt/package.mk
+++ b/packages/devel/popt/package.mk
@@ -32,11 +32,11 @@ PKG_AUTORECONF="no"
 
 
 pre_configure_target() {
- cd $ROOT/$PKG_BUILD
+ cd $PKG_BUILD
  rm -rf .$TARGET_NAME
 }
 
 pre_configure_host() {
- cd $ROOT/$PKG_BUILD
+ cd $PKG_BUILD
  rm -rf .$HOST_NAME
 }
diff --git a/packages/devel/slang/package.mk b/packages/devel/slang/package.mk
index 79bdc8ae47..984d3de3f1 100644
--- a/packages/devel/slang/package.mk
+++ b/packages/devel/slang/package.mk
@@ -35,12 +35,12 @@ MAKEFLAGS=-j1
 
 pre_configure_target() {
  # slang fails to build in subdirs
- cd $ROOT/$PKG_BUILD
+ cd $PKG_BUILD
  rm -rf .$TARGET_NAME
 }
 
 pre_configure_host() {
  # slang fails to build in subdirs
- cd $ROOT/$PKG_BUILD
+ cd $PKG_BUILD
  rm -rf .$HOST_NAME
 }
diff --git a/packages/devel/swig/package.mk b/packages/devel/swig/package.mk
index 06bf896932..a752e2f291 100644
--- a/packages/devel/swig/package.mk
+++ b/packages/devel/swig/package.mk
@@ -30,7 +30,7 @@ PKG_LONGDESC="SWIG is a software development tool that connects programs written
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-PKG_CONFIGURE_OPTS_HOST="--with-pcre-prefix=$ROOT/$TOOLCHAIN \
+PKG_CONFIGURE_OPTS_HOST="--with-pcre-prefix=$TOOLCHAIN \
                          --with-boost=no \
                          --without-pcre \
                          --without-x \
diff --git a/packages/graphics/libpng/package.mk b/packages/graphics/libpng/package.mk
index f6dda5b4e2..35f2ca9053 100644
--- a/packages/graphics/libpng/package.mk
+++ b/packages/graphics/libpng/package.mk
@@ -40,7 +40,7 @@ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared"
 
 pre_configure_host() {
   export CFLAGS="$CFLAGS -fPIC -DPIC"
-  export CPPFLAGS="$CPPFLAGS -I$ROOT/$TOOLCHAIN/include"
+  export CPPFLAGS="$CPPFLAGS -I$TOOLCHAIN/include"
 }
 
 pre_configure_target() {
diff --git a/packages/lang/Python/package.mk b/packages/lang/Python/package.mk
index b4b2fa6a66..5dca6e5e09 100644
--- a/packages/lang/Python/package.mk
+++ b/packages/lang/Python/package.mk
@@ -87,7 +87,7 @@ makeinstall_host() {
 }
 
 pre_configure_target() {
-  export PYTHON_FOR_BUILD=$ROOT/$TOOLCHAIN/bin/python
+  export PYTHON_FOR_BUILD=$TOOLCHAIN/bin/python
 }
 
 make_target() {
@@ -125,7 +125,7 @@ post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin/python*-config
 
   cd $INSTALL/usr/lib/python2.7
-  python -Wi -t -B $ROOT/$PKG_BUILD/Lib/compileall.py -d /usr/lib/python2.7 -f .
+  python -Wi -t -B $PKG_BUILD/Lib/compileall.py -d /usr/lib/python2.7 -f .
   find $INSTALL/usr/lib/python2.7 -name "*.py" -exec rm -f {} \; &>/dev/null
 
   # strip
diff --git a/packages/lang/gcc-linaro-aarch64-elf/package.mk b/packages/lang/gcc-linaro-aarch64-elf/package.mk
index 2aa954c6f3..e7173ea0b9 100644
--- a/packages/lang/gcc-linaro-aarch64-elf/package.mk
+++ b/packages/lang/gcc-linaro-aarch64-elf/package.mk
@@ -36,6 +36,6 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/
-    cp -a * $ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-elf
+  mkdir -p $TOOLCHAIN/lib/gcc-linaro-aarch64-elf/
+    cp -a * $TOOLCHAIN/lib/gcc-linaro-aarch64-elf
 }
diff --git a/packages/lang/gcc-linaro-arm-eabi/package.mk b/packages/lang/gcc-linaro-arm-eabi/package.mk
index 5cbc3e7565..e7f302f456 100644
--- a/packages/lang/gcc-linaro-arm-eabi/package.mk
+++ b/packages/lang/gcc-linaro-arm-eabi/package.mk
@@ -36,6 +36,6 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib/gcc-linaro-arm-eabi/
-    cp -a * $ROOT/$TOOLCHAIN/lib/gcc-linaro-arm-eabi
+  mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-eabi/
+    cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-eabi
 }
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index d2a138d05f..7560dd8e38 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -34,9 +34,9 @@ PKG_AUTORECONF="no"
 
 GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \
                            --with-sysroot=$SYSROOT_PREFIX \
-                           --with-gmp=$ROOT/$TOOLCHAIN \
-                           --with-mpfr=$ROOT/$TOOLCHAIN \
-                           --with-mpc=$ROOT/$TOOLCHAIN \
+                           --with-gmp=$TOOLCHAIN \
+                           --with-mpfr=$TOOLCHAIN \
+                           --with-mpc=$TOOLCHAIN \
                            --with-gnu-as \
                            --with-gnu-ld \
                            --enable-plugin \
@@ -104,7 +104,7 @@ post_make_host() {
 post_makeinstall_host() {
   cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib
 
-  GCC_VERSION=`$ROOT/$TOOLCHAIN/bin/${TARGET_NAME}-gcc -dumpversion`
+  GCC_VERSION=`$TOOLCHAIN/bin/${TARGET_NAME}-gcc -dumpversion`
   DATE="0501`echo $GCC_VERSION | sed 's/\([0-9]\)/0\1/g' | sed 's/\.//g'`"
   CROSS_CC=${TARGET_PREFIX}gcc-${GCC_VERSION}
   CROSS_CXX=${TARGET_PREFIX}g++-${GCC_VERSION}
@@ -113,7 +113,7 @@ post_makeinstall_host() {
 
 cat > ${TARGET_PREFIX}gcc <<EOF
 #!/bin/sh
-$ROOT/$TOOLCHAIN/bin/ccache $CROSS_CC "\$@"
+$TOOLCHAIN/bin/ccache $CROSS_CC "\$@"
 EOF
 
   chmod +x ${TARGET_PREFIX}gcc
@@ -125,7 +125,7 @@ EOF
 
 cat > ${TARGET_PREFIX}g++ <<EOF
 #!/bin/sh
-$ROOT/$TOOLCHAIN/bin/ccache $CROSS_CXX "\$@"
+$TOOLCHAIN/bin/ccache $CROSS_CXX "\$@"
 EOF
 
   chmod +x ${TARGET_PREFIX}g++
@@ -144,8 +144,8 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib
-    cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
-    cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $INSTALL/usr/lib
+    cp -P $PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
+    cp -P $PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $INSTALL/usr/lib
 }
 
 configure_init() {
@@ -158,5 +158,5 @@ make_init() {
 
 makeinstall_init() {
   mkdir -p $INSTALL/usr/lib
-    cp -P $ROOT/$PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
+    cp -P $PKG_BUILD/.$HOST_NAME/$TARGET_NAME/libgcc/libgcc_s.so* $INSTALL/usr/lib
 }
diff --git a/packages/lang/llvm/package.mk b/packages/lang/llvm/package.mk
index 449f4653b1..1935aa9200 100644
--- a/packages/lang/llvm/package.mk
+++ b/packages/lang/llvm/package.mk
@@ -56,7 +56,7 @@ make_host() {
 
 makeinstall_host() {
   cp -a bin/llvm-config $SYSROOT_PREFIX/usr/bin/llvm-config-host
-  cp -a bin/llvm-tblgen $ROOT/$TOOLCHAIN/bin
+  cp -a bin/llvm-tblgen $TOOLCHAIN/bin
 }
 
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_BUILD_TYPE=MinSizeRel \
@@ -83,7 +83,7 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_BUILD_TYPE=MinSizeRel \
                        -DLLVM_BUILD_LLVM_DYLIB=ON \
                        -DLLVM_LINK_LLVM_DYLIB=ON \
                        -DLLVM_OPTIMIZED_TABLEGEN=ON \
-                       -DLLVM_TABLEGEN=$ROOT/$TOOLCHAIN/bin/llvm-tblgen"
+                       -DLLVM_TABLEGEN=$TOOLCHAIN/bin/llvm-tblgen"
 
 post_makeinstall_target() {
   rm -rf $INSTALL/usr/bin
diff --git a/packages/linux-drivers/brcmap6xxx-aml/package.mk b/packages/linux-drivers/brcmap6xxx-aml/package.mk
index 41f1858ed0..179c7fd975 100644
--- a/packages/linux-drivers/brcmap6xxx-aml/package.mk
+++ b/packages/linux-drivers/brcmap6xxx-aml/package.mk
@@ -34,7 +34,7 @@ PKG_AUTORECONF="no"
 make_target() {
   cd bcmdhd_1_201_59_x
   LDFLAGS="" make V=1 \
-    -C $(kernel_path) M=$ROOT/$PKG_BUILD/bcmdhd_1_201_59_x \
+    -C $(kernel_path) M=$PKG_BUILD/bcmdhd_1_201_59_x \
     ARCH=$TARGET_KERNEL_ARCH \
     CROSS_COMPILE=$TARGET_PREFIX
 }
diff --git a/packages/linux-drivers/dvbhdhomerun/package.mk b/packages/linux-drivers/dvbhdhomerun/package.mk
index 5858e36694..074bd01416 100644
--- a/packages/linux-drivers/dvbhdhomerun/package.mk
+++ b/packages/linux-drivers/dvbhdhomerun/package.mk
@@ -45,17 +45,17 @@ pre_make_target() {
 pre_configure_target() {
 
 # use it here to be sure libhdhomerun is already built
-  PKG_CMAKE_OPTS_TARGET="-DLIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/)"
+  PKG_CMAKE_OPTS_TARGET="-DLIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/)"
 
 # absolute path
-  LIBHDHOMERUN_PATH=$(ls -d $ROOT/$BUILD/libhdhomerun-*/)
+  LIBHDHOMERUN_PATH=$(ls -d $BUILD/libhdhomerun-*/)
   sed -i "s|SET(LIBHDHOMERUN_PATH .*)|SET(LIBHDHOMERUN_PATH $LIBHDHOMERUN_PATH)|g" ../userhdhomerun/CMakeLists.txt
   sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_tuner.cpp
   sed -i "s|/etc/dvbhdhomerun|/tmp/dvbhdhomerun|g" ../userhdhomerun/hdhomerun_controller.cpp
 }
 
 makeinstall_target() {
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     mkdir -p $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun
       cp kernel/*.ko $INSTALL/usr/lib/modules/$(get_module_dir)/hdhomerun/
 
diff --git a/packages/linux-drivers/gpu-aml/package.mk b/packages/linux-drivers/gpu-aml/package.mk
index aa0abea0da..4486261657 100644
--- a/packages/linux-drivers/gpu-aml/package.mk
+++ b/packages/linux-drivers/gpu-aml/package.mk
@@ -34,12 +34,12 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 make_target() {
-  LDFLAGS="" make -C $(kernel_path) M=$ROOT/$PKG_BUILD/mali \
+  LDFLAGS="" make -C $(kernel_path) M=$PKG_BUILD/mali \
     CONFIG_MALI400=m CONFIG_MALI450=m
 }
 
 makeinstall_target() {
-  LDFLAGS="" make -C $(kernel_path) M=$ROOT/$PKG_BUILD/mali \
+  LDFLAGS="" make -C $(kernel_path) M=$PKG_BUILD/mali \
     INSTALL_MOD_PATH=$INSTALL/usr INSTALL_MOD_STRIP=1 DEPMOD=: \
   modules_install
 }
diff --git a/packages/linux-drivers/media_build/package.mk b/packages/linux-drivers/media_build/package.mk
index f1428c214e..34fd744cea 100644
--- a/packages/linux-drivers/media_build/package.mk
+++ b/packages/linux-drivers/media_build/package.mk
@@ -56,5 +56,5 @@ make_target() {
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/lib/modules/$KERNEL_VER/updates
-  find $ROOT/$PKG_BUILD/v4l/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$KERNEL_VER/updates \;
+  find $PKG_BUILD/v4l/ -name \*.ko -exec cp {} $INSTALL/usr/lib/modules/$KERNEL_VER/updates \;
 }
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/linux-firmware/intel-ucode/package.mk b/packages/linux-firmware/intel-ucode/package.mk
index 6e0d449e13..bd343f2263 100644
--- a/packages/linux-firmware/intel-ucode/package.mk
+++ b/packages/linux-firmware/intel-ucode/package.mk
@@ -31,8 +31,8 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 unpack() {
-  mkdir -p $ROOT/$PKG_BUILD
-  tar xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz -C $ROOT/$PKG_BUILD
+  mkdir -p $PKG_BUILD
+  tar xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz -C $PKG_BUILD
 }
 
 make_host() {
@@ -40,7 +40,7 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp intel-microcode2ucode $ROOT/$TOOLCHAIN/bin/
+  cp intel-microcode2ucode $TOOLCHAIN/bin/
 }
 
 make_target() {
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 063cc8d091..4a3b329285 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -93,15 +93,15 @@ post_patch() {
     KERNEL_CFG_FILE=$PKG_DIR/config/$PKG_NAME.$TARGET_ARCH.conf
   fi
 
-  sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $ROOT/$TOOLCHAIN/bin/host-gcc|" \
-         -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $ROOT/$TOOLCHAIN/bin/host-g++|" \
+  sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $TOOLCHAIN/bin/host-gcc|" \
+         -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $TOOLCHAIN/bin/host-g++|" \
          -e "s|^ARCH[[:space:]]*?=.*$|ARCH = $TARGET_KERNEL_ARCH|" \
          -e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $TARGET_PREFIX|" \
          $PKG_BUILD/Makefile
 
   cp $KERNEL_CFG_FILE $PKG_BUILD/.config
   if [ ! "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
-    sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" $PKG_BUILD/.config
+    sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$BUILD/image/initramfs.cpio\"|" $PKG_BUILD/.config
   fi
 
   # set default hostname based on $DISTRONAME
@@ -141,20 +141,20 @@ makeinstall_host() {
 pre_make_target() {
   if [ "$TARGET_ARCH" = "x86_64" ]; then
     # copy some extra firmware to linux tree
-    mkdir -p $ROOT/$PKG_BUILD/external-firmware
-      cp -a $(get_build_dir x86-firmware)/{amdgpu,amd-ucode,i915,radeon,rtl_nic} $ROOT/$PKG_BUILD/external-firmware
+    mkdir -p $PKG_BUILD/external-firmware
+      cp -a $(get_build_dir x86-firmware)/{amdgpu,amd-ucode,i915,radeon,rtl_nic} $PKG_BUILD/external-firmware
 
-    mkdir -p $ROOT/$PKG_BUILD/external-firmware/intel-ucode
-      cp -a $(get_build_dir intel-ucode)/microcode.bin $ROOT/$PKG_BUILD/external-firmware/intel-ucode
+    mkdir -p $PKG_BUILD/external-firmware/intel-ucode
+      cp -a $(get_build_dir intel-ucode)/microcode.bin $PKG_BUILD/external-firmware/intel-ucode
 
-    FW_LIST="$(find $ROOT/$PKG_BUILD/external-firmware \( -type f -o -type l \) \( -iname '*.bin' -o -iname '*.fw' \) | sed 's|.*external-firmware/||' | sort | xargs)"
-    sed -i "s|CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" $ROOT/$PKG_BUILD/.config
+    FW_LIST="$(find $PKG_BUILD/external-firmware \( -type f -o -type l \) \( -iname '*.bin' -o -iname '*.fw' \) | sed 's|.*external-firmware/||' | sort | xargs)"
+    sed -i "s|CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" $PKG_BUILD/.config
   fi
 
   make oldconfig
 
   # regdb
-  cp $(get_build_dir wireless-regdb)/db.txt $ROOT/$PKG_BUILD/net/wireless/db.txt
+  cp $(get_build_dir wireless-regdb)/db.txt $PKG_BUILD/net/wireless/db.txt
 
   if [ "$BOOTLOADER" = "u-boot" ]; then
     ( cd $ROOT
@@ -165,12 +165,12 @@ pre_make_target() {
 
 make_target() {
   LDFLAGS="" make modules
-  LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL/usr DEPMOD="$ROOT/$TOOLCHAIN/bin/depmod" modules_install
+  LDFLAGS="" make INSTALL_MOD_PATH=$INSTALL/usr DEPMOD="$TOOLCHAIN/bin/depmod" modules_install
   rm -f $INSTALL/usr/lib/modules/*/build
   rm -f $INSTALL/usr/lib/modules/*/source
 
   ( cd $ROOT
-    rm -rf $ROOT/$BUILD/initramfs
+    rm -rf $BUILD/initramfs
     $SCRIPTS/install initramfs
   )
 
@@ -183,7 +183,7 @@ make_target() {
   LDFLAGS="" make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD
 
   if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
-    LDFLAGS="" mkbootimg --kernel arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET --ramdisk $ROOT/$BUILD/image/initramfs.cpio \
+    LDFLAGS="" mkbootimg --kernel arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET --ramdisk $BUILD/image/initramfs.cpio \
       $ANDROID_BOOTIMG_OPTIONS --output arch/$TARGET_KERNEL_ARCH/boot/boot.img
     mv -f arch/$TARGET_KERNEL_ARCH/boot/boot.img arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET
   fi
diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk
index 2ab0ab4755..4491d06333 100644
--- a/packages/mediacenter/JsonSchemaBuilder/package.mk
+++ b/packages/mediacenter/JsonSchemaBuilder/package.mk
@@ -34,11 +34,7 @@ PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/JsonSchemaB
 
 PKG_CMAKE_OPTS_HOST="-Wno-dev"
 
-pre_build_host() {
-  $SCRIPTS/clean $PKG_NAME
-}
-
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp JsonSchemaBuilder $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp JsonSchemaBuilder $TOOLCHAIN/bin
 }
diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk
index 9ffb7f1463..164501ed14 100644
--- a/packages/mediacenter/LibreELEC-settings/package.mk
+++ b/packages/mediacenter/LibreELEC-settings/package.mk
@@ -48,10 +48,10 @@ post_makeinstall_target() {
 #      rm -f resources/lib/modules/bluetooth.py
 #    fi
 
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.libreelec.settings/resources/lib/ -f
+  python -Wi -t -B $TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.libreelec.settings/resources/lib/ -f
   rm -rf `find $INSTALL/usr/share/kodi/addons/service.libreelec.settings/resources/lib/ -name "*.py"`
 
-  python -Wi -t -B $ROOT/$TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.libreelec.settings/oe.py -f
+  python -Wi -t -B $TOOLCHAIN/lib/python2.7/compileall.py $INSTALL/usr/share/kodi/addons/service.libreelec.settings/oe.py -f
   rm -rf $INSTALL/usr/share/kodi/addons/service.libreelec.settings/oe.py
 }
 
diff --git a/packages/mediacenter/TexturePacker/package.mk b/packages/mediacenter/TexturePacker/package.mk
index c5dc0da48a..b7d6c4bf37 100644
--- a/packages/mediacenter/TexturePacker/package.mk
+++ b/packages/mediacenter/TexturePacker/package.mk
@@ -36,15 +36,11 @@ PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/TexturePack
 PKG_CMAKE_OPTS_HOST="-DCORE_SOURCE_DIR=$(get_build_dir $MEDIACENTER) \
                      -Wno-dev"
 
-pre_build_host() {
-  $SCRIPTS/clean $PKG_NAME
-}
-
 pre_configure_host() {
   export CXXFLAGS="$CXXFLAGS -std=c++11 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(get_build_dir $MEDIACENTER)/xbmc/linux"
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp TexturePacker $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp TexturePacker $TOOLCHAIN/bin
 }
diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
index 3ffe836d0c..376066d34c 100644
--- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk
@@ -33,10 +33,10 @@ post_makeinstall_target() {
     cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DDECRYPTERPATH=special://home/cdm \
-        $ROOT/$PKG_BUILD/wvdecrypter
+        $PKG_BUILD/wvdecrypter
     make
 
-  cp -P $ROOT/$PKG_BUILD/.$TARGET_NAME/wv/libssd_wv.so $INSTALL/usr/lib
+  cp -P $PKG_BUILD/.$TARGET_NAME/wv/libssd_wv.so $INSTALL/usr/lib
 }
 
 addon() {
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index 56c2fb83af..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
 
@@ -205,9 +205,9 @@ KODI_LIBDVD="$KODI_DVDCSS \
              -DLIBDVDNAV_URL=$ROOT/$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \
              -DLIBDVDREAD_URL=$ROOT/$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz"
 
-PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$ROOT/$TOOLCHAIN \
-                       -DWITH_TEXTUREPACKER=$ROOT/$TOOLCHAIN/bin/TexturePacker \
-                       -DDEPENDS_PATH=$ROOT/$PKG_BUILD/depends \
+PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
+                       -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \
+                       -DDEPENDS_PATH=$PKG_BUILD/depends \
                        -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/python2.7 \
                        -DGIT_VERSION=$PKG_VERSION \
                        -DENABLE_INTERNAL_FFMPEG=OFF \
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index 8390e9b7ff..95e6cf5c6b 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -82,7 +82,7 @@ if [ "$DISPLAYSERVER" = "x11" ]; then
 fi
 
 pre_configure_target() {
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
 # ffmpeg fails building for x86_64 with LTO support
@@ -128,7 +128,7 @@ configure_target() {
               --disable-doc \
               $FFMPEG_DEBUG \
               --enable-pic \
-              --pkg-config="$ROOT/$TOOLCHAIN/bin/pkg-config" \
+              --pkg-config="$TOOLCHAIN/bin/pkg-config" \
               --enable-optimizations \
               --disable-extra-warnings \
               --disable-ffprobe \
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 0fdfaa6cec..aeae0fc777 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -60,7 +60,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
 
 pre_configure_target() {
 # bluez fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 
   export LIBS="-ltermcap"
diff --git a/packages/network/libdnet/package.mk b/packages/network/libdnet/package.mk
index 0c80f790ba..709b8ac884 100644
--- a/packages/network/libdnet/package.mk
+++ b/packages/network/libdnet/package.mk
@@ -37,10 +37,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_strlcat=no \
                            --without-python"
 
 pre_configure_target() {
-  sed "s|@prefix@|$SYSROOT_PREFIX/usr|g" -i $ROOT/$PKG_BUILD/dnet-config.in
+  sed "s|@prefix@|$SYSROOT_PREFIX/usr|g" -i $PKG_BUILD/dnet-config.in
 }
 
 post_makeinstall_target() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp dnet-config $ROOT/$TOOLCHAIN/bin/
+  mkdir -p $TOOLCHAIN/bin
+    cp dnet-config $TOOLCHAIN/bin/
 }
diff --git a/packages/python/devel/distutilscross/package.mk b/packages/python/devel/distutilscross/package.mk
index f3fd752af7..6eef6ea78b 100644
--- a/packages/python/devel/distutilscross/package.mk
+++ b/packages/python/devel/distutilscross/package.mk
@@ -35,5 +35,5 @@ make_host() {
 }
 
 makeinstall_host() {
-  python setup.py install --prefix=$ROOT/$TOOLCHAIN
+  python setup.py install --prefix=$TOOLCHAIN
 }
diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk
index b0a0d347f8..354f0336ab 100644
--- a/packages/python/devel/setuptools/package.mk
+++ b/packages/python/devel/setuptools/package.mk
@@ -35,5 +35,5 @@ make_host() {
 }
 
 makeinstall_host() {
-  python setup.py install --prefix=$ROOT/$TOOLCHAIN
+  python setup.py install --prefix=$TOOLCHAIN
 }
diff --git a/packages/python/security/pycrypto/package.mk b/packages/python/security/pycrypto/package.mk
index 2ffe254299..d2cd78bbf3 100644
--- a/packages/python/security/pycrypto/package.mk
+++ b/packages/python/security/pycrypto/package.mk
@@ -35,7 +35,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
                            --without-gmp --without-mpir"
 
 pre_configure_target() {
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
   rm -rf .$TARGET_NAME
 
   export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk
index 9e1e0617b4..a6d7b965c4 100644
--- a/packages/security/libgpg-error/package.mk
+++ b/packages/security/libgpg-error/package.mk
@@ -53,7 +53,7 @@ pre_configure_target() {
       ;;
   esac
 
-  cp $ROOT/$PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TUPLE.h $ROOT/$PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TARGET.h
+  cp $PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TUPLE.h $PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TARGET.h
 }
 
 post_makeinstall_target() {
diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
index 0b2d331183..c957ba4786 100644
--- a/packages/sysutils/busybox/package.mk
+++ b/packages/sysutils/busybox/package.mk
@@ -82,17 +82,17 @@ pre_build_init() {
 }
 
 configure_host() {
-  cd $ROOT/$PKG_BUILD/.$HOST_NAME
+  cd $PKG_BUILD/.$HOST_NAME
     cp $PKG_DIR/config/busybox-host.conf .config
 
     # set install dir
-    sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$ROOT/$PKG_BUILD/.install_host\"|" .config
+    sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$PKG_BUILD/.install_host\"|" .config
 
     make oldconfig
 }
 
 configure_target() {
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME
+  cd $PKG_BUILD/.$TARGET_NAME
     cp $BUSYBOX_CFG_FILE_TARGET .config
 
     # set install dir
@@ -129,7 +129,7 @@ configure_target() {
 }
 
 configure_init() {
-  cd $ROOT/$PKG_BUILD/.$TARGET_NAME-init
+  cd $PKG_BUILD/.$TARGET_NAME-init
     cp $BUSYBOX_CFG_FILE_INIT .config
 
     # set install dir
@@ -148,8 +148,8 @@ configure_init() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp -R $ROOT/$PKG_BUILD/.install_host/bin/* $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp -R $PKG_BUILD/.install_host/bin/* $TOOLCHAIN/bin
 }
 
 makeinstall_target() {
@@ -199,7 +199,7 @@ makeinstall_target() {
 }
 
 post_install() {
-  ROOT_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw -m sha512 $ROOT_PASSWORD`"
+  ROOT_PWD="`$TOOLCHAIN/bin/cryptpw -m sha512 $ROOT_PASSWORD`"
 
   echo "chmod 4755 $INSTALL/usr/bin/busybox" >> $FAKEROOT_SCRIPT
   echo "chmod 000 $INSTALL/etc/shadow" >> $FAKEROOT_SCRIPT
diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk
index 8e7ac37ba9..1522a9a557 100644
--- a/packages/sysutils/dosfstools/package.mk
+++ b/packages/sysutils/dosfstools/package.mk
@@ -44,7 +44,7 @@ pre_build_host() {
 }
 
 make_host() {
-  cd $ROOT/$PKG_BUILD/.$HOST_NAME
+  cd $PKG_BUILD/.$HOST_NAME
   make PREFIX=/usr
 }
 
@@ -56,7 +56,7 @@ makeinstall_init() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/sbin
-    cp mkfs.fat $ROOT/$TOOLCHAIN/sbin
-    ln -sf mkfs.fat $ROOT/$TOOLCHAIN/sbin/mkfs.vfat
+  mkdir -p $TOOLCHAIN/sbin
+    cp mkfs.fat $TOOLCHAIN/sbin
+    ln -sf mkfs.fat $TOOLCHAIN/sbin/mkfs.vfat
 }
diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk
index 2555b3eb2b..0c69c34779 100644
--- a/packages/sysutils/e2fsprogs/package.mk
+++ b/packages/sysutils/e2fsprogs/package.mk
@@ -114,6 +114,6 @@ makeinstall_host() {
   rm -fr $(pwd)/.install/bin
   rm -fr $(pwd)/.install/usr/share
 
-  cp -fPa $(pwd)/.install/usr/* $ROOT/$TOOLCHAIN
+  cp -fPa $(pwd)/.install/usr/* $TOOLCHAIN
 }
 
diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk
index 2bd0b9aacd..2199709252 100644
--- a/packages/sysutils/kmod/package.mk
+++ b/packages/sysutils/kmod/package.mk
@@ -53,7 +53,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-tools \
                            --without-zlib"
 
 post_makeinstall_host() {
-  ln -sf kmod $ROOT/$TOOLCHAIN/bin/depmod
+  ln -sf kmod $TOOLCHAIN/bin/depmod
 }
 
 post_makeinstall_target() {
diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk
index 68ea8d239e..be2917e0d1 100644
--- a/packages/sysutils/lirc/package.mk
+++ b/packages/sysutils/lirc/package.mk
@@ -40,7 +40,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_forkpty=no \
 pre_configure_target() {
   # patch lirc-make-devinput to use target kernel include
   sed -e "s|/usr/include/linux/|${SYSROOT_PREFIX}/usr/include/linux/|g" \
-      -i ${ROOT}/${PKG_BUILD}/tools/lirc-make-devinput
+      -i $PKG_BUILD/tools/lirc-make-devinput
 }
 
 post_makeinstall_target() {
diff --git a/packages/sysutils/open-iscsi/package.mk b/packages/sysutils/open-iscsi/package.mk
index fc3c7c0ed1..4f3823bfd3 100644
--- a/packages/sysutils/open-iscsi/package.mk
+++ b/packages/sysutils/open-iscsi/package.mk
@@ -47,5 +47,5 @@ configure_init() {
 
 makeinstall_init() {
   mkdir -p $INSTALL/usr/sbin
-    cp -P $ROOT/$PKG_BUILD/usr/iscsistart $INSTALL/usr/sbin
+    cp -P $PKG_BUILD/usr/iscsistart $INSTALL/usr/sbin
 }
diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk
index 6923dc59ee..a4d40c7ed8 100644
--- a/packages/sysutils/open-vm-tools/package.mk
+++ b/packages/sysutils/open-vm-tools/package.mk
@@ -49,8 +49,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \
 post_unpack() {
   mv $PKG_BUILD/$PKG_NAME/* $PKG_BUILD/
 
-  sed -i -e 's|.*common-agent/etc/config/Makefile.*||' $ROOT/$PKG_BUILD/configure.ac
-  mkdir -p $ROOT/$PKG_BUILD/common-agent/etc/config
+  sed -i -e 's|.*common-agent/etc/config/Makefile.*||' $PKG_BUILD/configure.ac
+  mkdir -p $PKG_BUILD/common-agent/etc/config
 }
 
 pre_configure_target() {
diff --git a/packages/sysutils/squashfs/package.mk b/packages/sysutils/squashfs/package.mk
index be9b0e4ae9..eaccaf41c4 100644
--- a/packages/sysutils/squashfs/package.mk
+++ b/packages/sysutils/squashfs/package.mk
@@ -34,10 +34,10 @@ PKG_AUTORECONF="no"
 make_host() {
   make -C squashfs-tools mksquashfs \
        XZ_SUPPORT=1 LZO_SUPPORT=1 \
-       INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include"
+       INCLUDEDIR="-I. -I$TOOLCHAIN/include"
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp squashfs-tools/mksquashfs $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
+    cp squashfs-tools/mksquashfs $TOOLCHAIN/bin
 }
diff --git a/packages/sysutils/v86d/package.mk b/packages/sysutils/v86d/package.mk
index b3c43d3422..f7e4310354 100644
--- a/packages/sysutils/v86d/package.mk
+++ b/packages/sysutils/v86d/package.mk
@@ -34,7 +34,7 @@ INIT_CONFIGURE_OPTS="--with-x86emu"
 
 pre_configure_init() {
 # v86d fails to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME-init
 }
 
diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk
index 898d6de192..733f957567 100644
--- a/packages/textproc/jsoncpp/package.mk
+++ b/packages/textproc/jsoncpp/package.mk
@@ -35,5 +35,5 @@ pre_configure_target() {
 }
 
 pre_build_target() {
-  cp $PKG_DIR/config/CMakeLists.txt $ROOT/$PKG_BUILD
+  cp $PKG_DIR/config/CMakeLists.txt $PKG_BUILD
 }
diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk
index e8fb790c78..f4b55e0556 100644
--- a/packages/textproc/libxml2/package.mk
+++ b/packages/textproc/libxml2/package.mk
@@ -37,10 +37,10 @@ PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \
              --disable-silent-rules \
              --enable-ipv6 \
              --without-python \
-             --with-zlib=$ROOT/$TOOLCHAIN \
+             --with-zlib=$TOOLCHAIN \
              --without-lzma"
 
-PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$ROOT/$TOOLCHAIN"
+PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$TOOLCHAIN"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$SYSROOT_PREFIX/usr --with-sysroot=$SYSROOT_PREFIX"
 
diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk
index b4267870ea..31da029398 100644
--- a/packages/textproc/libxslt/package.mk
+++ b/packages/textproc/libxslt/package.mk
@@ -35,7 +35,7 @@ PKG_CONFIGURE_OPTS_HOST="  ac_cv_header_ansidecl_h=no \
                            --enable-static \
                            --disable-shared \
                            --without-python \
-                           --with-libxml-prefix=$ROOT/$TOOLCHAIN \
+                           --with-libxml-prefix=$TOOLCHAIN \
                            --without-crypto"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \
diff --git a/packages/textproc/xmlstarlet/package.mk b/packages/textproc/xmlstarlet/package.mk
index b77f2881a3..0a11d2b3c3 100644
--- a/packages/textproc/xmlstarlet/package.mk
+++ b/packages/textproc/xmlstarlet/package.mk
@@ -34,12 +34,12 @@ PKG_AUTORECONF="no"
 PKG_CONFIGURE_OPTS_HOST="  ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
                            --enable-static-libs \
-                           LIBXML_CONFIG=$ROOT/$TOOLCHAIN/bin/xml2-config \
-                           LIBXSLT_CONFIG=$ROOT/$TOOLCHAIN/bin/xslt-config \
-                           --with-libxml-include-prefix=$ROOT/$TOOLCHAIN/include/libxml2 \
-                           --with-libxml-libs-prefix=$ROOT/$TOOLCHAIN/lib \
-                           --with-libxslt-include-prefix=$ROOT/$TOOLCHAIN/include \
-                           --with-libxslt-libs-prefix=$ROOT/$TOOLCHAIN/lib"
+                           LIBXML_CONFIG=$TOOLCHAIN/bin/xml2-config \
+                           LIBXSLT_CONFIG=$TOOLCHAIN/bin/xslt-config \
+                           --with-libxml-include-prefix=$TOOLCHAIN/include/libxml2 \
+                           --with-libxml-libs-prefix=$TOOLCHAIN/lib \
+                           --with-libxslt-include-prefix=$TOOLCHAIN/include \
+                           --with-libxslt-libs-prefix=$TOOLCHAIN/lib"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes \
@@ -52,7 +52,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            --with-libxslt-libs-prefix=$SYSROOT_PREFIX/usr/lib"
 
 post_makeinstall_host() {
-  ln -sf xml $ROOT/$TOOLCHAIN/bin/xmlstarlet
+  ln -sf xml $TOOLCHAIN/bin/xmlstarlet
 }
 
 post_makeinstall_target() {
diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk
index 0b2ddf7d2e..aead5f6cb4 100644
--- a/packages/tools/dtc/package.mk
+++ b/packages/tools/dtc/package.mk
@@ -33,5 +33,5 @@ PKG_MAKE_OPTS_TARGET="dtc"
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/bin
-    cp -P $ROOT/$PKG_BUILD/dtc $INSTALL/usr/bin
+    cp -P $PKG_BUILD/dtc $INSTALL/usr/bin
 }
diff --git a/packages/tools/hdparm/package.mk b/packages/tools/hdparm/package.mk
index ee6c78523d..4db0716ffd 100644
--- a/packages/tools/hdparm/package.mk
+++ b/packages/tools/hdparm/package.mk
@@ -32,5 +32,5 @@ PKG_AUTORECONF="no"
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/sbin
-    cp -a $ROOT/$PKG_BUILD/hdparm $INSTALL/usr/sbin
+    cp -a $PKG_BUILD/hdparm $INSTALL/usr/sbin
 }
diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk
index c5a40d5e53..e680fb9320 100644
--- a/packages/tools/mkbootimg/package.mk
+++ b/packages/tools/mkbootimg/package.mk
@@ -32,5 +32,5 @@ PKG_AUTORECONF="no"
 
 makeinstall_host() {
   mkdir -p $SYSROOT_PREFIX/usr/include
-  cp mkbootimg $ROOT/$TOOLCHAIN/bin/
+  cp mkbootimg $TOOLCHAIN/bin/
 }
diff --git a/packages/tools/newt/package.mk b/packages/tools/newt/package.mk
index 7ae9218e26..26b6128d94 100644
--- a/packages/tools/newt/package.mk
+++ b/packages/tools/newt/package.mk
@@ -36,13 +36,13 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
 
 pre_configure_target() {
  # newt fails to build in subdirs
- cd $ROOT/$PKG_BUILD
+ cd $PKG_BUILD
  rm -rf .$TARGET_NAME
 }
 
 pre_configure_host() {
  # newt fails to build in subdirs
- cd $ROOT/$PKG_BUILD
+ cd $PKG_BUILD
  rm -rf .$HOST_NAME
 }
 
diff --git a/packages/tools/plymouth-lite/package.mk b/packages/tools/plymouth-lite/package.mk
index 293fd0147e..1217ee4b5a 100644
--- a/packages/tools/plymouth-lite/package.mk
+++ b/packages/tools/plymouth-lite/package.mk
@@ -36,7 +36,7 @@ fi
 
 pre_configure_init() {
   # plymouth-lite dont support to build in subdirs
-  cd $ROOT/$PKG_BUILD
+  cd $PKG_BUILD
     rm -rf .$TARGET_NAME-init
 }
 
diff --git a/packages/tools/populatefs/package.mk b/packages/tools/populatefs/package.mk
index aeb542417d..9cddfd0fdf 100644
--- a/packages/tools/populatefs/package.mk
+++ b/packages/tools/populatefs/package.mk
@@ -36,6 +36,6 @@ make_host() {
 makeinstall_host() {
   $STRIP src/populatefs
 
-  mkdir -p $ROOT/$TOOLCHAIN/sbin
-  cp src/populatefs $ROOT/$TOOLCHAIN/sbin
+  mkdir -p $TOOLCHAIN/sbin
+  cp src/populatefs $TOOLCHAIN/sbin
 }
diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk
index e0605402a9..d8a8a45cda 100644
--- a/packages/tools/procps-ng/package.mk
+++ b/packages/tools/procps-ng/package.mk
@@ -36,5 +36,5 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/bin
-    cp -P $ROOT/$PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin
+    cp -P $PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin
 }
diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk
index a3989769e5..052bb33f28 100644
--- a/packages/tools/qemu/package.mk
+++ b/packages/tools/qemu/package.mk
@@ -30,14 +30,14 @@ PKG_LONGDESC="QEMU is a generic and open source machine emulator and virtualizer
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
-HOST_CONFIGURE_OPTS="--prefix=$ROOT/$TOOLCHAIN \
-  --bindir=$ROOT/$TOOLCHAIN/bin \
-  --sbindir=$ROOT/$TOOLCHAIN/sbin \
-  --sysconfdir=$ROOT/$TOOLCHAIN/etc \
-  --libexecdir=$ROOT/$TOOLCHAIN/lib \
-  --localstatedir=$ROOT/$TOOLCHAIN/var \
-  --extra-cflags=-I$ROOT/$TOOLCHAIN/include \
-  --extra-ldflags=-L$ROOT/$TOOLCHAIN/lib \
+HOST_CONFIGURE_OPTS="--prefix=$TOOLCHAIN \
+  --bindir=$TOOLCHAIN/bin \
+  --sbindir=$TOOLCHAIN/sbin \
+  --sysconfdir=$TOOLCHAIN/etc \
+  --libexecdir=$TOOLCHAIN/lib \
+  --localstatedir=$TOOLCHAIN/var \
+  --extra-cflags=-I$TOOLCHAIN/include \
+  --extra-ldflags=-L$TOOLCHAIN/lib \
   --static \
   --disable-vnc \
   --disable-werror \
diff --git a/packages/tools/syslinux/package.mk b/packages/tools/syslinux/package.mk
index 668ffd02cb..0538bed5ee 100644
--- a/packages/tools/syslinux/package.mk
+++ b/packages/tools/syslinux/package.mk
@@ -61,22 +61,22 @@ make_host() {
   make CC=$CC \
        AR=$AR \
        RANLIB=$RANLIB \
-       CFLAGS="-I$ROOT/$TOOLCHAIN/include -I$ROOT/$PKG_BUILD/libinstaller -I$ROOT/$PKG_BUILD/libfat -I$ROOT/$PKG_BUILD/bios -I$ROOT/$PKG_BUILD/utils -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \
-       LDFLAGS="-L$ROOT/$TOOLCHAIN/lib" \
+       CFLAGS="-I$TOOLCHAIN/include -I$PKG_BUILD/libinstaller -I$PKG_BUILD/libfat -I$PKG_BUILD/bios -I$PKG_BUILD/utils -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \
+       LDFLAGS="-L$TOOLCHAIN/lib" \
        installer
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp bios/extlinux/extlinux $ROOT/$TOOLCHAIN/bin
-    cp bios/linux/syslinux $ROOT/$TOOLCHAIN/bin
-    cp bios/mtools/syslinux $ROOT/$TOOLCHAIN/bin/syslinux.mtools
+  mkdir -p $TOOLCHAIN/bin
+    cp bios/extlinux/extlinux $TOOLCHAIN/bin
+    cp bios/linux/syslinux $TOOLCHAIN/bin
+    cp bios/mtools/syslinux $TOOLCHAIN/bin/syslinux.mtools
 
-  mkdir -p $ROOT/$TOOLCHAIN/share/syslinux
-    cp bios/mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux
-    cp bios/mbr/gptmbr.bin $ROOT/$TOOLCHAIN/share/syslinux
-    cp efi64/efi/syslinux.efi $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi
-    cp efi64/com32/elflink/ldlinux/ldlinux.e64  $ROOT/$TOOLCHAIN/share/syslinux
+  mkdir -p $TOOLCHAIN/share/syslinux
+    cp bios/mbr/mbr.bin $TOOLCHAIN/share/syslinux
+    cp bios/mbr/gptmbr.bin $TOOLCHAIN/share/syslinux
+    cp efi64/efi/syslinux.efi $TOOLCHAIN/share/syslinux/bootx64.efi
+    cp efi64/com32/elflink/ldlinux/ldlinux.e64  $TOOLCHAIN/share/syslinux
 }
 
 makeinstall_target() {
diff --git a/packages/tools/u-boot-v2/package.mk b/packages/tools/u-boot-v2/package.mk
index b4f916b6bb..1f4d88b5ca 100644
--- a/packages/tools/u-boot-v2/package.mk
+++ b/packages/tools/u-boot-v2/package.mk
@@ -84,9 +84,9 @@ make_target() {
 makeinstall_target() {
   mkdir -p $INSTALL/usr/share/bootloader
 
-  cp $ROOT/$PKG_BUILD/u-boot-*.imx $INSTALL/usr/share/bootloader 2>/dev/null || : #
-  cp $ROOT/$PKG_BUILD/u-boot-*.img $INSTALL/usr/share/bootloader 2>/dev/null || : #
-  cp $ROOT/$PKG_BUILD/SPL-* $INSTALL/usr/share/bootloader 2>/dev/null || : #
+  cp $PKG_BUILD/u-boot-*.imx $INSTALL/usr/share/bootloader 2>/dev/null || : #
+  cp $PKG_BUILD/u-boot-*.img $INSTALL/usr/share/bootloader 2>/dev/null || : #
+  cp $PKG_BUILD/SPL-* $INSTALL/usr/share/bootloader 2>/dev/null || : #
 }
 
 pre_install() {
diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index c67ec694f6..c635c87f2c 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -71,7 +71,7 @@ make_target() {
 
   for UBOOT_TARGET in $UBOOT_CONFIG; do
     if [ "$PROJECT" = "Odroid_C2" ]; then
-      export PATH=$ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/:$ROOT/$TOOLCHAIN/lib/gcc-linaro-arm-eabi/bin/:$PATH
+      export PATH=$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/:$TOOLCHAIN/lib/gcc-linaro-arm-eabi/bin/:$PATH
       CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make mrproper
       CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make $UBOOT_TARGET
       CROSS_COMPILE=aarch64-elf- ARCH=arm CFLAGS="" LDFLAGS="" make HOSTCC="$HOST_CC" HOSTSTRIP="true"
@@ -101,11 +101,11 @@ make_target() {
 }
 
 makeinstall_target() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
     if [ -f build/tools/mkimage ]; then
-      cp build/tools/mkimage $ROOT/$TOOLCHAIN/bin
+      cp build/tools/mkimage $TOOLCHAIN/bin
     else
-      cp tools/mkimage $ROOT/$TOOLCHAIN/bin
+      cp tools/mkimage $TOOLCHAIN/bin
     fi
 
   BOOT_CFG="$PROJECT_DIR/$PROJECT/bootloader/boot.cfg"
@@ -122,18 +122,18 @@ makeinstall_target() {
 
   mkdir -p $INSTALL/usr/share/bootloader
 
-  cp $ROOT/$PKG_BUILD/u-boot*.imx $INSTALL/usr/share/bootloader 2>/dev/null || :
-  cp $ROOT/$PKG_BUILD/u-boot*.img $INSTALL/usr/share/bootloader 2>/dev/null || :
-  cp $ROOT/$PKG_BUILD/SPL* $INSTALL/usr/share/bootloader 2>/dev/null || :
+  cp $PKG_BUILD/u-boot*.imx $INSTALL/usr/share/bootloader 2>/dev/null || :
+  cp $PKG_BUILD/u-boot*.img $INSTALL/usr/share/bootloader 2>/dev/null || :
+  cp $PKG_BUILD/SPL* $INSTALL/usr/share/bootloader 2>/dev/null || :
 
-  cp $ROOT/$PKG_BUILD/$UBOOT_CONFIGFILE $INSTALL/usr/share/bootloader 2>/dev/null || :
+  cp $PKG_BUILD/$UBOOT_CONFIGFILE $INSTALL/usr/share/bootloader 2>/dev/null || :
 
   cp -PR $PROJECT_DIR/$PROJECT/bootloader/uEnv*.txt $INSTALL/usr/share/bootloader 2>/dev/null || :
 
   case $PROJECT in
     Odroid_C2)
       cp -PRv $PKG_DIR/scripts/update-c2.sh $INSTALL/usr/share/bootloader/update.sh
-      cp -PRv $ROOT/$PKG_BUILD/u-boot.bin $INSTALL/usr/share/bootloader/u-boot
+      cp -PRv $PKG_BUILD/u-boot.bin $INSTALL/usr/share/bootloader/u-boot
       if [ -f $PROJECT_DIR/$PROJECT/splash/boot-logo.bmp.gz ]; then
         cp -PRv $PROJECT_DIR/$PROJECT/splash/boot-logo.bmp.gz $INSTALL/usr/share/bootloader
       elif [ -f $DISTRO_DIR/$DISTRO/splash/boot-logo.bmp.gz ]; then
diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk
index 0c21931032..67c7a61f41 100644
--- a/packages/virtual/initramfs/package.mk
+++ b/packages/virtual/initramfs/package.mk
@@ -41,19 +41,19 @@ if [ "$INITRAMFS_PARTED_SUPPORT" = yes ]; then
 fi
 
 post_install() {
-  ( cd $ROOT/$BUILD/initramfs
+  ( cd $BUILD/initramfs
     if [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "powerpc64" ]; then
-      ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib64
-      mkdir -p $ROOT/$BUILD/initramfs/usr
-      ln -sf /usr/lib $ROOT/$BUILD/initramfs/usr/lib64
+      ln -sf /usr/lib $BUILD/initramfs/lib64
+      mkdir -p $BUILD/initramfs/usr
+      ln -sf /usr/lib $BUILD/initramfs/usr/lib64
     fi
 
-    ln -sf /usr/lib $ROOT/$BUILD/initramfs/lib
-    ln -sf /usr/bin $ROOT/$BUILD/initramfs/bin
-    ln -sf /usr/sbin $ROOT/$BUILD/initramfs/sbin
+    ln -sf /usr/lib $BUILD/initramfs/lib
+    ln -sf /usr/bin $BUILD/initramfs/bin
+    ln -sf /usr/sbin $BUILD/initramfs/sbin
 
-    mkdir -p $ROOT/$BUILD/image/
+    mkdir -p $BUILD/image/
     fakeroot -- sh -c \
-      "mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > $ROOT/$BUILD/image/initramfs.cpio"
+      "mkdir -p dev; mknod -m 600 dev/console c 5 1; find . | cpio -H newc -ov -R 0:0 > $BUILD/image/initramfs.cpio"
   )
 }
diff --git a/packages/x11/driver/xf86-input-libinput/package.mk b/packages/x11/driver/xf86-input-libinput/package.mk
index 3b79ffcffb..991441de80 100644
--- a/packages/x11/driver/xf86-input-libinput/package.mk
+++ b/packages/x11/driver/xf86-input-libinput/package.mk
@@ -34,5 +34,5 @@ PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=$XORG_PATH_MODULES"
 
 post_makeinstall_target() {
   mkdir -p $INSTALL/usr/share/X11/xorg.conf.d
-    cp $ROOT/$PKG_BUILD/conf/*-libinput.conf $INSTALL/usr/share/X11/xorg.conf.d
+    cp $PKG_BUILD/conf/*-libinput.conf $INSTALL/usr/share/X11/xorg.conf.d
 }
diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk
index dd59f214ff..73909181ed 100644
--- a/packages/x11/other/fontconfig/package.mk
+++ b/packages/x11/other/fontconfig/package.mk
@@ -41,8 +41,8 @@ pre_configure_target() {
 # ensure we dont use '-O3' optimization.
   CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|"`
   CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-O3|-O2|"`
-  CFLAGS="$CFLAGS -I$ROOT/$PKG_BUILD"
-  CXXFLAGS="$CXXFLAGS -I$ROOT/$PKG_BUILD"
+  CFLAGS="$CFLAGS -I$PKG_BUILD"
+  CXXFLAGS="$CXXFLAGS -I$PKG_BUILD"
 }
 
 post_makeinstall_target() {
diff --git a/scripts/build b/scripts/build
index 37f3b4e9ac..ae818a63e6 100755
--- a/scripts/build
+++ b/scripts/build
@@ -140,17 +140,17 @@ if [ ! -f $STAMP ]; then
   # configure HOST build defaults
     HOST_CONFIGURE_OPTS="--host=$HOST_NAME \
                          --build=$HOST_NAME \
-                         --prefix=$ROOT/$TOOLCHAIN \
-                         --bindir=$ROOT/$TOOLCHAIN/bin \
-                         --sbindir=$ROOT/$TOOLCHAIN/sbin \
-                         --sysconfdir=$ROOT/$TOOLCHAIN/etc \
-                         --libexecdir=$ROOT/$TOOLCHAIN/lib \
-                         --localstatedir=$ROOT/$TOOLCHAIN/var \
+                         --prefix=$TOOLCHAIN \
+                         --bindir=$TOOLCHAIN/bin \
+                         --sbindir=$TOOLCHAIN/sbin \
+                         --sysconfdir=$TOOLCHAIN/etc \
+                         --libexecdir=$TOOLCHAIN/lib \
+                         --localstatedir=$TOOLCHAIN/var \
                          --disable-static \
                          --enable-shared"
 
     HOST_CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
-                     -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN \
+                     -DCMAKE_INSTALL_PREFIX=$TOOLCHAIN \
                      -DCMAKE_BUILD_TYPE=Release"
 
   # configure INIT build defaults
@@ -194,9 +194,9 @@ if [ ! -f $STAMP ]; then
 
       # configure other variables
       if [ "$TARGET" = "target" ]; then
-        INSTALL=$ROOT/$PKG_BUILD/.install_pkg
+        INSTALL=$PKG_BUILD/.install_pkg
       elif [ "$TARGET" = "init" ]; then
-        INSTALL=$ROOT/$PKG_BUILD/.install_init
+        INSTALL=$PKG_BUILD/.install_init
       fi
 
        # clean up
@@ -208,12 +208,12 @@ if [ ! -f $STAMP ]; then
 
       # setup configure script
       if [ -z "$PKG_CONFIGURE_SCRIPT" ]; then
-        PKG_CONFIGURE_SCRIPT="$ROOT/$PKG_BUILD/configure"
+        PKG_CONFIGURE_SCRIPT="$PKG_BUILD/configure"
       else
-        PKG_CONFIGURE_SCRIPT="$ROOT/$PKG_BUILD/$PKG_CONFIGURE_SCRIPT"
+        PKG_CONFIGURE_SCRIPT="$PKG_BUILD/$PKG_CONFIGURE_SCRIPT"
       fi
       if [ -z "$PKG_CMAKE_SCRIPT" ]; then
-        PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/CMakeLists.txt"
+        PKG_CMAKE_SCRIPT="$PKG_BUILD/CMakeLists.txt"
       fi
 
       # include build template and build
@@ -388,7 +388,6 @@ if [ ! -f $STAMP ]; then
 
     PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
     for i in PKG_NAME PKG_DEEPMD5; do
-      eval val=\$$i
-      echo "STAMP_$i=\"$val\"" >> $STAMP
+      echo "STAMP_$i=\"${!i}\"" >> $STAMP
     done
 fi
diff --git a/scripts/clean b/scripts/clean
index ac72cf1752..2673b0b7f3 100755
--- a/scripts/clean
+++ b/scripts/clean
@@ -29,6 +29,7 @@ clean_package() {
     return
   fi
 
+  # Use a wilcard here to remove all versions of the package
   for i in $BUILD/$1-*; do
     if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then
       . "$i/.libreelec-unpack"
diff --git a/scripts/create_addon b/scripts/create_addon
index eac3bb590d..23270a1f92 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -158,6 +158,8 @@ pack_addon() {
 }
 
 if [ "$PKG_IS_ADDON" = "yes" ] ; then
+  setup_toolchain $TARGET
+
   $SCRIPTS/build $@
 
   printf  "%${BUILD_INDENT}c CREATE ADDON  ($PROJECT/$TARGET_ARCH) $1\n" ' '>&$SILENT_OUT
@@ -167,6 +169,7 @@ if [ "$PKG_IS_ADDON" = "yes" ] ; then
 
   if [ "$(type -t addon)" = "function" ]; then
     addon
+    debug_strip $ADDON_BUILD/$PKG_ADDON_ID
   else
     echo "*** unsupported package format. please convert your package ***"
     exit 1
diff --git a/scripts/extract b/scripts/extract
index c6712862dd..006c179c08 100755
--- a/scripts/extract
+++ b/scripts/extract
@@ -32,8 +32,8 @@ case $PKG_SOURCE_NAME in
   $2)
     f="$SOURCES/$1/$PKG_SOURCE_NAME"
     if [ ! -f $f ]; then
-      echo "error: File $PKG_SOURCE_NAME doesn't exists in package $1 sources directory"
-      echo "have you called scripts/extract before scripts/get ?"
+      echo "error: File $PKG_SOURCE_NAME doesn't exist in package $1 sources directory"
+      echo "Have you called scripts/extract before scripts/get ?"
       exit 1
     fi
     case $PKG_SOURCE_NAME in
diff --git a/scripts/get b/scripts/get
index de2e0123d0..5bd51b1cff 100755
--- a/scripts/get
+++ b/scripts/get
@@ -1,25 +1,34 @@
 #!/bin/bash
 
 ################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
 #
-#  OpenELEC is free software: you can redistribute it and/or modify
+#  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 2 of the License, or
 #  (at your option) any later version.
 #
-#  OpenELEC is distributed in the hope that it will be useful,
+#  LibreELEC is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
 . config/options $1
 
+_get_file_already_downloaded() {
+  if [ -f $PACKAGE ]; then
+    if [ "$(cat $STAMP_URL 2>/dev/null)" == "${PKG_URL}" ]; then
+      [ -z "${PKG_SHA256}" -o "$(cat $STAMP_SHA 2>/dev/null)" == "${PKG_SHA256}" ] && return 0
+    fi
+  fi
+  return 1
+}
+
 if [ -z "$1" ]; then
   for i in `find packages/ -type f -name package.mk`; do
     GET_PKG=`grep ^PKG_NAME= $i | sed -e "s,\",,g" -e "s,PKG_NAME=,,"`
@@ -27,52 +36,62 @@ if [ -z "$1" ]; then
   done
 fi
 
-if [ -n "$PKG_URL" -a -n "$PKG_SOURCE_NAME" ]; then
-  mkdir -p $SOURCES/$1
+[ -z "$PKG_URL" -o -z "$PKG_SOURCE_NAME" ] && exit 0
 
-  # Avoid concurrent downloads of the same package
-  _isblocked=N
-  exec 99<$SOURCES/$1
-  while ! flock --nonblock --exclusive 99; do
-    [ ${_isblocked} == N ] && { echo "Project ${PROJECT} waiting to avoid concurrent download of ${1}..."; _isblocked=Y; }
-    sleep 1
-  done
+mkdir -p $SOURCES/$1
 
-  PACKAGE="$SOURCES/$1/$PKG_SOURCE_NAME"
-  PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$PKG_SOURCE_NAME"
-  [ "$VERBOSE" != "yes" ] && WGET_OPT=-q
-  WGET_CMD="wget --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c $WGET_OPT -O $SOURCES/$1/$PKG_SOURCE_NAME"
+PACKAGE="$SOURCES/$1/$PKG_SOURCE_NAME"
+PACKAGE_MIRROR="$DISTRO_MIRROR/$PKG_NAME/$PKG_SOURCE_NAME"
+[ "$VERBOSE" != "yes" ] && WGET_OPT=-q
+WGET_CMD="wget --timeout=30 --tries=3 --passive-ftp --no-check-certificate -c $WGET_OPT -O $PACKAGE"
 
-  NBWGET="1"
+STAMP_URL="$PACKAGE.url"
+STAMP_SHA="$PACKAGE.sha256"
 
-  STAMP="$PACKAGE.url"
-  MD5SUM="$PACKAGE.md5"
+# Latest file already present, exit now...
+_get_file_already_downloaded $1 && exit 0
 
-  DL="yes"
-  if [ -f "$STAMP" ]; then
-    [ "`cat $STAMP`" == "$PKG_URL" ] && DL="no"
+# Avoid concurrent downloads of the same package
+_isblocked=N
+exec 99<$SOURCES/$1
+while ! flock --nonblock --exclusive 99; do
+  [ ${_isblocked} == N ] && { echo "Project/Device ${DEVICE:-${PROJECT}} waiting, to avoid concurrent download of ${1}..."; _isblocked=Y; }
+  sleep 1
+done
+
+# Check again in case of concurrent access - if nothing needs to be downloaded, exit now...
+_get_file_already_downloaded $1 && exit 0
+
+# At this point, we need to download something...
+printf "%${BUILD_INDENT}c ${boldcyan}GET${endcolor}      $1\n" ' '>&$SILENT_OUT
+export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
+
+# unset LD_LIBRARY_PATH to stop wget from using toolchain/lib and loading libssl.so/libcrypto.so instead of host libraries
+unset LD_LIBRARY_PATH
+
+rm -f $STAMP_URL $STAMP_SHA
+
+NBWGET=10
+while [ $NBWGET -gt 0 ]; do
+  rm -f $PACKAGE
+
+  if $WGET_CMD "$PKG_URL" || $WGET_CMD "$PACKAGE_MIRROR"; then
+    CALC_SHA256="$(sha256sum $PACKAGE | cut -d" " -f1)"
+
+    [ -z "${PKG_SHA256}" -o "${PKG_SHA256}" == "${CALC_SHA256}" ] && break
+
+    printf "${boldred}WARNING${endcolor} Incorrect checksum calculated on downloaded file: got ${CALC_SHA256}, wanted ${PKG_SHA256}\n\n"
   fi
+  NBWGET=$((NBWGET - 1))
+done
 
-  if [ "$DL" == "yes" ]; then
-    rm -f $STAMP
-
-    printf "%${BUILD_INDENT}c ${boldcyan}GET${endcolor}      $1\n" ' '>&$SILENT_OUT
-    export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
-
-    until [ -f "$STAMP" ] || $WGET_CMD $PKG_URL || $WGET_CMD $PACKAGE_MIRROR; do
-      NBWGET=$(($NBWGET+1))
-      if [ "$NBWGET" -gt "10" ]; then
-        echo -e "\nCant't get $1 sources : $PKG_URL\n Try later !!"
-        exit 1
-      fi
-    done
-
-    echo $PKG_URL > $STAMP
-    md5sum -t $PACKAGE > $MD5SUM
-
-    rm -f $BUILD_BASE*/$STAMPS_NOARCH/$1/unpack
-    rm -f $BUILD_BASE*/$STAMPS_NOARCH/$1/build
-  fi
+if [ $NBWGET -eq 0 ]; then
+  echo -e "\nCant't get $1 sources : $PKG_URL\n Try later !!"
+  exit 1
+else
+  printf "${boldgreen}INFO${endcolor} Calculated checksum is: ${CALC_SHA256}\n\n"
+  echo "${PKG_URL}" > $STAMP_URL
+  echo "${CALC_SHA256}" > $STAMP_SHA
 fi
 
 exit 0
diff --git a/scripts/image b/scripts/image
index 693a07d8ef..62e170a0fb 100755
--- a/scripts/image
+++ b/scripts/image
@@ -229,7 +229,7 @@ fi
 MODVER=$(basename $(ls -d $INSTALL/usr/lib/modules/*))
 find $INSTALL/usr/lib/modules/$MODVER/ -name *.ko | \
   sed -e "s,$INSTALL/usr/lib/modules/$MODVER/,," > $INSTALL/usr/lib/modules/$MODVER/modules.order
-$ROOT/$TOOLCHAIN/bin/depmod -b $INSTALL/usr $MODVER 2> /dev/null
+$TOOLCHAIN/bin/depmod -b $INSTALL/usr -a -e -F "$BUILD/linux-$(kernel_version)/System.map" $MODVER
 
 # strip kernel modules
 for MOD in `find $INSTALL/usr/lib/modules/ -type f -name *.ko`; do
@@ -250,10 +250,10 @@ if [ -z "$SQUASHFS_COMPRESSION" ]; then
 fi
 
 echo "rm -rf \"$TARGET_IMG/$IMAGE_NAME.system\"" >> $FAKEROOT_SCRIPT
-echo "$ROOT/$TOOLCHAIN/bin/mksquashfs \"$BUILD/image/system\" \"$TARGET_IMG/$IMAGE_NAME.system\" -noappend -comp $SQUASHFS_COMPRESSION" >> $FAKEROOT_SCRIPT
+echo "$TOOLCHAIN/bin/mksquashfs \"$BUILD/image/system\" \"$TARGET_IMG/$IMAGE_NAME.system\" -noappend -comp $SQUASHFS_COMPRESSION" >> $FAKEROOT_SCRIPT
 
 # run fakeroot
-$ROOT/$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT
+$TOOLCHAIN/bin/fakeroot -- $FAKEROOT_SCRIPT
 rm -rf $FAKEROOT_SCRIPT
 
 # set permissions
@@ -423,8 +423,8 @@ if [ "$1" = "release" -o "$1" = "mkimage" -o "$1" = "amlpkg" -o "$1" = "noobs" ]
     fi
 
     # copy device tree image if any
-    if [ -f "$ROOT/$INSTALL/usr/share/bootloader/dtb.img" ]; then
-      cp "$ROOT/$INSTALL/usr/share/bootloader/dtb.img" .
+    if [ -f "$INSTALL/usr/share/bootloader/dtb.img" ]; then
+      cp "$INSTALL/usr/share/bootloader/dtb.img" .
     fi
 
     zip -q $TARGET_IMG/$IMAGE_NAME.zip *
diff --git a/scripts/mkimage b/scripts/mkimage
index 06f1485792..8ba9595592 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -97,7 +97,7 @@ trap cleanup SIGINT
 if [ "$BOOTLOADER" = "syslinux" ]; then
   # write mbr
     echo "image: writing mbr..."
-    MBR="$ROOT/$TOOLCHAIN/share/syslinux/gptmbr.bin"
+    MBR="$TOOLCHAIN/share/syslinux/gptmbr.bin"
     if [ -n "$MBR" ]; then
       dd bs=440 count=1 conv=fsync,notrunc if="$MBR" of="$DISK" >"$SAVE_ERROR" 2>&1 || show_error
     fi
@@ -170,8 +170,8 @@ EOF
     mcopy $RELEASE_DIR/target/SYSTEM.md5 ::/SYSTEM.md5
 
     mmd EFI EFI/BOOT
-    mcopy $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi ::/EFI/BOOT
-    mcopy $ROOT/$TOOLCHAIN/share/syslinux/ldlinux.e64 ::/EFI/BOOT
+    mcopy $TOOLCHAIN/share/syslinux/bootx64.efi ::/EFI/BOOT
+    mcopy $TOOLCHAIN/share/syslinux/ldlinux.e64 ::/EFI/BOOT
     mcopy "$LE_TMP"/syslinux.cfg ::/EFI/BOOT
 elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
   # create bootloader configuration
diff --git a/scripts/skip_unpack b/scripts/skip_unpack
deleted file mode 100755
index 78248f0839..0000000000
--- a/scripts/skip_unpack
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-if [ -z "$1" ]; then
-  echo "usage: $0 package_name"
-  exit 1
-fi
-
-if [ ! -f $PKG_DIR/package.mk ]; then
-  printf "${boldred}$1: no package.mk file found${endcolor}\n"
-  exit 1
-fi
-
-STAMP=$PKG_BUILD/.libreelec-unpack
-
-if [ -f $STAMP ] ; then
-  printf "%${BUILD_INDENT}c ${boldcyan}SKIP_UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
-  export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
-
-  rm -f $STAMP
-  STAMP_DEPENDS="$PKG_DIR $PKG_NEED_UNPACK $PROJECT_DIR/$PROJECT/patches/$PKG_NAME"
-  [ -n "$DEVICE" ] && STAMP_DEPENDS="$STAMP_DEPENDS $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME"
-  PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
-  for i in PKG_NAME PKG_DEEPMD5; do
-    eval val=\$$i
-    echo "STAMP_$i=\"$val\"" >> $STAMP
-  done
-fi
diff --git a/scripts/uninstall b/scripts/uninstall
index 4824a081d5..f354726369 100755
--- a/scripts/uninstall
+++ b/scripts/uninstall
@@ -48,14 +48,14 @@ if [ -f $STAMP ]; then
 
       # setup configure script
       if [ -z "$PKG_CONFIGURE_SCRIPT" ]; then
-        PKG_CONFIGURE_SCRIPT="$ROOT/$PKG_BUILD/configure"
+        PKG_CONFIGURE_SCRIPT="$PKG_BUILD/configure"
       else
-        PKG_CONFIGURE_SCRIPT="$ROOT/$PKG_BUILD/$PKG_CONFIGURE_SCRIPT"
+        PKG_CONFIGURE_SCRIPT="$PKG_BUILD/$PKG_CONFIGURE_SCRIPT"
       fi
       if [ -z "$PKG_CMAKE_SCRIPT" ]; then
-        PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/CMakeLists.txt"
+        PKG_CMAKE_SCRIPT="$PKG_BUILD/CMakeLists.txt"
       else
-        PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/$PKG_CMAKE_SCRIPT"
+        PKG_CMAKE_SCRIPT="$PKG_BUILD/$PKG_CMAKE_SCRIPT"
       fi
 
       # ensure $PKG_BUILD is there. (installer? PKG_URL="")
@@ -83,7 +83,7 @@ if [ -f $STAMP ]; then
         fi
       fi
 
-      MAKEUNINSTALL="$ROOT/$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX uninstall"
+      MAKEUNINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX uninstall"
 
       if [ "$TARGET" = "target" ]; then
         $MAKEUNINSTALL $PKG_MAKEINSTALL_OPTS_TARGET
diff --git a/scripts/unpack b/scripts/unpack
index 76f9584f18..a1fae1e211 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -36,16 +36,16 @@ STAMP=$PKG_BUILD/.libreelec-unpack
 
 mkdir -p $BUILD
 
-[ ! -d "$SOURCES/$1" -a ! -d "$PKG_DIR/sources" ] && exit 0
-
 STAMP_DEPENDS="$PKG_DIR $PKG_NEED_UNPACK $PROJECT_DIR/$PROJECT/patches/$PKG_NAME"
 [ -n "$DEVICE" ] && STAMP_DEPENDS="$STAMP_DEPENDS $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME"
 
+# Perform a wildcard match on the package to ensure old versions are cleaned too
+PKG_DEEPMD5=
 for i in $BUILD/$1-*; do
   if [ -d $i -a -f "$i/.libreelec-unpack" ] ; then
     . "$i/.libreelec-unpack"
     if [ "$STAMP_PKG_NAME" = "$1" ]; then
-      PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
+      [ -z "${PKG_DEEPMD5}" ] && PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
       if [ ! "$PKG_DEEPMD5" = "$STAMP_PKG_DEEPMD5" ] ; then
         $SCRIPTS/clean $1
       fi
@@ -60,145 +60,150 @@ fi
 
 [ -f "$STAMP" ] && exit 0
 
-printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
-export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
+if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
+  printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
+  export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
-# unset functions
-unset -f pre_unpack
-unset -f unpack
-unset -f post_unpack
-unset -f pre_patch
-unset -f post_patch
+  # unset functions
+  unset -f pre_unpack
+  unset -f unpack
+  unset -f post_unpack
+  unset -f pre_patch
+  unset -f post_patch
 
-. $PKG_DIR/package.mk
+  . $PKG_DIR/package.mk
 
-if [ "$(type -t pre_unpack)" = "function" ]; then
-  pre_unpack
-fi
+  if [ "$(type -t pre_unpack)" = "function" ]; then
+    pre_unpack
+  fi
 
-if [ "$(type -t unpack)" = "function" ]; then
-  unpack
-else
-  if [ -n "$PKG_URL" ]; then
-    $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
-    $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
-    $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
-    $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
-    $SCRIPTS/extract $1 "$1*.txz"     $BUILD
-    $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
-    $SCRIPTS/extract $1 "$1*.7z"      $BUILD
-    $SCRIPTS/extract $1 "$1*.zip"     $BUILD
+  if [ "$(type -t unpack)" = "function" ]; then
+    unpack
+  else
+    if [ -n "$PKG_URL" ]; then
+      $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
+      $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
+      $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
+      $SCRIPTS/extract $1 "$1*.txz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
+      $SCRIPTS/extract $1 "$1*.7z"      $BUILD
+      $SCRIPTS/extract $1 "$1*.zip"     $BUILD
+    fi
+  fi
+
+  if [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
+    if [ -n "$PKG_SOURCE_DIR" ]; then
+      mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+    elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* ]; then
+      mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION
+    fi
+  fi
+
+  if [ -d "$PKG_DIR/sources" ]; then
+    [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+    cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
+  fi
+
+  if [ -z "$PKG_URL" ]; then
+    mkdir -p "${BUILD}/${PKG_NAME}-${PKG_VERSION}"
+  fi
+
+  if [ "$(type -t post_unpack)" = "function" ]; then
+    post_unpack
+  fi
+
+  if [ "$(type -t pre_patch)" = "function" ]; then
+    pre_patch
+  fi
+
+  if [ "$TARGET_ARCH" = "x86_64" ]; then
+    PATCH_ARCH="x86"
+  else
+    PATCH_ARCH="$TARGET_ARCH"
+  fi
+
+  PATCH_DIRS_PKG=""
+  PATCH_DIRS_PRJ=""
+  if [ -n "$PKG_PATCH_DIRS" ]; then
+    for patch_dir in $PKG_PATCH_DIRS; do
+      [ -d $PKG_DIR/patches/$patch_dir ] && PATCH_DIRS_PKG="$PATCH_DIRS_PKG $PKG_DIR/patches/$patch_dir/*.patch"
+      [ -d $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir/*.patch"
+    done
+  fi
+
+  for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
+           $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \
+           $PATCH_DIRS_PKG \
+           $PKG_DIR/patches/$PKG_VERSION/*.patch \
+           $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \
+           $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch \
+           $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH/*.patch \
+           $PATCH_DIRS_PRJ \
+           $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch \
+           $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch; do
+
+    thisdir="$(dirname "$i")"
+
+    if [ "$thisdir" = "$PKG_DIR/patches" ]; then
+      PATCH_DESC="(common)"
+    elif [ "$thisdir" = "$PKG_DIR/patches/$PATCH_ARCH" ]; then
+      PATCH_DESC="(common - $PATCH_ARCH)"
+    elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION" ]; then
+      PATCH_DESC="(common - $PKG_VERSION)"
+    elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH" ]; then
+      PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then
+      PATCH_DESC="(project)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH" ]; then
+      PATCH_DESC="(project - $PATCH_ARCH)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION" ]; then
+      PATCH_DESC="(project - $PKG_VERSION)"
+    elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" ]; then
+      PATCH_DESC="(device)"
+    else
+      if [[ "$thisdir" =~ ^$PKG_DIR/.* ]]; then
+        PATCH_DESC="(common - $(basename "$thisdir"))"
+      elif [[ "$thisdir" =~ ^$PROJECT_DIR/.* ]]; then
+        PATCH_DESC="(project - $(basename "$thisdir"))"
+      else
+        PATCH_DESC="(unknown - $(basename "$thisdir"))"
+      fi
+    fi
+
+    if [ -f "$i" ]; then
+      printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}${PATCH_DESC}${endcolor}   ${i#$ROOT/}\n" ' '>&$SILENT_OUT
+      if [ -n "$(grep -E '^GIT binary patch$' $i)" ]; then
+        cat $i | git apply --directory=`echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 --verbose --whitespace=nowarn --unsafe-paths >&$VERBOSE_OUT
+      else
+        cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
+      fi
+    fi
+  done
+
+  if [ "$(type -t post_patch)" = "function" ]; then
+    post_patch
+  fi
+
+  if [ ! "$PKG_NAME" == "configtools" ] ; then
+    for config in `find $PKG_BUILD -name config.guess | sed 's/config.guess//'`; do
+      printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor}   $config\n" ' '
+
+      [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \
+        cp -f $TOOLCHAIN/configtools/config.guess $config
+      [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \
+        cp -f $TOOLCHAIN/configtools/config.sub $config
+    done
   fi
 fi
 
-if [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
-  if [ -n "$PKG_SOURCE_DIR" ]; then
-    mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
-  elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* ]; then
-    mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION
-  fi
-fi
+if [ "$PKG_SECTION" != "virtual" ]; then
+  mkdir -p $PKG_BUILD
 
-if [ -d "$PKG_DIR/sources" ]; then
-  [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
-  cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
-fi
+  rm -f $STAMPS/$1/build_*
 
-if [ -z "$PKG_URL" ]; then
-  mkdir -p "${BUILD}/${PKG_NAME}-${PKG_VERSION}"
-fi
-
-if [ "$(type -t post_unpack)" = "function" ]; then
-  post_unpack
-fi
-
-if [ "$(type -t pre_patch)" = "function" ]; then
-  pre_patch
-fi
-
-if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PATCH_ARCH="x86"
-else
-  PATCH_ARCH="$TARGET_ARCH"
-fi
-
-PATCH_DIRS_PKG=""
-PATCH_DIRS_PRJ=""
-if [ -n "$PKG_PATCH_DIRS" ]; then
-  for patch_dir in $PKG_PATCH_DIRS; do
-    [ -d $PKG_DIR/patches/$patch_dir ] && PATCH_DIRS_PKG="$PATCH_DIRS_PKG $PKG_DIR/patches/$patch_dir/*.patch"
-    [ -d $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir ] && PATCH_DIRS_PRJ="$PATCH_DIRS_PRJ $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$patch_dir/*.patch"
+  PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
+  for i in PKG_NAME PKG_DEEPMD5; do
+    echo "STAMP_$i=\"${!i}\"" >> $STAMP
   done
 fi
-
-for i in $PKG_DIR/patches/$PKG_NAME-*.patch \
-         $PKG_DIR/patches/$PATCH_ARCH/$PKG_NAME-*.patch \
-         $PATCH_DIRS_PKG \
-         $PKG_DIR/patches/$PKG_VERSION/*.patch \
-         $PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH/*.patch \
-         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/*.patch \
-         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH/*.patch \
-         $PATCH_DIRS_PRJ \
-         $PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION/*.patch \
-         $PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME/*.patch; do
-
-  thisdir="$(dirname "$i")"
-
-  if [ "$thisdir" = "$PKG_DIR/patches" ]; then
-    PATCH_DESC="(common)"
-  elif [ "$thisdir" = "$PKG_DIR/patches/$PATCH_ARCH" ]; then
-    PATCH_DESC="(common - $PATCH_ARCH)"
-  elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION" ]; then
-    PATCH_DESC="(common - $PKG_VERSION)"
-  elif [ "$thisdir" = "$PKG_DIR/patches/$PKG_VERSION/$PATCH_ARCH" ]; then
-    PATCH_DESC="($PKG_VERSION - $PATCH_ARCH)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME" ]; then
-    PATCH_DESC="(project)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PATCH_ARCH" ]; then
-    PATCH_DESC="(project - $PATCH_ARCH)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/patches/$PKG_NAME/$PKG_VERSION" ]; then
-    PATCH_DESC="(project - $PKG_VERSION)"
-  elif [ "$thisdir" = "$PROJECT_DIR/$PROJECT/devices/$DEVICE/patches/$PKG_NAME" ]; then
-    PATCH_DESC="(device)"
-  else
-    if [[ "$thisdir" =~ ^$PKG_DIR/.* ]]; then
-      PATCH_DESC="(common - $(basename "$thisdir"))"
-    elif [[ "$thisdir" =~ ^$PROJECT_DIR/.* ]]; then
-      PATCH_DESC="(project - $(basename "$thisdir"))"
-    else
-      PATCH_DESC="(unknown - $(basename "$thisdir"))"
-    fi
-  fi
-
-  if [ -f "$i" ]; then
-    printf "%${BUILD_INDENT}c ${boldgreen}APPLY PATCH${endcolor} ${boldwhite}${PATCH_DESC}${endcolor}   $i\n" ' '>&$SILENT_OUT
-    if [ -n "$(grep -E '^GIT binary patch$' $i)" ]; then
-      cat $i | git apply --directory=`echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 --verbose --whitespace=nowarn >&$VERBOSE_OUT
-    else
-      cat $i | patch -d `echo "$PKG_BUILD" | cut -f1 -d\ ` -p1 >&$VERBOSE_OUT
-    fi
-  fi
-done
-
-if [ "$(type -t post_patch)" = "function" ]; then
-  post_patch
-fi
-
-for config in `find $BUILD/$1* -name config.guess | sed 's/config.guess//'`; do
-  if [ ! "$PKG_NAME" == "configtools" ] ; then
-    printf "%${BUILD_INDENT}c ${boldyellow}FIXCONFIG${endcolor}   $config\n" ' '
-
-    [ -f "$config/config.guess" -a -f $ROOT/$TOOLCHAIN/configtools/config.guess ] && \
-      cp -f $ROOT/$TOOLCHAIN/configtools/config.guess $config
-    [ -f "$config/config.sub" -a -f $ROOT/$TOOLCHAIN/configtools/config.sub ] && \
-      cp -f $ROOT/$TOOLCHAIN/configtools/config.sub $config
-  fi
-done
-
-rm -f $STAMPS/$1/build_*
-
-PKG_DEEPMD5=$(find $STAMP_DEPENDS -exec md5sum {} \; 2>/dev/null | sort | md5sum | cut -d" " -f1)
-for i in PKG_NAME PKG_DEEPMD5; do
-  eval val=\$$i
-  echo "STAMP_$i=\"$val\"" >> $STAMP
-done
diff --git a/tools/distro-tool b/tools/distro-tool
index eecb1c5f01..1a0c176abc 100755
--- a/tools/distro-tool
+++ b/tools/distro-tool
@@ -46,7 +46,7 @@ WORKER_MAX=${WORKER_MAX:-$(grep "^processor[[:space:]]*:" /proc/cpuinfo | wc -l)
 
 PYTHON_PROG='
 from __future__ import print_function
-import sys, os, json, codecs, re, threading, subprocess, glob, datetime, shutil
+import sys, os, json, codecs, re, threading, subprocess, glob, datetime, shutil, hashlib
 
 if sys.version_info >= (3, 0):
   import queue as Queue
@@ -125,7 +125,7 @@ class MyUtility(object):
   @staticmethod
   def readfile(filename):
     inputfile = codecs.open(filename, "rb", encoding="utf-8")
-    data= inputfile.read()
+    data = inputfile.read()
     inputfile.close()
     return data
 
@@ -320,6 +320,31 @@ class MyUtility(object):
 
     return result
 
+  # Calculate hash for chunked data
+  @staticmethod
+  def hash_bytestr_iter(bytesiter, hasher, ashexstr=True):
+    for block in bytesiter:
+      hasher.update(block)
+    return (hasher.hexdigest() if ashexstr else hasher.digest())
+
+  # Read file in blocks/chunks to be memory efficient
+  @staticmethod
+  def file_as_blockiter(afile, blocksize=65536):
+    with afile:
+      block = afile.read(blocksize)
+      while len(block) > 0:
+        yield block
+        block = afile.read(blocksize)
+
+  # Calculate sha256 hash for a file
+  @staticmethod
+  def calculate_sha256(fname):
+    try:
+      return MyUtility.hash_bytestr_iter(MyUtility.file_as_blockiter(open(fname, "rb")), hashlib.sha256())
+    except:
+      raise
+      return ""
+
   # Use wget with same parameters as scripts/get is using
   @staticmethod
   def download_file(msgs, filename_data, filename_log, url):
@@ -336,7 +361,7 @@ class MyUtility(object):
     return False
 
   @staticmethod
-  def get_package(msgs, package_name, package_source, package_url):
+  def get_package(msgs, package_name, package_source, package_url, package_sha):
     onsource = False
     onmirror = False
 
@@ -384,6 +409,14 @@ class MyUtility(object):
       if os.path.exists(tmpfile_log):
         MyUtility.logmsg(msgs, 0, MyUtility.readfile(tmpfile_log))
     else:
+      if package_sha:
+        calc_sha = MyUtility.calculate_sha256(tmpfile_data)
+        if calc_sha != package_sha:
+          result = False
+          MyUtility.show(msgs, 0, "red", "DOWNLOAD FAILED!!", "%s (%s)" % (package_name, package_url))
+          MyUtility.logmsg(msgs, 0, "Checksum mismatch - got [%s], wanted [%s]" % (calc_sha, package_sha))
+
+    if result == True:
       MyUtility.show(msgs, 0, "green", "Successful Download", "%s (%s)" % (package_name, package_source))
       if IS_MIRROR:
         if not os.path.exists("%s/%s" % (DOWNLOAD_DIR, package_name)):
@@ -483,6 +516,7 @@ class MyThread(threading.Thread):
         pkg_name = qItem["PKG_NAME"]
         pkg_version = qItem["PKG_VERSION"]
         pkg_url = qItem["PKG_URL"]
+        pkg_sha = qItem["PKG_SHA256"]
         pkg_section = qItem["PKG_SECTION"]
         pkg_source_name = qItem["PKG_SOURCE_NAME"]
 
@@ -499,14 +533,14 @@ class MyThread(threading.Thread):
 
         self.output_queue.put([{"start": True, "name": threading.current_thread().name, "data": {"url": pkg_url, "tstamp": datetime.datetime.now()}}])
 
-        MyUtility.logmsg(msgs, 3, ">>>>>>>>>>>>>>>>> %s, %s, %s" % (pkg_name, pkg_version, pkg_url))
+        MyUtility.logmsg(msgs, 3, ">>>>>>>>>>>>>>>>> %s, %s, %s, wanted sha256 %s" % (pkg_name, pkg_version, pkg_url, pkg_sha))
 
         if MyUtility.have_package(pkg_name, pkg_source_name):
           MyUtility.show(msgs, 1, "green", "Already downloaded", "%s (%s)" % (pkg_name, pkg_source_name))
         else:
           tStart = datetime.datetime.now()
           if not stopped.is_set() and \
-             not MyUtility.get_package(msgs, pkg_name, pkg_source_name, pkg_url):
+             not MyUtility.get_package(msgs, pkg_name, pkg_source_name, pkg_url, pkg_sha):
              if not IGNORE_ERRORS:
                stopped.set()
           tDelta_get_package = datetime.datetime.now() - tStart
@@ -758,7 +792,7 @@ generate_work_worker() {
   local pcount=$1 worker="$2" revision="$3"
   local workfile_i="$(printf "%s.%02d" "${WORKFILES_I}" ${worker})"
   local workfile_o="$(printf "%s.%02d" "${WORKFILES_O}" ${worker})"
-  local wanted_vars="PKG_NAME PKG_VERSION PKG_URL PKG_SECTION PKG_IS_ADDON PKG_SOURCE_NAME"
+  local wanted_vars="PKG_NAME PKG_VERSION PKG_URL PKG_SHA256 PKG_SECTION PKG_IS_ADDON PKG_SOURCE_NAME"
   local package_name var comma PKG_URL PKG_SOURCE_NAME PKG_VERSION PKG_IS_ADDON
 
   [ -f "${workfile_i}" ] || return 0