system-tools: cleanup and use the "sysroot" build flag

Use the new flag instead of stubbing "makeinstall_target()" to avoid polluting
sysroot. For packages without the means to "make install", add a
makeinstall_target() function to populate install_pkg.

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

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

@@ -10,7 +10,4 @@ PKG_URL="https://strace.io/files/$PKG_VERSION/strace-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="strace is a diagnostic, debugging and instructional userspace utility"
 PKG_TOOLCHAIN="autotools"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk

@@ -9,3 +9,4 @@ PKG_SITE="http://kernel.ubuntu.com/~cking/stress-ng/"
 PKG_URL="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain attr keyutils libaio libcap zlib"
 PKG_LONGDESC="stress-ng will stress test a computer system in various selectable ways"
+PKG_BUILD_FLAGS="-sysroot"

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

@@ -10,7 +10,7 @@ PKG_URL="http://www.rarlab.com/rar/unrarsrc-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="unrar extract, test and view RAR archives"
 PKG_TOOLCHAIN="manual"
-PKG_BUILD_FLAGS="+pic"
+PKG_BUILD_FLAGS="+pic -sysroot"
 
 make_target() {
   make CXX="$CXX" \
@@ -32,3 +32,10 @@ make_target() {
 post_make_target() {
   rm -f libunrar.so
 }
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/include/unrar  $INSTALL/usr/lib $INSTALL/usr/bin
+  cp -p *.hpp $INSTALL/usr/include/unrar/
+  cp -p libunrar.a $INSTALL/usr/lib/
+  cp -p unrar $INSTALL/usr/bin/
+}

packages/addons/addon-depends/system-tools-depends/usb-modeswitch/package.mk

@@ -9,7 +9,4 @@ PKG_SITE="http://www.draisberghof.de/usb_modeswitch/"
 PKG_URL="http://www.draisberghof.de/usb_modeswitch/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_LONGDESC="USB_ModeSwitch - Handling Mode-Switching USB Devices on Linux"
-
+PKG_BUILD_FLAGS="-sysroot"
-makeinstall_target() {
-  :
-}

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

@@ -9,6 +9,7 @@ PKG_SITE="http://www.vim.org/"
 PKG_URL="https://github.com/vim/vim/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="Vim is a highly configurable text editor built to enable efficient text editing."
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="vim_cv_getcwd_broken=no \
                            vim_cv_memmove_handles_overlap=yes \

packages/addons/tools/system-tools/package.mk

@@ -59,116 +59,116 @@ addon() {
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/data/
   mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
     # autossh
-    cp -P $(get_build_dir autossh)/.$TARGET_NAME/autossh $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir autossh)/usr/bin/autossh $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # diffutils
-    cp -P $(get_build_dir diffutils)/.$TARGET_NAME/src/cmp $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir diffutils)/usr/bin/cmp $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir diffutils)/.$TARGET_NAME/src/diff $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir diffutils)/usr/bin/diff $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir diffutils)/.$TARGET_NAME/src/diff3 $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir diffutils)/usr/bin/diff3 $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir diffutils)/.$TARGET_NAME/src/sdiff $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir diffutils)/usr/bin/sdiff $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # dstat
-    cp -P $(get_build_dir dstat)/dstat $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir dstat)/usr/bin/dstat $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # dtach
-    cp -P $(get_build_dir dtach)/.$TARGET_NAME/dtach $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir dtach)/usr/bin/dtach $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # efibootmgr
-    cp -P $(get_build_dir efibootmgr)/src/efibootmgr $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
+    cp -P $(get_install_dir efibootmgr)/usr/bin/efibootmgr $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
 
     # encfs
-    cp -P $(get_build_dir encfs)/.$TARGET_NAME/encfs $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir encfs)/usr/bin/encfs $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir encfs)/.$TARGET_NAME/encfsctl $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir encfs)/usr/bin/encfsctl $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # evtest
-    cp -P $(get_build_dir evtest)/.$TARGET_NAME/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir evtest)/usr/bin/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # fdupes
-    cp -P $(get_build_dir fdupes)/fdupes $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir fdupes)/usr/bin/fdupes $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # file
-    cp -P $(get_build_dir file)/.$TARGET_NAME/src/file $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir file)/usr/bin/file $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir file)/.$TARGET_NAME/magic/magic.mgc $ADDON_BUILD/$PKG_ADDON_ID/data
+    cp -P $(get_install_dir file)/usr/share/misc/magic.mgc $ADDON_BUILD/$PKG_ADDON_ID/data
 
     # getscancodes
-    cp -P $(get_build_dir getscancodes)/getscancodes $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir getscancodes)/usr/bin/getscancodes $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # hddtemp
-    cp -P $(get_build_dir hddtemp)/.$TARGET_NAME/src/hddtemp $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir hddtemp)/usr/sbin/hddtemp $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir hddtemp)/hddtemp.db $ADDON_BUILD/$PKG_ADDON_ID/data
+    cp -P $(get_install_dir hddtemp)/usr/share/misc/hddtemp.db $ADDON_BUILD/$PKG_ADDON_ID/data
 
     # hd-idle
-    cp -P $(get_build_dir hd-idle)/hd-idle $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir hd-idle)/usr/sbin/hd-idle $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # hid_mapper
-    cp -P $(get_build_dir hid_mapper)/hid_mapper $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir hid_mapper)/usr/bin/hid_mapper $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # htop
     cp -P $(get_install_dir htop)/usr/bin/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # i2c-tools
-    cp -P $(get_build_dir i2c-tools)/tools/i2cdetect $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir i2c-tools)/usr/sbin/i2cdetect $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir i2c-tools)/tools/i2cdump $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir i2c-tools)/usr/sbin/i2cdump $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir i2c-tools)/tools/i2cget $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir i2c-tools)/usr/sbin/i2cget $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir i2c-tools)/tools/i2cset $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir i2c-tools)/usr/sbin/i2cset $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir i2c-tools)/py-smbus/build/lib.linux-*/smbus.so $ADDON_BUILD/$PKG_ADDON_ID/lib
+    cp -P $(get_install_dir i2c-tools)/usr/lib/$PKG_PYTHON_VERSION/site-packages/smbus.so $ADDON_BUILD/$PKG_ADDON_ID/lib
 
     # inotify-tools
-    cp -P $(get_build_dir inotify-tools)/.$TARGET_NAME/src/inotifywait $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir inotify-tools)/usr/bin/inotifywait $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir inotify-tools)/.$TARGET_NAME/src/inotifywatch $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir inotify-tools)/usr/bin/inotifywatch $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # jq
-    cp -P $(get_build_dir jq)/.$TARGET_NAME/jq $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir jq)/usr/bin/jq $ADDON_BUILD/$PKG_ADDON_ID/bin
     cp -P $(get_install_dir oniguruma)/usr/lib/libonig.so $ADDON_BUILD/$PKG_ADDON_ID/lib
 
     # lm_sensors
-    cp -P $(get_build_dir lm_sensors)/prog/sensors/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
+    cp -P $(get_install_dir lm_sensors)/usr/bin/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
 
     # lshw
-    cp -P $(get_build_dir lshw)/src/lshw $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir lshw)/usr/sbin/lshw $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # mc
     cp -Pa $(get_install_dir mc)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/
     cp -Pa $(get_install_dir mc)/storage/.kodi/addons/virtual.system-tools/* $ADDON_BUILD/$PKG_ADDON_ID
 
     # mrxvt
-    cp -P $(get_build_dir mrxvt)/.$TARGET_NAME/src/mrxvt $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
+    cp -P $(get_install_dir mrxvt)/usr/bin/mrxvt $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
 
     # mtpfs
-    cp -P $(get_build_dir mtpfs)/.$TARGET_NAME/mtpfs $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir mtpfs)/usr/bin/mtpfs $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
     # nmon
-    cp -P $(get_build_dir nmon)/nmon $ADDON_BUILD/$PKG_ADDON_ID/bin/
+    cp -P $(get_install_dir nmon)/usr/bin/nmon $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
     # p7zip
-    cp -P $(get_build_dir p7zip)/.$TARGET_NAME/bin/7z.so $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir p7zip)/usr/bin/7z.so $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -PR $(get_build_dir p7zip)/.$TARGET_NAME/bin/Codecs $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -PR $(get_install_dir p7zip)/usr/bin/Codecs $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir p7zip)/.$TARGET_NAME/bin/7z $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir p7zip)/usr/bin/7z $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_build_dir p7zip)/.$TARGET_NAME/bin/7za $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir p7zip)/usr/bin/7za $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # patch
-    cp -P $(get_build_dir patch)/.$TARGET_NAME/src/patch $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir patch)/usr/bin/patch $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # pv
-    cp -P $(get_build_dir pv)/.$TARGET_NAME/pv $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir pv)/usr/bin/pv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # screen
-    cp -P $(get_build_dir screen)/screen $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -L $(get_install_dir screen)/usr/bin/screen $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # smartmontools
-    cp -P $(get_build_dir smartmontools)/.$TARGET_NAME/smartctl $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir smartmontools)/usr/sbin/smartctl $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # strace
-    cp -P $(get_build_dir strace)/.$TARGET_NAME/strace $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir strace)/usr/bin/strace $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # stress-ng
     cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # unrar
-    cp -P $(get_build_dir unrar)/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir unrar)/usr/bin/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # usb-modeswitch
-    cp -P $(get_build_dir usb-modeswitch)/usb_modeswitch $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir usb-modeswitch)/usr/sbin/usb_modeswitch $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # vim
     cp -P $(get_install_dir vim)/usr/bin/vim $ADDON_BUILD/$PKG_ADDON_ID/bin

packages/compress/p7zip/package.mk

@@ -36,3 +36,11 @@ pre_build_target() {
 make_target() {
   make CXX=$CXX CC=$CC -C $PKG_BUILD/.$TARGET_NAME 7z 7za
 }
+
+makeinstall_target() {
+  mkdir -p $INSTALL/usr/bin
+    cp -p $PKG_BUILD/.$TARGET_NAME/bin/7z.so $INSTALL/usr/bin
+    cp -pr $PKG_BUILD/.$TARGET_NAME/bin/Codecs $INSTALL/usr/bin
+    cp -p $PKG_BUILD/.$TARGET_NAME/bin/7z $INSTALL/usr/bin
+    cp -p $PKG_BUILD/.$TARGET_NAME/bin/7za $INSTALL/usr/bin
+}