Merge pull request #4088 from dhewg/pull/autoremove

cleanup dependencies & addons, and add an option to wipe intermediate build dirs

config/functions

@@ -94,6 +94,7 @@ print_color() {
       CLR_PATCH_DESC)   clr_actual="${boldwhite}";;
       CLR_TARGET)       clr_actual="${boldwhite}";;
       CLR_UNPACK)       clr_actual="${boldcyan}";;
+      CLR_AUTOREMOVE)   clr_actual="${boldblue}";;
 
       CLR_ENDCOLOR)     clr_actual="${endcolor}";;
 
@@ -170,6 +171,7 @@ setup_pkg_config_target() {
   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_BASE="$BUILD"
   export PKG_CONFIG_SYSROOT_DIR="$SYSROOT_PREFIX"
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
@@ -179,6 +181,7 @@ setup_pkg_config_host() {
   export PKG_CONFIG="$TOOLCHAIN/bin/pkg-config"
   export PKG_CONFIG_PATH=""
   export PKG_CONFIG_LIBDIR="$TOOLCHAIN/lib/pkgconfig:$TOOLCHAIN/share/pkgconfig"
+  export PKG_CONFIG_SYSROOT_BASE=""
   export PKG_CONFIG_SYSROOT_DIR=""
   unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
   unset PKG_CONFIG_ALLOW_SYSTEM_LIBS
@@ -481,6 +484,7 @@ reset_pkg_vars() {
     if [ "${var}" = "PKG_CONFIG" ] || \
        [ "${var}" = "PKG_CONFIG_PATH" ] || \
        [ "${var}" = "PKG_CONFIG_LIBDIR" ] || \
+       [ "${var}" = "PKG_CONFIG_SYSROOT_BASE" ] || \
        [ "${var}" = "PKG_CONFIG_SYSROOT_DIR" ] || \
        [ "${var}" = "PKG_CONFIG_ALLOW_SYSTEM_CFLAGS" ] || \
        [ "${var}" = "PKG_CONFIG_ALLOW_SYSTEM_LIBS" ]; then
@@ -1010,6 +1014,12 @@ source_package() {
       [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
     fi
 
+    if [ -n "${PKG_IS_KERNEL_PKG}" -a "${PKG_NAME}" != "linux" ]; then
+      PKG_DEPENDS_TARGET="toolchain linux ${PKG_DEPENDS_TARGET}"
+      PKG_DEPENDS_UNPACK="linux ${PKG_DEPENDS_UNPACK}"
+      PKG_NEED_UNPACK="${LINUX_DEPENDS} ${PKG_NEED_UNPACK}"
+    fi
+
     if [ -n "${PKG_DEPENDS_UNPACK}" ]; then
       for _p in ${PKG_DEPENDS_UNPACK}; do
         PKG_NEED_UNPACK+=" $(get_pkg_directory ${_p})"

config/multithread

@@ -25,6 +25,8 @@ start_multithread_build() {
   fi
   buildopts+=" --log-combine ${LOGCOMBINE:-always}"
 
+  [ "${AUTOREMOVE}" = "yes" ] && buildopts+=" --auto-remove"
+
   # When building addons, don't halt on error - keep building all packages/addons
   [ "${MTADDONBUILD}" = "yes" ] && buildopts+=" --continue-on-error" || buildopts+=" --halt-on-error"
 

config/options

@@ -56,7 +56,6 @@ KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
 
 LINUX_DEPENDS="${PROJECT_DIR}/${PROJECT}/linux ${PROJECT_DIR}/${PROJECT}/patches/linux ${PROJECT_DIR}/${PROJECT}/packages/linux ${ROOT}/packages/linux"
 [ -n "${DEVICE}" ] && LINUX_DEPENDS+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/linux"
-[ "${TARGET_ARCH}" = "x86_64" ] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
 
 # Need to point to your actual cc
 # If you have ccache installed, take care that LOCAL_CC does not point to it

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

@@ -9,7 +9,7 @@ PKG_SITE="http://argtable.sourceforge.net/"
 PKG_URL="https://downloads.sourceforge.net/project/argtable/argtable/argtable-${PKG_VERSION}/argtable2-${PKG_VERSION:2:4}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Argtable is an open source ANSI C library that parses GNU-style command-line options."
+PKG_TOOLCHAIN="configure"
+PKG_BUILD_FLAGS="-sysroot"
 
-make_target() {
+PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
-  :
-}

packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="chrome-libXcomposite"
 PKG_LONGDESC="libXcomposite for chrome"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXcomposite"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
                            --disable-static \
@@ -16,7 +17,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="chrome-libXdamage"
 PKG_LONGDESC="libXdamage for chrome"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXdamage"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
                            --disable-static \
@@ -16,7 +17,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="chrome-libXfixes"
 PKG_LONGDESC="libXfixes for chrome"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXfixes"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
                            --disable-static \
@@ -16,7 +17,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="chrome-libXi"
 PKG_LONGDESC="libXi for chrome"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXi"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
                            --disable-static \
@@ -16,7 +17,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="chrome-libXrender"
 PKG_LONGDESC="libXrender for chrome"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXrender"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
                            --disable-static \
@@ -16,7 +17,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="chrome-libXtst"
 PKG_LONGDESC="libXtst for chrome"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXtst"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
                            --disable-static \
@@ -16,7 +17,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="chrome-libxcb"
 PKG_LONGDESC="libxcb for chrome"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libxcb"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
                            --disable-static \
@@ -16,7 +17,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk

@@ -9,12 +9,10 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib libjpeg-turbo libpng jasper shared-mime-info tiff libX11"
+PKG_DEPENDS_CONFIG="shared-mime-info"
 PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation."
 
 PKG_MESON_OPTS_TARGET="-Ddocs=false \
                        -Dgir=false \
                        -Dman=false \
                        -Drelocatable=false"
-pre_configure_target() {
-  export PKG_CONFIG_PATH="$(get_build_dir shared-mime-info)/.$TARGET_NAME"
-}

packages/addons/addon-depends/chrome-depends/gtk3/package.mk

@@ -9,7 +9,9 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango"
+PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info"
 PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-cups \
                            --disable-debug \
@@ -24,12 +26,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-cups \
                            --enable-xkb"
 
 pre_configure_target() {
-  LIBS="$LIBS -lXcursor"
+  # $TOOLCHAIN/bin/glib-compile-resources requires $TOOLCHAIN/lib/libffi.so.6
-  export PKG_CONFIG_PATH="$(get_build_dir pango)/.$TARGET_NAME/meson-private:$(get_build_dir gdk-pixbuf)/.$TARGET_NAME/meson-private:$(get_build_dir shared-mime-info)/.$TARGET_NAME"
+  export LD_LIBRARY_PATH="$TOOLCHAIN/lib:$LD_LIBRARY_PATH"
-  export CFLAGS="$CFLAGS -I$(get_build_dir pango) -I$(get_build_dir pango)/.$TARGET_NAME -L$(get_build_dir pango)/.$TARGET_NAME/pango"
   export GLIB_COMPILE_RESOURCES=glib-compile-resources GLIB_MKENUMS=glib-mkenums GLIB_GENMARSHAL=glib-genmarshal
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk

@@ -10,11 +10,8 @@ PKG_SITE="http://xorg.freedesktop.org/"
 PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain scrnsaverproto"
 PKG_LONGDESC="X11 Screen Saver extension client library."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-static \
                            --enable-shared \
                            --enable-malloc0returnsnull"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/libXcursor/package.mk

@@ -10,8 +10,4 @@ PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender"
 PKG_LONGDESC="X11 Cursor management library.s"
-PKG_BUILD_FLAGS="+pic"
+PKG_BUILD_FLAGS="+pic -sysroot"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/libXft/package.mk

@@ -10,11 +10,7 @@ PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain fontconfig freetype libXrender util-macros xorgproto"
 PKG_LONGDESC="X FreeType library."
-PKG_BUILD_FLAGS="+pic"
+PKG_BUILD_FLAGS="+pic -sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/libxss/package.mk

@@ -9,10 +9,6 @@ PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain util-macros libXext scrnsaverproto"
 PKG_LONGDESC="X11 Screen Saver extension library."
-PKG_BUILD_FLAGS="+pic"
+PKG_BUILD_FLAGS="+pic -sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-malloc0returnsnull"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/pango/package.mk

@@ -9,16 +9,10 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.pango.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain cairo freetype fontconfig fribidi glib harfbuzz libX11 libXft"
+PKG_DEPENDS_CONFIG="libXft cairo"
 PKG_LONGDESC="The Pango library for layout and rendering of internationalized text."
 PKG_TOOLCHAIN="meson"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_MESON_OPTS_TARGET="-Denable_docs=false \
                        -Dgir=false"
-
-pre_configure_target() {
-  export PKG_CONFIG_PATH="$(get_build_dir cairo)/.$TARGET_NAME/src":"$(get_build_dir libXft)/.$TARGET_NAME/src"
-}
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk

@@ -10,7 +10,4 @@ PKG_SITE="http://xorg.freedesktop.org/"
 PKG_URL="https://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="X11 Screen Saver extension wire protocol."
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/chrome-depends/shared-mime-info/package.mk

@@ -9,11 +9,7 @@ PKG_SITE="https://freedesktop.org/wiki/Software/shared-mime-info/"
 PKG_URL="http://freedesktop.org/~hadess/shared-mime-info-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib libxml2"
 PKG_LONGDESC="The shared-mime-info package contains the core database of common types."
-PKG_BUILD_FLAGS="-parallel"
+PKG_BUILD_FLAGS="-parallel -sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
                            --disable-update-mimedb"
-
-makeinstall_target() {
-  :
-}

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

@@ -8,21 +8,13 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.kaashoek.com/comskip/"
 PKG_URL="https://github.com/erikkaashoek/Comskip/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain argtable2 ffmpegx"
+PKG_DEPENDS_CONFIG="argtable2 ffmpegx"
 PKG_LONGDESC="Comskip detects commercial breaks from a video stream. It can be used for post-processing recordings."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
-  LDFLAGS+=" -ldl"
+  # pass ffmpegx to build
-
-  export argtable2_CFLAGS="-I$(get_build_dir argtable2)/src"
-  export argtable2_LIBS="-L$(get_build_dir argtable2)/src/.libs -largtable2"
-
-# pass ffmpegx to build
-  PKG_CONFIG_PATH="$(get_install_dir ffmpegx)/usr/local/lib/pkgconfig"
   CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include"
   LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib"
 }
-
-make_target() {
- :
-}

packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk

@@ -9,7 +9,9 @@ PKG_SITE="https://bitbucket.org/majortom/blindscan-s2"
 PKG_URL="https://github.com/PLi-metas/blindscan-s2/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="blindscan-s2 is a program to blindscan digital satellite signals"
+PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  :
+  mkdir -p $INSTALL/usr/bin
+  make install BIND=$INSTALL/usr/bin
 }

packages/addons/addon-depends/dvb-tools-depends/dvb-apps/package.mk

@@ -10,11 +10,8 @@ PKG_SITE="https://www.linuxtv.org/wiki/index.php/LinuxTV_dvb-apps"
 PKG_URL="http://linuxtv.org/hg/dvb-apps/archive/${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Applications for initial setup, testing and operation of an DVB device supporting the DVB-S, DVB-C, DVB-T, and ATSC."
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_make_target() {
   export PERL_USE_UNSAFE_INC=1
 }
-
-makeinstall_target() {
- :
-}

packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk

@@ -10,11 +10,9 @@ PKG_SITE="https://www.videolan.org/projects/dvblast.html"
 PKG_URL="http://repo.or.cz/dvblast.git/snapshot/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain bitstream libev"
 PKG_LONGDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming application"
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
   export LDFLAGS="$LDFLAGS -lm"
-}
+  export PREFIX="/usr"
-
-makeinstall_target() {
- :
 }

packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk

@@ -10,7 +10,4 @@ PKG_URL="https://github.com/persianpros/dvbsnoop/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program"
 PKG_TOOLCHAIN="autotools"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk

@@ -10,7 +10,4 @@ PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libdvbcsa"
 PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast"
 PKG_TOOLCHAIN="autotools"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk

@@ -9,7 +9,9 @@ PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
 PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API"
+PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  :
+  mkdir -p $INSTALL/usr/bin
+  make install BIND=$INSTALL/usr/bin
 }

packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk

@@ -9,7 +9,4 @@ PKG_SITE="https://github.com/mighty-p/t2scan"
 PKG_URL="https://github.com/mighty-p/t2scan/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files."
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk

@@ -9,7 +9,9 @@ PKG_SITE="https://bitbucket.org/updatelee/tune-s2"
 PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="tune-s2 is a small linux app to be able to tune a dvb devices"
+PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  :
+  mkdir -p $INSTALL/usr/bin
+  make install BIND=$INSTALL/usr/bin
 }

packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk

@@ -10,7 +10,4 @@ PKG_URL="http://wirbel.htpc-forum.de/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files."
 PKG_TOOLCHAIN="autotools"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/game-tools/bchunk/package.mk

@@ -9,11 +9,13 @@ PKG_SITE="http://he.fi/bchunk/"
 PKG_URL="http://he.fi/bchunk/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Tool to convert a CD image in a .bin/.cue format to a set of .iso and .cdr tracks."
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}
 
 make_target() {
   make $PKG_MAKE_OPTS_TARGET CC=$CC LD=$CC
 }
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/bin
+  cp -p bchunk $INSTALL/usr/bin
+}

packages/addons/addon-depends/game-tools/ecm-tools/package.mk

@@ -9,7 +9,4 @@ PKG_SITE="https://github.com/alucryd/ecm-tools"
 PKG_URL="https://github.com/alucryd/ecm-tools/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Error Code Modeler.s"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/game-tools/iat/package.mk

@@ -9,9 +9,6 @@ PKG_SITE="https://sourceforge.net/projects/iat.berlios/"
 PKG_URL="https://sourceforge.net/projects/iat.berlios/files/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Iso9660 Analyzer Tool to detect many structures of image file."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk

@@ -9,9 +9,10 @@ PKG_SITE="http://sourceforge.net/projects/linuxconsole/"
 PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Set of utilities for joysticks and serial devices."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_MAKE_OPTS_TARGET="SYSTEMD_SUPPORT=0"
 
 makeinstall_target() {
-  :
+  make install PREFIX="/usr" DESTDIR="$INSTALL"
 }

packages/addons/addon-depends/jre-depends/apache-ant/package.mk

@@ -7,7 +7,7 @@ PKG_SHA256="a4adf371696089e1730d4f55fd4d0c6f3784dea1eee402fcc981f2330f8d6fc1"
 PKG_LICENSE="Apache License 2.0"
 PKG_SITE="https://ant.apache.org/"
 PKG_URL="https://archive.apache.org/dist/ant/source/${PKG_NAME}-${PKG_VERSION}-src.tar.xz"
-PKG_DEPENDS_HOST="jdk-x86_64-zulu:host"
+PKG_DEPENDS_UNPACK="jdk-x86_64-zulu"
 PKG_LONGDESC="Apache Ant is a Java library and command-line tool that help building software."
 PKG_TOOLCHAIN="manual"
 

packages/addons/addon-depends/jre-depends/jre-libXinerama/package.mk

@@ -7,6 +7,7 @@ PKG_NAME="jre-libXinerama"
 PKG_LONGDESC="libXinerama for JRE"
 PKG_URL=""
 PKG_DEPENDS_UNPACK+=" libXinerama"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET+=" --disable-static --enable-shared"
 
@@ -14,7 +15,3 @@ unpack() {
   mkdir -p $PKG_BUILD
   tar --strip-components=1 -xf $SOURCES/${PKG_NAME:4}/${PKG_NAME:4}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/jre-depends/jre-libbluray/package.mk

@@ -4,11 +4,12 @@
 . $(get_pkg_directory libbluray)/package.mk
 
 PKG_NAME="jre-libbluray"
-PKG_DEPENDS_TARGET+=" jdk-x86_64-zulu:host apache-ant:host"
+PKG_DEPENDS_TARGET+=" apache-ant:host"
 PKG_LONGDESC="libbluray jar for BD-J menus"
 PKG_URL=""
-PKG_DEPENDS_UNPACK+=" libbluray"
+PKG_DEPENDS_UNPACK+=" jdk-x86_64-zulu libbluray"
 PKG_PATCH_DIRS+=" $(get_pkg_directory libbluray)/patches"
+PKG_BUILD_FLAGS="-sysroot"
 
 unpack() {
   mkdir -p $PKG_BUILD
@@ -27,7 +28,3 @@ make_target() {
   make all-local
   )
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/lcdd-depends/libugpio/package.mk

@@ -7,7 +7,7 @@ PKG_SHA256="5093c34cdb891560b0807cb371521cf94fa5c090ee7a84779663b16c831b9e9e"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://github.com/mhei/libugpio"
 PKG_URL="https://github.com/mhei/$PKG_NAME/archive/v$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain linux"
+PKG_DEPENDS_TARGET="toolchain linux:host"
 PKG_LONGDESC="A software library to ease the use of linux kernel's sysfs gpio interface from C programs and/or other libraries."
 PKG_TOOLCHAIN="autotools"
 PKG_BUILD_FLAGS="+pic"

packages/addons/addon-depends/mpd-mpc/package.mk

@@ -10,7 +10,4 @@ PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libiconv libmpdclient"
 PKG_LONGDESC="Command-line client for MPD."
 PKG_TOOLCHAIN="meson"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk

@@ -8,10 +8,12 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="http://mediaarea.net/download/source/libmediainfo/${PKG_VERSION}/libmediainfo_${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libzen zlib"
+PKG_DEPENDS_CONFIG="libzen"
 PKG_LONGDESC="MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files"
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
 
-make_target() {
+configure_target() {
   cd Project/GNU/Library
   do_autoreconf
   ./configure \
@@ -21,15 +23,19 @@ make_target() {
         --disable-shared \
         --prefix=/usr \
         --enable-visibility
+}
+
+make_target() {
   make
 }
 
-post_makeinstall_target() {
+makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/include/MediaInfo
+  mkdir -p $INSTALL/usr/include/MediaInfo $INSTALL/usr/lib/pkgconfig
-  cp -aP ../../../Source/MediaInfo/* $SYSROOT_PREFIX/usr/include/MediaInfo
+  cp -aP ../../../Source/MediaInfo/*.h $INSTALL/usr/include/MediaInfo
   for i in Archive Audio Duplicate Export Image Multiple Reader Tag Text Video ; do
-    mkdir -p $SYSROOT_PREFIX/usr/include/MediaInfo/$i/
+    mkdir -p $INSTALL/usr/include/MediaInfo/$i/
-    cp -aP ../../../Source/MediaInfo/$i/*.h $SYSROOT_PREFIX/usr/include/MediaInfo/$i/
+    cp -aP ../../../Source/MediaInfo/$i/*.h $INSTALL/usr/include/MediaInfo/$i/
   done
-  cp -P libmediainfo-config $TOOLCHAIN/bin
+  cp -P .libs/* $INSTALL/usr/lib
+  cp -P libmediainfo.pc $INSTALL/usr/lib/pkgconfig
 }

packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk

@@ -10,8 +10,9 @@ PKG_URL="http://mediaarea.net/download/source/libzen/${PKG_VERSION}/libzen_${PKG
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files"
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
 
-make_target() {
+configure_target() {
   cd Project/GNU/Library
   do_autoreconf
   ./configure \
@@ -20,16 +21,19 @@ make_target() {
         --enable-static \
         --disable-shared \
         --prefix=/usr
+}
 
+make_target() {
   make
 }
 
-post_makeinstall_target() {
+makeinstall_target() {
-  mkdir -p $SYSROOT_PREFIX/usr/include/ZenLib
+  mkdir -p $INSTALL/usr/include/ZenLib $INSTALL/usr/lib/pkgconfig
-  cp -aP ../../../Source/ZenLib/*.h $SYSROOT_PREFIX/usr/include/ZenLib
+  cp -aP ../../../Source/ZenLib/*.h $INSTALL/usr/include/ZenLib
   for i in HTTP_Client Format/Html Format/Http ; do
-    mkdir -p $SYSROOT_PREFIX/usr/include/ZenLib/$i/
+    mkdir -p $INSTALL/usr/include/ZenLib/$i/
-    cp -aP ../../../Source/ZenLib/$i/*.h $SYSROOT_PREFIX/usr/include/ZenLib/$i/
+    cp -aP ../../../Source/ZenLib/$i/*.h $INSTALL/usr/include/ZenLib/$i/
   done
-  cp -P libzen-config $TOOLCHAIN/bin
+  cp -P .libs/* $INSTALL/usr/lib
+  cp -P libzen.pc $INSTALL/usr/lib/pkgconfig
 }

packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk

@@ -8,21 +8,24 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://mediaarea.net/en/MediaInfo/Download/Source"
 PKG_URL="http://mediaarea.net/download/source/mediainfo/${PKG_VERSION}/mediainfo_${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libmediainfo"
+PKG_DEPENDS_CONFIG="libzen libmediainfo"
 PKG_LONGDESC="A convenient unified display of the most relevant technical and tag data for video and audio files."
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
 
-pre_configure_target() {
+configure_target() {
-  export LDFLAGS="$LDFLAGS -L$(get_build_dir libmediainfo)/Project/GNU/Library/.libs -L$(get_build_dir libzen)/Project/GNU/Library/.libs"
-  export LIBS="-lmediainfo -lzen"
-}
-
-make_target() {
   cd Project/GNU/CLI
   do_autoreconf
-  echo $PATH
   ./configure \
         --host=$TARGET_NAME \
         --build=$HOST_NAME \
         --prefix=/usr
+}
+
+make_target() {
   make
 }
+
+makeinstall_target() {
+  make install DESTDIR=$INSTALL
+}

packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk

@@ -11,6 +11,7 @@ PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_VERSION/$PKG_NAME-$PKG_VE
 PKG_DEPENDS_TARGET="toolchain libX11 mesa glu glew"
 PKG_LONGDESC="Mesa 3D demos - installed are the well known glxinfo and glxgears."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--without-glut"
 

packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk

@@ -9,6 +9,7 @@ PKG_SITE="http://www.mpg123.org/"
 PKG_URL="http://downloads.sourceforge.net/sourceforge/mpg123/mpg123-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain alsa-lib"
 PKG_LONGDESC="A console based real time MPEG Audio Player for Layer 1, 2 and 3."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                            --enable-static"

packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk

@@ -10,6 +10,7 @@ PKG_URL="https://github.com/mpv-player/mpv/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm"
 PKG_LONGDESC="A media player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types."
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --disable-libsmbclient \

packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk

@@ -9,11 +9,13 @@ PKG_SITE="http://www.avalpa.com/the-key-values/15-free-software/33-opencaster"
 PKG_URL="http://ftp.de.debian.org/debian/pool/main/o/opencaster/opencaster_${PKG_VERSION}+dfsg.orig.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="A free and open source MPEG2 transport stream data generator and packet manipulator."
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
   PKG_MAKE_OPTS_TARGET="CC=$CC"
 }
 
-pre_makeinstall_target() {
+makeinstall_target() {
-  mkdir -p $INSTALL
+  mkdir -p $INSTALL/usr/bin
+  make install DESTDIR=$INSTALL/usr/bin
 }

packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk

@@ -8,13 +8,18 @@ PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/ralph-irving/squeezelite"
 PKG_URL="https://github.com/ralph-irving/squeezelite/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain faad2 ffmpeg flac libmad libvorbis mpg123 soxr libogg"
+PKG_DEPENDS_CONFIG="mpg123"
 PKG_LONGDESC="A client for the Logitech Media Server."
+PKG_BUILD_FLAGS="-sysroot"
 
-pre_make_target() {
+make_target() {
-  export OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT -DLINKALL"
+  make \
-  export LDFLAGS="$LDFLAGS -lFLAC -lvorbisfile -lvorbis -logg"
+    OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT -DLINKALL" \
+    CFLAGS="$CFLAGS $(pkg-config --cflags libmpg123 vorbisfile vorbis ogg)" \
+    LDFLAGS="$LDFLAGS $(pkg-config --libs libmpg123 vorbisfile vorbis ogg)"
 }
 
 makeinstall_target() {
-  :
+  mkdir -p $INSTALL/usr/bin
+  cp -p squeezelite $INSTALL/usr/bin
 }

packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk

@@ -10,6 +10,9 @@ PKG_SITE="http://georgi.unixsol.org/programs/tsdecrypt"
 PKG_URL="http://georgi.unixsol.org/programs/tsdecrypt/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libdvbcsa openssl"
 PKG_LONGDESC="A tool that reads incoming mpeg transport stream over UDP/RTP and then decrypts it using libdvbcsa/ffdecsa."
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"
 
 make_target() {
   make CC=$CC LINK="$LD -o"
@@ -18,7 +21,3 @@ make_target() {
 post_make_target() {
   make strip STRIP=$STRIP
 }
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk

@@ -10,15 +10,11 @@ PKG_SITE="https://github.com/kynesim/tstools"
 PKG_URL="https://github.com/kynesim/tstools/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="This is a set of cross-platform command line tools for working with MPEG data."
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=$TARGET_PREFIX prefix=/usr"
+PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}"
 
 pre_make_target() {
   make builddirs
 }
-
-make_target() {
-  make CROSS_COMPILE=$TARGET_PREFIX
-}
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/multimedia-tools-depends/tstools/patches/crossstrip.patch

@@ -0,0 +1,12 @@
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2015-10-30 17:34:51.000000000 +0100
++++ b/Makefile	2019-12-14 12:58:16.655141460 +0100
+@@ -43,7 +43,7 @@
+ man1dir=$(mandir)/man1
+ manext=.1
+ 
+-INSTALL=install
++INSTALL=install --strip-program=$(CROSS_COMPILE)strip
+ INSTALL_PROGRAM=$(INSTALL) -m 0555 -s
+ INSTALL_LIB=$(INSTALL) -m 0444 -s
+ INSTALL_DATA=$(INSTALL) -m 0444

packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk

@@ -10,6 +10,7 @@ PKG_URL="https://github.com/vgropp/bwm-ng/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses libstatgrab"
 PKG_LONGDESC="A small and simple console-based live network and disk io bandwidth monitor."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \
                            --with-time \
@@ -18,7 +19,3 @@ PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \
                            --with-sysctldisk \
                            --with-procnetdev \
                            --with-partitions"
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/network-tools-depends/iftop/package.mk

@@ -10,6 +10,7 @@ PKG_URL="http://www.ex-parrot.com/pdw/iftop/download/$PKG_NAME-$PKG_VERSION.tar.
 PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl"
 PKG_LONGDESC="A tool to display bandwidth usage on an interface."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
@@ -19,7 +20,3 @@ pre_build_target() {
 pre_configure_target() {
   export LIBS="-lpcap -lnl-3 -lnl-genl-3 -lncurses"
 }
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/network-tools-depends/iperf/package.mk

@@ -10,10 +10,7 @@ PKG_URL="https://github.com/esnet/iperf/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl"
 PKG_LONGDESC="A tool to measuring maximum TCP and UDP bandwidth performance."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --disable-shared"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/irssi/package.mk

@@ -9,6 +9,7 @@ PKG_SITE="http://www.irssi.org/"
 PKG_URL="https://github.com/irssi/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib ncurses openssl"
 PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
         --disable-glibtest \
@@ -21,7 +22,3 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
 pre_configure_target() {
   export CFLAGS="$CFLAGS -I$PKG_BUILD"
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/lftp/package.mk

@@ -9,13 +9,10 @@ PKG_SITE="http://lftp.yar.ru/"
 PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain readline openssl zlib libidn2"
 PKG_LONGDESC="A sophisticated ftp/http client, and a file transfer program supporting a number of network protocols."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
                            --without-gnutls \
                            --with-openssl \
                            --with-readline=$SYSROOT_PREFIX/usr \
                            --with-zlib=$SYSROOT_PREFIX/usr"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/ncftp/package.mk

@@ -9,6 +9,7 @@ PKG_SITE="http://www.ncftp.com/ncftp/"
 PKG_URL="ftp://ftp.ncftp.com/ncftp/ncftp-${PKG_VERSION}-src.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="NcFTP is a set of application programs implementing the File Transfer Protocol."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_librtmp_rtmp_h=yes \
             --enable-readline \
@@ -24,7 +25,3 @@ pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/ngrep/package.mk

@@ -10,6 +10,7 @@ PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap"
 PKG_LONGDESC="A tool like GNU grep applied to the network layer."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=$SYSROOT_PREFIX/usr/include \
                            --enable-ipv6 \
@@ -19,7 +20,3 @@ pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
   cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/nmap/package.mk

@@ -9,6 +9,7 @@ PKG_SITE="http://nmap.org/"
 PKG_URL="http://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain openssl"
 PKG_LONGDESC="Free Security Scanned for Network."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-pcap=linux \
@@ -26,7 +27,3 @@ pre_configure_target() {
 
   export CPPFLAGS="$CPPFLAGS -Iliblua"
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk

@@ -9,11 +9,12 @@ PKG_SITE="https://github.com/hasse69/rar2fs"
 PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v$PKG_VERSION/rar2fs-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse unrar"
 PKG_LONGDESC="FUSE file system for reading RAR archives"
+PKG_BUILD_FLAGS="-sysroot"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-unrar=$(get_build_dir unrar) \
+pre_configure_target() {
-                           --with-unrar-lib=$(get_build_dir unrar) \
+  PKG_CONFIGURE_OPTS_TARGET="--with-unrar=$PKG_BUILD/unrar \
+                             --with-unrar-lib=$PKG_BUILD/unrar \
                              --disable-static-unrar"
-
+  cp -a $(get_install_dir unrar)/usr/include/unrar $PKG_BUILD/
-makeinstall_target() {
+  cp -p $(get_install_dir unrar)/usr/lib/libunrar.a $PKG_BUILD/unrar/
-  :
 }

packages/addons/addon-depends/network-tools-depends/rsyncx/package.mk

@@ -1,15 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-. $(get_pkg_directory rsync)/package.mk
-
-PKG_NAME="rsyncx"
-PKG_DEPENDS_TARGET="toolchain"
-
-PKG_CONFIGURE_OPTS_TARGET="--disable-acl-support \
-                           --disable-xattr-support \
-                           --with-included-popt"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/sshfs/package.mk

@@ -9,7 +9,4 @@ PKG_SITE="https://github.com/libfuse/sshfs"
 PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-$PKG_VERSION/sshfs-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse glib"
 PKG_LONGDESC="A filesystem client based on the SSH File Transfer Protocol."
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk

@@ -8,6 +8,7 @@ PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap libtirpc"
 PKG_LONGDESC="A program that allows you to dump the traffic on a network."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-crypto=no"
 
@@ -23,7 +24,3 @@ post_configure_target() {
   # discard native system includes
   sed -i "s%-I/usr/include%%g" Makefile
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/udpxy/package.mk

@@ -9,11 +9,10 @@ PKG_SITE="http://www.udpxy.com"
 PKG_URL="http://www.udpxy.com/download/1_23/${PKG_NAME}.${PKG_VERSION}-prod.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A UDP-to-HTTP multicast traffic relay daemon."
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"
 
 configure_target() {
   export CFLAGS+=" -Wno-stringop-truncation"
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk

@@ -9,6 +9,7 @@ PKG_SITE="https://github.com/HewlettPackard/wireless-tools"
 PKG_URL="https://hewlettpackard.github.io/wireless-tools/$PKG_NAME.$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions."
+PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
   make PREFIX=/usr CC="$CC" AR="$AR" \
@@ -16,5 +17,5 @@ make_target() {
 }
 
 makeinstall_target() {
-  :
+  make PREFIX=$INSTALL/usr install-iwmulticall
 }

packages/addons/addon-depends/snapcast-depends/aixlog/package.mk

@@ -9,4 +9,6 @@ PKG_SITE="https://github.com/badaix/aixlog"
 PKG_URL="https://github.com/badaix/aixlog/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Header-only C++ logging library."
-PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_CMAKE_OPTS_TARGET="-DBUILD_EXAMPLE=OFF"

packages/addons/addon-depends/snapcast-depends/asio/package.mk

@@ -10,4 +10,11 @@ PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-$PKG_VERSION.zip"
 PKG_SOURCE_DIR="asio-asio-$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Asio C++ Library."
-PKG_TOOLCHAIN="manual"
+PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_CONFIGURE_OPTS_TARGET="--without-boost --without-openssl"
+
+post_unpack() {
+  mv $PKG_BUILD/asio/* $PKG_BUILD
+}

packages/addons/addon-depends/snapcast-depends/popl/package.mk

@@ -10,3 +10,9 @@ PKG_URL="https://github.com/badaix/popl/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Header-only C++ program options parser library."
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/include
+  cp -p $PKG_BUILD/include/popl.hpp $INSTALL/usr/include
+}

packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk

@@ -10,6 +10,7 @@ PKG_URL="https://github.com/mikebrady/shairport-sync/archive/$PKG_VERSION.tar.gz
 PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libconfig libdaemon openssl popt pulseaudio soxr"
 PKG_LONGDESC="AirPlay audio player."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-alsa \
                            --with-avahi \
@@ -19,8 +20,5 @@ PKG_CONFIGURE_OPTS_TARGET="--with-alsa \
                            --with-pipe \
                            --with-soxr \
                            --with-ssl=openssl \
-                           --with-stdout"
+                           --with-stdout \
-
+                           --without-configfiles"
-makeinstall_target() {
-  :
-}

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

@@ -10,16 +10,18 @@ PKG_URL="https://github.com/badaix/snapcast/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl"
 PKG_LONGDESC="Synchronous multi-room audio player."
 PKG_TOOLCHAIN="make"
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
   cd ..
   rm -rf .$TARGET_NAME
   CXXFLAGS="$CXXFLAGS -pthread \
-                      -I$(get_build_dir aixlog)/include \
+                      -I$(get_install_dir aixlog)/usr/include \
-                      -I$(get_build_dir asio)/asio/include \
+                      -I$(get_install_dir asio)/usr/include \
-                      -I$(get_build_dir popl)/include"
+                      -I$(get_install_dir popl)/usr/include"
 }
 
 makeinstall_target() {
-  :
+  mkdir -p $INSTALL/usr/bin
+  cp -p server/snapserver client/snapclient $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/autossh/package.mk

@@ -10,6 +10,7 @@ PKG_URL="http://www.harding.motd.ca/autossh/autossh-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Automatically restart SSH sessions and tunnels."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
                            ac_cv_func_realloc_0_nonnull=yes"
@@ -19,5 +20,6 @@ pre_configure_target() {
 }
 
 makeinstall_target() {
-  :
+  mkdir -p $INSTALL/usr/bin
+  cp -p autossh $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/diffutils/package.mk

@@ -10,12 +10,9 @@ PKG_URL="http://ftpmirror.gnu.org/diffutils/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A package of several programs related to finding differences between files."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
         --without-libsigsegv-prefix \
         --without-libiconv-prefix \
         --without-libintl-prefix"
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/system-tools-depends/dstat/package.mk

@@ -10,7 +10,13 @@ PKG_URL="https://github.com/dagwieers/dstat/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3"
 PKG_LONGDESC="Versatile resource statistics tool."
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
 
 post_unpack() {
-rm $PKG_BUILD/Makefile
+  rm $PKG_BUILD/Makefile
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/bin
+  cp -p dstat $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/dtach/package.mk

@@ -9,7 +9,9 @@ PKG_SITE="http://dtach.sourceforge.net"
 PKG_URL="https://github.com/crigler/dtach/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A program that emulates the detach feature of screen."
+PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  :
+  mkdir -p $INSTALL/usr/bin
+  cp -p dtach $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk

@@ -10,6 +10,7 @@ PKG_SITE="https://github.com/rhboot/efibootmgr"
 PKG_URL="https://github.com/rhboot/efibootmgr/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain efivar pciutils zlib"
 PKG_LONGDESC="Tool to modify UEFI Firmware Boot Manager Variables."
+PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
   export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include -I$SYSROOT_PREFIX/usr/include/efivar -fgnu89-inline -Wno-pointer-sign"
@@ -21,5 +22,6 @@ make_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  mkdir -p $INSTALL/usr/bin
+  cp -p src/efibootmgr $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/encfs/package.mk

@@ -9,11 +9,8 @@ PKG_SITE="https://vgough.github.io/encfs/"
 PKG_URL="https://github.com/vgough/encfs/releases/download/v$PKG_VERSION/encfs-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse openssl"
 PKG_LONGDESC="A Encrypted Filesystem for FUSE."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_PREFIX=/usr \
                        -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=$SYSROOT_PREFIX/usr/include \
                        -DBUILD_UNIT_TESTS=OFF"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/evtest/package.mk

@@ -10,7 +10,4 @@ PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.
 PKG_DEPENDS_TARGET="toolchain libxml2"
 PKG_LONGDESC="A simple tool for input event debugging."
 PKG_TOOLCHAIN="autotools"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/system-tools-depends/fdupes/package.mk

@@ -9,7 +9,7 @@ PKG_SITE="http://premium.caribe.net/~adrian2/fdupes.html"
 PKG_URL="https://github.com/adrianlopezroche/fdupes/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A program for identifying or deleting duplicate files residing within specified directories."
+PKG_BUILD_FLAGS="-sysroot"
 
-makeinstall_target() {
+PKG_MAKE_OPTS_TARGET="PREFIX=/usr"
-  : # nop
+PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}"
-}

packages/addons/addon-depends/system-tools-depends/file/package.mk

@@ -11,10 +11,7 @@ PKG_DEPENDS_HOST="toolchain:host"
 PKG_DEPENDS_TARGET="toolchain file:host zlib"
 PKG_LONGDESC="The file utility is used to determine the types of various files."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_HOST="--enable-fsect-man5 --enable-static --disable-shared"
 PKG_CONFIGURE_OPTS_TARGET="--enable-fsect-man5 --enable-static --disable-shared"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk

@@ -9,11 +9,13 @@ PKG_SITE="http://keytouch.sourceforge.net"
 PKG_URL="$SOURCEFORGE_SRC/keytouch/getscancodes-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Shows the scancode of the pressed or released key."
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_configure_target() {
   PKG_MAKE_OPTS_TARGET="CC=$CC"
 }
 
 makeinstall_target() {
-  : # nop
+  mkdir -p $INSTALL/usr/bin
+  cp -p getscancodes $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/hd-idle/package.mk

@@ -9,3 +9,4 @@ PKG_SITE="http://hd-idle.sourceforge.net/"
 PKG_URL="http://downloads.sourceforge.net/project/hd-idle/${PKG_NAME}-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A utility for spinning-down external disks after a period of idle time."
+PKG_BUILD_FLAGS="-sysroot"

packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk

@@ -9,13 +9,11 @@ PKG_SITE="https://savannah.nongnu.org/projects/hddtemp"
 PKG_URL="https://github.com/guzu/hddtemp/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A utility that gives you the temperature of your hard drive by reading S.M.A.R.T.."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db"
 
-post_unpack() {
+post_makeinstall_target() {
-  cp $PKG_DIR/db/* $PKG_BUILD
+  mkdir -p $INSTALL/usr/share/misc
-}
+  cp $PKG_DIR/db/* $INSTALL/usr/share/misc
-
-makeinstall_target() {
-  : # nop
 }

packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk

@@ -9,7 +9,9 @@ PKG_SITE="https://github.com/s-leroux/hid_mapper"
 PKG_URL="https://github.com/s-leroux/hid_mapper/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A Generic HID mapper."
+PKG_BUILD_FLAGS="-sysroot"
 
 makeinstall_target() {
-  : # nope
+  mkdir -p $INSTALL/usr/bin
+  cp -p hid_mapper $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/htop/package.mk

@@ -10,6 +10,7 @@ PKG_URL="https://github.com/hishamhm/htop/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="An interactive process viewer for Unix."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-unicode \
                            HTOP_NCURSES_CONFIG_SCRIPT=ncurses-config"

packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk

@@ -9,6 +9,7 @@ PKG_SITE="http://www.lm-sensors.org/wiki/I2CTools"
 PKG_URL="http://fossies.org/linux/misc/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host"
 PKG_LONGDESC="A heterogeneous set of I2C tools for Linux."
+PKG_BUILD_FLAGS="-sysroot"
 
 pre_make_target() {
   export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr"
@@ -20,11 +21,14 @@ make_target() {
         CC="$CC" \
         AR="$TARGET_AR" \
         CFLAGS="$TARGET_CFLAGS" \
-        CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION"
+        CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION" \
-
+        PYTHON=${TOOLCHAIN}/bin/python3
-  python_fix_abi .
 }
 
 makeinstall_target() {
-  : # nop
+  make  DESTDIR=${INSTALL} \
+        prefix="/usr" \
+        EXTRA="py-smbus" \
+        PYTHON=${TOOLCHAIN}/bin/python3 \
+        install
 }

packages/addons/addon-depends/system-tools-depends/i2c-tools/patches/pyinstalldir.patch

@@ -0,0 +1,12 @@
+diff -ur a/py-smbus/Module.mk b/py-smbus/Module.mk
+--- a/py-smbus/Module.mk	2014-02-20 09:37:15.711233000 +0100
++++ b/py-smbus/Module.mk	2019-12-14 08:20:51.730946457 +0100
+@@ -22,7 +22,7 @@
+ 	rm -rf py-smbus/build
+ 
+ install-python:
+-	$(DISTUTILS) install
++	$(DISTUTILS) install --prefix=$(DESTDIR)$(prefix)
+ 
+ all: all-python
+ 

packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk

@@ -10,13 +10,10 @@ PKG_URL="https://github.com/rvoicilas/inotify-tools/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A C library and a set of command-line programs for Linux providing a simple interface to inotify."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-doxygen"
 
 pre_configure_target() {
   CFLAGS="$CFLAGS -Wno-error=misleading-indentation"
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/jq/package.mk

@@ -9,13 +9,10 @@ PKG_SITE="http://stedolan.github.io/jq/"
 PKG_URL="https://github.com/stedolan/jq/releases/download/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain oniguruma"
 PKG_LONGDESC="A like sed for JSON data."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                            --enable-static \
                            --disable-docs \
                            --disable-maintainer-mode \
                            --disable-valgrind"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk

@@ -10,8 +10,7 @@ PKG_SITE="http://secure.netroedge.com/~lm78/"
 PKG_URL="https://github.com/groeck/lm-sensors/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Provides user-space support for the hardware monitoring drivers."
-
+PKG_BUILD_FLAGS="-sysroot"
-PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"
 
 pre_make_target() {
   PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR"
@@ -20,6 +19,6 @@ pre_make_target() {
   export CPPFLAGS="$TARGET_CPPFLAGS"
 }
 
-makeinstall_target() {
+pre_makeinstall_target() {
-  :
+  PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR"
 }

packages/addons/addon-depends/system-tools-depends/lshw/package.mk

@@ -9,11 +9,8 @@ PKG_SITE="http://ezix.org/project/wiki/HardwareLiSter"
 PKG_URL="http://ezix.org/software/files/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A small tool to provide detailed information on the hardware configuration of the machine."
+PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
   make CXX=$CXX -C src/
 }
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/system-tools-depends/mc/package.mk

@@ -10,6 +10,7 @@ PKG_SITE="http://www.midnight-commander.org"
 PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain gettext:host glib libssh2 libtool:host ncurses pcre"
 PKG_LONGDESC="Midnight Commander is a text based filemanager that emulates Norton Commander."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET=" \
   --datadir=/storage/.kodi/addons/virtual.system-tools/data \
@@ -44,5 +45,5 @@ post_makeinstall_target() {
   rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.*
   mv $INSTALL/usr/bin/mc $INSTALL/usr/bin/mc-bin
   rm -f $INSTALL/usr/bin/{mcedit,mcview}
-  cp $PKG_DIR/wrapper/* $INSTALL/usr/bin
+  cp -p $PKG_DIR/wrapper/* $INSTALL/usr/bin
 }

packages/addons/addon-depends/system-tools-depends/mrxvt/package.mk

@@ -11,6 +11,7 @@ PKG_URL="$SOURCEFORGE_SRC/materm/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libX11"
 PKG_LONGDESC="A lightweight and powerful multi-tabbed X terminal emulator based on the popular rxvt and aterm."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_setpgrp_void=no \
             --enable-minimal \
@@ -47,7 +48,3 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_setpgrp_void=no \
             --disable-xim \
             --disable-utempter\
             --with-term=xterm"
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk

@@ -10,6 +10,7 @@ PKG_URL="https://github.com/cjd/mtpfs/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain fuse glib libmtp"
 PKG_LONGDESC="MTPfs is a FUSE filesystem that supports reading and writing from any MTP device."
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-mad"
 
@@ -17,7 +18,3 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-mad"
 pre_configure_target() {
   export LIBS="-lusb-1.0 -ludev"
 }
-
-makeinstall_target() {
-  : # nop
-}

packages/addons/addon-depends/system-tools-depends/nmon/package.mk

@@ -10,6 +10,7 @@ PKG_URL="https://github.com/axibase/nmon/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Systems administrator, tuner, benchmark tool gives you a huge amount of important performance information in one go."
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="-sysroot"
 
 make_target() {
   case $ARCH in
@@ -24,3 +25,8 @@ make_target() {
   LDFLAGS="$LDFLAGS -lncurses -lm -g"
   $CC -o nmon lmon*.c $CFLAGS $LDFLAGS -D $arch -D KERNEL_2_6_18
 }
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/bin
+  cp -p nmon $INSTALL/usr/bin
+}

packages/addons/addon-depends/system-tools-depends/patch/package.mk

@@ -9,9 +9,6 @@ PKG_SITE="http://savannah.gnu.org/projects/patch/"
 PKG_URL="http://ftpmirror.gnu.org/patch/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Patch takes a patch file containing a difference listing produced by the diff."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-xattr"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/pv/package.mk

@@ -9,9 +9,6 @@ PKG_SITE="http://www.ivarch.com/programs/pv.shtml"
 PKG_URL="http://www.ivarch.com/programs/sources/pv-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Pipe Viwer can be inserted into any normal pipeline between two processes."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static-nls"
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/screen/package.mk

@@ -9,7 +9,7 @@ PKG_SITE="http://www.gnu.org/software/screen/"
 PKG_URL="http://ftpmirror.gnu.org/screen/$PKG_NAME-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"
-PKG_BUILD_FLAGS="-parallel"
+PKG_BUILD_FLAGS="-parallel -sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                            --enable-colors256 \
@@ -26,7 +26,3 @@ pre_configure_target() {
   cd $PKG_BUILD
     rm -rf .$TARGET_NAME
 }
-
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk

@@ -9,6 +9,7 @@ PKG_SITE="https://www.smartmontools.org"
 PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Control and monitor storage systems using S.M.A.R.T."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --without-initscriptdir \
@@ -17,7 +18,3 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
                            --without-systemdsystemunitdir \
                            --without-systemdenvfile \
                            --without-systemdsystemunitdir"
-
-makeinstall_target() {
-  :
-}