diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk index 1409128d69..98bf9995a0 100644 --- a/packages/addons/addon-depends/containerd/package.mk +++ b/packages/addons/addon-depends/containerd/package.mk @@ -58,11 +58,11 @@ pre_make_target() { export CGO_CFLAGS=$CFLAGS export LDFLAGS="-w -extldflags -static -X github.com/docker/containerd.GitCommit=${PKG_VERSION} -extld $CC" export GOLANG=$TOOLCHAIN/lib/golang/bin/go - export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/vendor/ + 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 d73078d715..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 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 0ba785dcb2..377ea9cf48 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -48,7 +48,7 @@ configure_host() { } make_host() { - cd $ROOT/$PKG_BUILD/src + cd $PKG_BUILD/src bash make.bash --no-banner } @@ -59,5 +59,5 @@ pre_makeinstall_host() { makeinstall_host() { mkdir -p $TOOLCHAIN/lib/golang - cp -av $ROOT/$PKG_BUILD/* $TOOLCHAIN/lib/golang/ + cp -av $PKG_BUILD/* $TOOLCHAIN/lib/golang/ } 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 1e1743ec8b..74af531e02 100644 --- a/packages/addons/addon-depends/libnetwork/package.mk +++ b/packages/addons/addon-depends/libnetwork/package.mk @@ -59,7 +59,7 @@ pre_make_target() { export CGO_CFLAGS=$CFLAGS export LDFLAGS="-extld $CC" export GOLANG=$TOOLCHAIN/lib/golang/bin/go - export GOPATH=$ROOT/$PKG_BUILD.gopath + 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/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/nss/package.mk b/packages/addons/addon-depends/nss/package.mk index dcedbf3639..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 $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" @@ -66,7 +66,7 @@ make_target() { } 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/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/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index b4c7c379b4..46dee4573c 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -58,11 +58,11 @@ pre_make_target() { export CGO_CFLAGS=$CFLAGS export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_VERSION} -X main.version=$(cat ./VERSION) -extld $CC" export GOLANG=$TOOLCHAIN/lib/golang/bin/go - export GOPATH=$ROOT/$PKG_BUILD.gopath:$ROOT/$PKG_BUILD/Godeps/_workspace/ + 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/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 d002a6802a..9ef236381a 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -69,15 +69,15 @@ configure_target() { export CGO_CFLAGS=$CFLAGS export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC" export GOLANG=$TOOLCHAIN/lib/golang/bin/go - export GOPATH=$ROOT/$PKG_BUILD/.gopath + 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/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/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index ee0186c44c..785a30a4e4 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -73,7 +73,7 @@ post_unpack() { pre_configure_target() { # fails to build in subdirs - cd $ROOT/$PKG_BUILD + cd $PKG_BUILD rm -rf .$TARGET_NAME # transcoding 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 c4210c6f85..6a45c033e9 100644 --- a/packages/compress/bzip2/package.mk +++ b/packages/compress/bzip2/package.mk @@ -32,12 +32,12 @@ 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" } @@ -46,12 +46,12 @@ makeinstall_host() { } 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 5f0d09b37f..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 $TOOLCHAIN/bin/comp_err|" $ROOT/$PKG_BUILD/extra/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 $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 \ 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/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 f7f18e29cd..c4c23064c1 100644 --- a/packages/devel/libcap/package.mk +++ b/packages/devel/libcap/package.mk @@ -33,33 +33,33 @@ 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 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/lang/Python/package.mk b/packages/lang/Python/package.mk index 394f29d8b2..5dca6e5e09 100644 --- a/packages/lang/Python/package.mk +++ b/packages/lang/Python/package.mk @@ -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/package.mk b/packages/lang/gcc/package.mk index 2fa86ee704..7560dd8e38 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -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/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 ea2c730511..074bd01416 100644 --- a/packages/linux-drivers/dvbhdhomerun/package.mk +++ b/packages/linux-drivers/dvbhdhomerun/package.mk @@ -55,7 +55,7 @@ pre_configure_target() { } 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-firmware/intel-ucode/package.mk b/packages/linux-firmware/intel-ucode/package.mk index 0969ba9dec..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() { diff --git a/packages/linux/package.mk b/packages/linux/package.mk index a1f80fe708..4a3b329285 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -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 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 f6cbf1df36..27a75e4108 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -207,7 +207,7 @@ KODI_LIBDVD="$KODI_DVDCSS \ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \ -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \ - -DDEPENDS_PATH=$ROOT/$PKG_BUILD/depends \ + -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 6fbdd404d5..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 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 08a5595c96..709b8ac884 100644 --- a/packages/network/libdnet/package.mk +++ b/packages/network/libdnet/package.mk @@ -37,7 +37,7 @@ 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() { 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 be74f98d85..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 @@ -149,7 +149,7 @@ configure_init() { makeinstall_host() { mkdir -p $TOOLCHAIN/bin - cp -R $ROOT/$PKG_BUILD/.install_host/bin/* $TOOLCHAIN/bin + cp -R $PKG_BUILD/.install_host/bin/* $TOOLCHAIN/bin } makeinstall_target() { diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk index 252dfed471..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 } 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/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/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/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/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/syslinux/package.mk b/packages/tools/syslinux/package.mk index 097627dbd1..0538bed5ee 100644 --- a/packages/tools/syslinux/package.mk +++ b/packages/tools/syslinux/package.mk @@ -61,7 +61,7 @@ make_host() { make CC=$CC \ AR=$AR \ RANLIB=$RANLIB \ - 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" \ + 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 } 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 e8b7770442..c635c87f2c 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -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/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 7015da69b8..fd6050a8ff 100755 --- a/scripts/build +++ b/scripts/build @@ -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 diff --git a/scripts/uninstall b/scripts/uninstall index 7ccd9d5c2e..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="")