TOOLCHAIN: drop $ROOT, convert to absolute path

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_CC="$TOOLCHAIN/bin/host-gcc"
-      export HOST_CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      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 CC="$TOOLCHAIN/bin/host-gcc"
-      export CXX="$ROOT/$TOOLCHAIN/bin/host-g++"
+      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_CONF=$TOOLCHAIN/etc/cmake-$HOST_NAME.conf
-      export CMAKE="cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF -DCMAKE_INSTALL_PREFIX=$ROOT/$TOOLCHAIN"
+      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
@@ -182,41 +182,41 @@ add_group() {
 do_autoreconf() {
   export ACLOCAL_DIR=$SYSROOT_PREFIX/usr/share/aclocal
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoconf" ]; then
+  if [ -e "$TOOLCHAIN/bin/autoconf" ]; then
-    export AUTOCONF=$ROOT/$TOOLCHAIN/bin/autoconf
+    export AUTOCONF=$TOOLCHAIN/bin/autoconf
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/automake" ]; then
+  if [ -e "$TOOLCHAIN/bin/automake" ]; then
-    export AUTOMAKE=$ROOT/$TOOLCHAIN/bin/automake
+    export AUTOMAKE=$TOOLCHAIN/bin/automake
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autopoint" ]; then
+  if [ -e "$TOOLCHAIN/bin/autopoint" ]; then
-    export AUTOPOINT=$ROOT/$TOOLCHAIN/bin/autopoint
+    export AUTOPOINT=$TOOLCHAIN/bin/autopoint
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/libtoolize" ]; then
+  if [ -e "$TOOLCHAIN/bin/libtoolize" ]; then
-    export LIBTOOLIZE=$ROOT/$TOOLCHAIN/bin/libtoolize
+    export LIBTOOLIZE=$TOOLCHAIN/bin/libtoolize
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/intltoolize" ]; then
+  if [ -e "$TOOLCHAIN/bin/intltoolize" ]; then
-    export INTLTOOLIZE=$ROOT/$TOOLCHAIN/bin/intltoolize
+    export INTLTOOLIZE=$TOOLCHAIN/bin/intltoolize
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/aclocal" ]; then
+  if [ -e "$TOOLCHAIN/bin/aclocal" ]; then
-    export ACLOCAL="$ROOT/$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
+    export ACLOCAL="$TOOLCHAIN/bin/aclocal -I $ACLOCAL_DIR"
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/autoheader" ]; then
+  if [ -e "$TOOLCHAIN/bin/autoheader" ]; then
-    export AUTOHEADER=$ROOT/$TOOLCHAIN/bin/autoheader
+    export AUTOHEADER=$TOOLCHAIN/bin/autoheader
   fi
 
-  if [ -e "$ROOT/$TOOLCHAIN/bin/libtool" ]; then
+  if [ -e "$TOOLCHAIN/bin/libtool" ]; then
-    export LIBTOOL=$ROOT/$TOOLCHAIN/bin/libtool
+    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
 }

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_LDFLAGS="-Wl,-rpath,$TOOLCHAIN/lib -L$TOOLCHAIN/lib"
-HOST_LIBDIR="$ROOT/$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"

config/path

@@ -43,9 +43,9 @@ 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.$(basename $BUILD)
 
@@ -56,8 +56,8 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
 
 . config/sources
 
-MAKE="$ROOT/$TOOLCHAIN/bin/make"
+MAKE="$TOOLCHAIN/bin/make"
-MAKEINSTALL="$ROOT/$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
+MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"
 SED="sed -i"
 
 # set package metadata
@@ -190,14 +190,14 @@ if [ -z "$CCACHE_DIR" ]; then
   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
+if [ -z "$PATH" -o "$PATH" = "${PATH#$TOOLCHAIN/bin:}" ]; then
-  export PATH="$ROOT/$TOOLCHAIN/bin:$ROOT/$TOOLCHAIN/sbin:$PATH"
+  export PATH="$TOOLCHAIN/bin:$TOOLCHAIN/sbin:$PATH"
 fi
 
-if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$ROOT/$TOOLCHAIN/lib:}" ]; then
+if [ -z "$LD_LIBRARY_PATH" -o "$LD_LIBRARY_PATH" = "${LD_LIBRARY_PATH#$TOOLCHAIN/lib:}" ]; then
-  export LD_LIBRARY_PATH="$ROOT/$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
+  export LD_LIBRARY_PATH="$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
 fi
 
 VERSION_SUFFIX=$TARGET_ARCH

packages/addons/addon-depends/containerd/package.mk

@@ -57,9 +57,9 @@ 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 GOLANG=$TOOLCHAIN/lib/golang/bin/go
   export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
   ln -fs $ROOT/$PKG_BUILD $ROOT/$PKG_BUILD/vendor/src/github.com/docker/containerd

packages/addons/addon-depends/emby-depends/ffmpegx/package.mk

@@ -86,7 +86,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" \

packages/addons/addon-depends/go/package.mk

@@ -42,7 +42,7 @@ 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
 }
@@ -54,10 +54,10 @@ make_host() {
 
 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
+  mkdir -p $TOOLCHAIN/lib/golang
-  cp -av $ROOT/$PKG_BUILD/* $ROOT/$TOOLCHAIN/lib/golang/
+  cp -av $ROOT/$PKG_BUILD/* $TOOLCHAIN/lib/golang/
 }

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 \

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 GOLANG=$TOOLCHAIN/lib/golang/bin/go
   export GOPATH=$ROOT/$PKG_BUILD.gopath
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 }
 

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
 }

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
 }

packages/addons/addon-depends/ninja/package.mk

@@ -38,5 +38,5 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp ninja $ROOT/$TOOLCHAIN/bin/
+  cp ninja $TOOLCHAIN/bin/
 }

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_MAKE_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall"
-PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$ROOT/$TOOLCHAIN/bin/nsinstall"
+PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall"
 
 configure_target() {
   cd $(get_build_dir nss)/nspr

packages/addons/addon-depends/nss/package.mk

@@ -42,7 +42,7 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/*/nsinstall $ROOT/$TOOLCHAIN/bin
+  cp $ROOT/$PKG_BUILD/nss/coreconf/nsinstall/*/nsinstall $TOOLCHAIN/bin
 }
 
 post_makeinstall_host() {
@@ -59,7 +59,7 @@ 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

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

packages/addons/addon-depends/runc/package.mk

@@ -57,9 +57,9 @@ 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 GOLANG=$TOOLCHAIN/lib/golang/bin/go
   export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/Godeps/_workspace/
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  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

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
 }

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 {} \;
 }

packages/addons/service/docker/package.mk

@@ -68,9 +68,9 @@ 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 GOLANG=$TOOLCHAIN/lib/golang/bin/go
   export GOPATH=$ROOT/$PKG_BUILD/.gopath
-  export GOROOT=$ROOT/$TOOLCHAIN/lib/golang
+  export GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 
   mkdir -p $ROOT/$PKG_BUILD/.gopath

packages/addons/service/syncthing/package.mk

@@ -66,9 +66,9 @@ 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 GOLANG=$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 GOROOT=$TOOLCHAIN/lib/golang
   export PATH=$PATH:$GOROOT/bin
 }
 

packages/addons/service/tvheadend42/package.mk

@@ -63,7 +63,7 @@ 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
@@ -76,7 +76,7 @@ pre_configure_target() {
 
 # transcoding
   if [ "$TARGET_ARCH" = x86_64 ]; then
-    export AS=$ROOT/$TOOLCHAIN/bin/yasm
+    export AS=$TOOLCHAIN/bin/yasm
   fi
 
   export CROSS_COMPILE=$TARGET_PREFIX

packages/compress/bzip2/package.mk

@@ -42,7 +42,7 @@ make_host() {
 }
 
 makeinstall_host() {
-  make install PREFIX=$ROOT/$TOOLCHAIN
+  make install PREFIX=$TOOLCHAIN
 }
 
 pre_build_target() {

packages/databases/mysql/package.mk

@@ -34,9 +34,9 @@ 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_err|COMMAND $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 comp_sql|COMMAND $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|COMMAND gen_lex_hash|COMMAND $TOOLCHAIN/bin/gen_lex_hash|" $ROOT/$PKG_BUILD/sql/CMakeLists.txt
 
   sed -i '/^IF(NOT BOOST_MINOR_VERSION.*$/,/^ENDIF()$/d' $ROOT/$PKG_BUILD/cmake/boost.cmake
 }
@@ -76,9 +76,9 @@ post_make_host() {
 }
 
 makeinstall_host() {
-  cp -P extra/comp_err $ROOT/$TOOLCHAIN/bin
+  cp -P extra/comp_err $TOOLCHAIN/bin
-  cp -P sql/gen_lex_hash $ROOT/$TOOLCHAIN/bin
+  cp -P sql/gen_lex_hash $TOOLCHAIN/bin
-  cp -P scripts/comp_sql $ROOT/$TOOLCHAIN/bin
+  cp -P scripts/comp_sql $TOOLCHAIN/bin
 }
 
 PKG_CMAKE_OPTS_TARGET="-DINSTALL_INCLUDEDIR=include/mysql \
@@ -106,7 +106,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
 }

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

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"
 

packages/devel/boost/package.mk

@@ -38,8 +38,8 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
-    cp bin.*/bjam $ROOT/$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-bjam=$TOOLCHAIN/bin/bjam \
-                  --with-python=$ROOT/$TOOLCHAIN/bin/python \
+                  --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 \

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++
 }

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" \

packages/devel/configtools/package.mk

@@ -29,6 +29,6 @@ make_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/configtools
+  mkdir -p $TOOLCHAIN/configtools
-  cp config.* $ROOT/$TOOLCHAIN/configtools
+  cp config.* $TOOLCHAIN/configtools
 }

packages/devel/flex/package.mk

@@ -33,10 +33,10 @@ PKG_AUTORECONF="yes"
 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
 }

packages/devel/libcap/package.mk

@@ -66,14 +66,14 @@ make_target() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/lib
+  mkdir -p $TOOLCHAIN/lib
-    cp libcap/libcap.a $ROOT/$TOOLCHAIN/lib
+    cp libcap/libcap.a $TOOLCHAIN/lib
 
-  mkdir -p $ROOT/$TOOLCHAIN/lib/pkgconfig
+  mkdir -p $TOOLCHAIN/lib/pkgconfig
-    cp libcap/libcap.pc $ROOT/$TOOLCHAIN/lib/pkgconfig
+    cp libcap/libcap.pc $TOOLCHAIN/lib/pkgconfig
 
-  mkdir -p $ROOT/$TOOLCHAIN/include/sys
+  mkdir -p $TOOLCHAIN/include/sys
-    cp libcap/include/sys/capability.h $ROOT/$TOOLCHAIN/include/sys
+    cp libcap/include/sys/capability.h $TOOLCHAIN/include/sys
 }
 
 makeinstall_target() {

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
 }

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-gmp=$TOOLCHAIN \
-                         --with-mpfr=$ROOT/$TOOLCHAIN"
+                         --with-mpfr=$TOOLCHAIN"

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 \
+                         --prefix=$TOOLCHAIN \
-                         --with-gmp-lib=$ROOT/$TOOLCHAIN/lib \
+                         --with-gmp-lib=$TOOLCHAIN/lib \
-                         --with-gmp-include=$ROOT/$TOOLCHAIN/include"
+                         --with-gmp-include=$TOOLCHAIN/include"

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"

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 \

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() {

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() {

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/
+  mkdir -p $TOOLCHAIN/lib/gcc-linaro-aarch64-elf/
-    cp -a * $ROOT/$TOOLCHAIN/lib/gcc-linaro-aarch64-elf
+    cp -a * $TOOLCHAIN/lib/gcc-linaro-aarch64-elf
 }

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/
+  mkdir -p $TOOLCHAIN/lib/gcc-linaro-arm-eabi/
-    cp -a * $ROOT/$TOOLCHAIN/lib/gcc-linaro-arm-eabi
+    cp -a * $TOOLCHAIN/lib/gcc-linaro-arm-eabi
 }

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-gmp=$TOOLCHAIN \
-                           --with-mpfr=$ROOT/$TOOLCHAIN \
+                           --with-mpfr=$TOOLCHAIN \
-                           --with-mpc=$ROOT/$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++

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

packages/linux-firmware/intel-ucode/package.mk

@@ -40,7 +40,7 @@ make_host() {
 }
 
 makeinstall_host() {
-  cp intel-microcode2ucode $ROOT/$TOOLCHAIN/bin/
+  cp intel-microcode2ucode $TOOLCHAIN/bin/
 }
 
 make_target() {

packages/linux/package.mk

@@ -93,8 +93,8 @@ 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|" \
+  sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $TOOLCHAIN/bin/host-gcc|" \
-         -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $ROOT/$TOOLCHAIN/bin/host-g++|" \
+         -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
@@ -174,7 +174,7 @@ 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
 

packages/mediacenter/JsonSchemaBuilder/package.mk

@@ -39,6 +39,6 @@ pre_build_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
-    cp JsonSchemaBuilder $ROOT/$TOOLCHAIN/bin
+    cp JsonSchemaBuilder $TOOLCHAIN/bin
 }

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
 }
 

packages/mediacenter/TexturePacker/package.mk

@@ -44,6 +44,6 @@ pre_configure_host() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
-    cp TexturePacker $ROOT/$TOOLCHAIN/bin
+    cp TexturePacker $TOOLCHAIN/bin
 }

packages/mediacenter/kodi/package.mk

@@ -203,8 +203,8 @@ 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 \
+PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
-                       -DWITH_TEXTUREPACKER=$ROOT/$TOOLCHAIN/bin/TexturePacker \
+                       -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \
                        -DDEPENDS_PATH=$ROOT/$PKG_BUILD/depends \
                        -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/python2.7 \
                        -DGIT_VERSION=$PKG_VERSION \

packages/multimedia/ffmpeg/package.mk

@@ -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 \

packages/network/libdnet/package.mk

@@ -41,6 +41,6 @@ pre_configure_target() {
 }
 
 post_makeinstall_target() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
-    cp dnet-config $ROOT/$TOOLCHAIN/bin/
+    cp dnet-config $TOOLCHAIN/bin/
 }

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
 }

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
 }

packages/sysutils/busybox/package.mk

@@ -148,8 +148,8 @@ configure_init() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
-    cp -R $ROOT/$PKG_BUILD/.install_host/bin/* $ROOT/$TOOLCHAIN/bin
+    cp -R $ROOT/$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

packages/sysutils/dosfstools/package.mk

@@ -56,7 +56,7 @@ makeinstall_init() {
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/sbin
+  mkdir -p $TOOLCHAIN/sbin
-    cp mkfs.fat $ROOT/$TOOLCHAIN/sbin
+    cp mkfs.fat $TOOLCHAIN/sbin
-    ln -sf mkfs.fat $ROOT/$TOOLCHAIN/sbin/mkfs.vfat
+    ln -sf mkfs.fat $TOOLCHAIN/sbin/mkfs.vfat
 }

packages/sysutils/e2fsprogs/package.mk

@@ -116,6 +116,6 @@ makeinstall_host() {
   # Ensure installed files are writeable and not read-only, otherwise future package bumps will fail to overwrite toolchain
   chmod -R +w $(pwd)/.install/usr/*
 
-  cp -Pa $(pwd)/.install/usr/* $ROOT/$TOOLCHAIN
+  cp -Pa $(pwd)/.install/usr/* $TOOLCHAIN
 }
 

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() {

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
+  mkdir -p $TOOLCHAIN/bin
-    cp squashfs-tools/mksquashfs $ROOT/$TOOLCHAIN/bin
+    cp squashfs-tools/mksquashfs $TOOLCHAIN/bin
 }

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"
 

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 \

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 \
+                           LIBXML_CONFIG=$TOOLCHAIN/bin/xml2-config \
-                           LIBXSLT_CONFIG=$ROOT/$TOOLCHAIN/bin/xslt-config \
+                           LIBXSLT_CONFIG=$TOOLCHAIN/bin/xslt-config \
-                           --with-libxml-include-prefix=$ROOT/$TOOLCHAIN/include/libxml2 \
+                           --with-libxml-include-prefix=$TOOLCHAIN/include/libxml2 \
-                           --with-libxml-libs-prefix=$ROOT/$TOOLCHAIN/lib \
+                           --with-libxml-libs-prefix=$TOOLCHAIN/lib \
-                           --with-libxslt-include-prefix=$ROOT/$TOOLCHAIN/include \
+                           --with-libxslt-include-prefix=$TOOLCHAIN/include \
-                           --with-libxslt-libs-prefix=$ROOT/$TOOLCHAIN/lib"
+                           --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() {

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/
 }

packages/tools/populatefs/package.mk

@@ -36,6 +36,6 @@ make_host() {
 makeinstall_host() {
   $STRIP src/populatefs
 
-  mkdir -p $ROOT/$TOOLCHAIN/sbin
+  mkdir -p $TOOLCHAIN/sbin
-  cp src/populatefs $ROOT/$TOOLCHAIN/sbin
+  cp src/populatefs $TOOLCHAIN/sbin
 }

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 \
+HOST_CONFIGURE_OPTS="--prefix=$TOOLCHAIN \
-  --bindir=$ROOT/$TOOLCHAIN/bin \
+  --bindir=$TOOLCHAIN/bin \
-  --sbindir=$ROOT/$TOOLCHAIN/sbin \
+  --sbindir=$TOOLCHAIN/sbin \
-  --sysconfdir=$ROOT/$TOOLCHAIN/etc \
+  --sysconfdir=$TOOLCHAIN/etc \
-  --libexecdir=$ROOT/$TOOLCHAIN/lib \
+  --libexecdir=$TOOLCHAIN/lib \
-  --localstatedir=$ROOT/$TOOLCHAIN/var \
+  --localstatedir=$TOOLCHAIN/var \
-  --extra-cflags=-I$ROOT/$TOOLCHAIN/include \
+  --extra-cflags=-I$TOOLCHAIN/include \
-  --extra-ldflags=-L$ROOT/$TOOLCHAIN/lib \
+  --extra-ldflags=-L$TOOLCHAIN/lib \
   --static \
   --disable-vnc \
   --disable-werror \

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" \
+       CFLAGS="-I$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" \
+       LDFLAGS="-L$TOOLCHAIN/lib" \
        installer
 }
 
 makeinstall_host() {
-  mkdir -p $ROOT/$TOOLCHAIN/bin
+  mkdir -p $TOOLCHAIN/bin
-    cp bios/extlinux/extlinux $ROOT/$TOOLCHAIN/bin
+    cp bios/extlinux/extlinux $TOOLCHAIN/bin
-    cp bios/linux/syslinux $ROOT/$TOOLCHAIN/bin
+    cp bios/linux/syslinux $TOOLCHAIN/bin
-    cp bios/mtools/syslinux $ROOT/$TOOLCHAIN/bin/syslinux.mtools
+    cp bios/mtools/syslinux $TOOLCHAIN/bin/syslinux.mtools
 
-  mkdir -p $ROOT/$TOOLCHAIN/share/syslinux
+  mkdir -p $TOOLCHAIN/share/syslinux
-    cp bios/mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux
+    cp bios/mbr/mbr.bin $TOOLCHAIN/share/syslinux
-    cp bios/mbr/gptmbr.bin $ROOT/$TOOLCHAIN/share/syslinux
+    cp bios/mbr/gptmbr.bin $TOOLCHAIN/share/syslinux
-    cp efi64/efi/syslinux.efi $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi
+    cp efi64/efi/syslinux.efi $TOOLCHAIN/share/syslinux/bootx64.efi
-    cp efi64/com32/elflink/ldlinux/ldlinux.e64  $ROOT/$TOOLCHAIN/share/syslinux
+    cp efi64/com32/elflink/ldlinux/ldlinux.e64  $TOOLCHAIN/share/syslinux
 }
 
 makeinstall_target() {

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"

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 \
+                         --prefix=$TOOLCHAIN \
-                         --bindir=$ROOT/$TOOLCHAIN/bin \
+                         --bindir=$TOOLCHAIN/bin \
-                         --sbindir=$ROOT/$TOOLCHAIN/sbin \
+                         --sbindir=$TOOLCHAIN/sbin \
-                         --sysconfdir=$ROOT/$TOOLCHAIN/etc \
+                         --sysconfdir=$TOOLCHAIN/etc \
-                         --libexecdir=$ROOT/$TOOLCHAIN/lib \
+                         --libexecdir=$TOOLCHAIN/lib \
-                         --localstatedir=$ROOT/$TOOLCHAIN/var \
+                         --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

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 $MODVER 2> /dev/null
 
 # 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

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
@@ -158,8 +158,8 @@ EOF
     mcopy $RELEASE_DIR/target/SYSTEM.md5 ::/SYSTEM.md5
 
     mmd EFI EFI/BOOT
-    mcopy $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi ::/EFI/BOOT
+    mcopy $TOOLCHAIN/share/syslinux/bootx64.efi ::/EFI/BOOT
-    mcopy $ROOT/$TOOLCHAIN/share/syslinux/ldlinux.e64 ::/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

scripts/uninstall

@@ -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

scripts/unpack

@@ -188,10 +188,10 @@ 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 ] && \
+    [ -f "$config/config.guess" -a -f $TOOLCHAIN/configtools/config.guess ] && \
-      cp -f $ROOT/$TOOLCHAIN/configtools/config.guess $config
+      cp -f $TOOLCHAIN/configtools/config.guess $config
-    [ -f "$config/config.sub" -a -f $ROOT/$TOOLCHAIN/configtools/config.sub ] && \
+    [ -f "$config/config.sub" -a -f $TOOLCHAIN/configtools/config.sub ] && \
-      cp -f $ROOT/$TOOLCHAIN/configtools/config.sub $config
+      cp -f $TOOLCHAIN/configtools/config.sub $config
   fi
 done