Merge pull request #4441 from CvH/10.0/system-tools-update

system tools update

packages/addons/addon-depends/librespot-depends/rust/package.mk

@@ -2,7 +2,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rust"
-PKG_VERSION="1.39.0"
+PKG_VERSION="1.44.1"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_DEPENDS_TARGET="toolchain rustup.rs"

packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="rustup.rs"
-PKG_VERSION="1.20.2"
-PKG_SHA256="28207ee4c2d66840ca903df152b23b916326a5d3eeb643a1de0f24a16afa4209"
+PKG_VERSION="1.21.1"
+PKG_SHA256="3dd54cb15313ff01c930ad4e36326f7d60caadd2d6707790d83bea26fbb8bbe1"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/$PKG_VERSION.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="diffutils"
-PKG_VERSION="3.6"
-PKG_SHA256="d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6"
+PKG_VERSION="3.7"
+PKG_SHA256="b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/diffutils/"
 PKG_URL="http://ftpmirror.gnu.org/diffutils/$PKG_NAME-$PKG_VERSION.tar.xz"

packages/addons/addon-depends/system-tools-depends/diffutils/patches/diffutils-002-explicitly-disable-replacing-getopt.patch

@@ -1,26 +0,0 @@
-http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-extended/diffutils/diffutils-3.6
-
-Subject: explicitly disable replacing getopt
-
-Explicitly disable replacing getopt to avoid compilation error like below.
-
-  xstrtol-error.c:84:26: error: invalid use of undefined type 'struct rpl_option'
-
-diff --git a/m4/getopt.m4 b/m4/getopt.m4
-index 3ebc7b7..8934426 100644
---- a/m4/getopt.m4
-+++ b/m4/getopt.m4
-@@ -22,8 +22,8 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX],
-     fi
-   ])
-   if test $REPLACE_GETOPT = 1; then
--    dnl Arrange for getopt.h to be created.
--    gl_GETOPT_SUBSTITUTE_HEADER
-+    dnl Explicitly disable replacing getopt
-+    :
-   fi
- ])
- 
--- 
-2.11.0
-

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="efibootmgr"
-PKG_VERSION="d9eb7f1536ed6262fc8c6518c6afe6053a450e9d"
-PKG_SHA256="4c86873c09849b94358859f4cceb27b6c5a3a8576146e282fa22af7a06c137ec"
+PKG_VERSION="edc8b9b6ec1c7751ccb9a483405c99141ba237fc"
+PKG_SHA256="e951ce9e0534c63bb71ba8b2a3830d4402e51440cb4d524d18c1ef40ae5ee218"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/rhboot/efibootmgr"

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="evtest"
-PKG_VERSION="1.33"
-PKG_SHA256="5037d1162f4c407053cd97e85763ba03150a0c35f929ee9bf9a360abd32ef1c1"
+PKG_VERSION="1.34"
+PKG_SHA256="8e2431cdc83587925048157a5772aa0c79b79a64ae5815bf004634cbe53597d0"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/evtest/"
-PKG_URL="http://cgit.freedesktop.org/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libxml2"
 PKG_LONGDESC="A simple tool for input event debugging."
 PKG_TOOLCHAIN="autotools"

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

@@ -2,14 +2,15 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="fdupes"
-PKG_VERSION="1.6.1"
-PKG_SHA256="9d6b6fdb0b8419815b4df3bdfd0aebc135b8276c90bbbe78ebe6af0b88ba49ea"
+PKG_VERSION="2.0.0"
+PKG_SHA256="eb9e3bd3e722ebb2a272e45a1073f78c60f8989b151c3661421b86b14b203410"
 PKG_LICENSE="GPL"
 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_URL="https://github.com/adrianlopezroche/fdupes/releases/download/${PKG_VERSION}/fdupes-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_LONGDESC="A program for identifying or deleting duplicate files residing within specified directories."
 PKG_BUILD_FLAGS="-sysroot"
 
+PKG_CONFIGURE_OPTS_TARGET="--without-ncurses"
 PKG_MAKE_OPTS_TARGET="PREFIX=/usr"
 PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="file"
-PKG_VERSION="d1ff3af7a2c6b38bdbdde7af26b59e3c50a48fff"
-PKG_SHA256="acc16f878576ad0bb29bbb7c724e29d2827f14ddb39fe94d76c3a859d4a3d0d9"
+PKG_VERSION="87731415de945660b00f02207d8e9d986ef9b82e"
+PKG_SHA256="8cb394b99ff9979bfa042e2daff404e9f65df18ec0045b901e91c024583e3f15"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.darwinsys.com/file/"
 PKG_URL="https://github.com/file/file/archive/${PKG_VERSION}.tar.gz"
@@ -13,5 +13,8 @@ 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"
+PKG_CONFIGURE_OPTS_HOST="--enable-fsect-man5 \
+                         --enable-static \
+                         --disable-shared"
+
+PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_HOST}"

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

@@ -2,11 +2,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="lshw"
-PKG_VERSION="B.02.18"
-PKG_SHA256="ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f"
+PKG_VERSION="B.02.19.2"
+PKG_SHA256="9bb347ac87142339a366a1759ac845e3dbb337ec000aa1b99b50ac6758a80f80"
 PKG_LICENSE="GPL"
 PKG_SITE="http://ezix.org/project/wiki/HardwareLiSter"
-PKG_URL="http://ezix.org/software/files/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://ezix.org/software/files/lshw-${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"

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

@@ -2,14 +2,14 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="screen"
-PKG_VERSION="4.6.2"
-PKG_SHA256="1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a"
+PKG_VERSION="4.8.0"
+PKG_SHA256="6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1"
 PKG_LICENSE="GPL"
 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 -sysroot"
+PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                            --enable-colors256 \
@@ -18,11 +18,3 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                            --disable-telnet \
                            --disable-socket-dir"
 
-pre_configure_target() {
-  CFLAGS="$CFLAGS -DTERMINFO"
-  export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
-
-# screen fails to build in subdirs
-  cd $PKG_BUILD
-    rm -rf .$TARGET_NAME
-}

packages/addons/addon-depends/system-tools-depends/screen/patches/screen-cross-compile.patch

@@ -1,64 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -414,7 +414,7 @@ as_fn_error ()
-     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
-   $as_echo "$as_me: error: $2" >&2
--  as_fn_exit $as_status
-+  # as_fn_exit $as_status
- } # as_fn_error
- 
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -5941,8 +5941,6 @@ else
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
--test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
--test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
- oldlibs="$LIBS"
- LIBS="$LIBS -lsun"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking IRIX sun library..." >&5
-@@ -7023,7 +7021,7 @@ as_fn_error ()
-     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-   fi
-   $as_echo "$as_me: error: $2" >&2
--  as_fn_exit $as_status
-+  # as_fn_exit $as_status
- } # as_fn_error
- 
- 
---- a/pty.c
-+++ b/pty.c
-@@ -39,9 +39,9 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_STROPTS_H
--# include <sys/stropts.h>
--#endif
-+//#ifdef HAVE_STROPTS_H
-+//# include <sys/stropts.h>
-+//#endif
- 
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
---- a/sched.h
-+++ b/sched.h
-@@ -27,6 +27,11 @@
-  * $Id$ GNU
-  */
- 
-+#ifndef __SCHED_H
-+#define __SCHED_H
-+
-+#include <sys/time.h>
-+
- struct event
- {
-   struct event *next;
-@@ -46,3 +51,5 @@ struct event
- #define EV_READ		1
- #define EV_WRITE	2
- #define EV_ALWAYS	3
-+
-+#endif

packages/addons/addon-depends/system-tools-depends/screen/patches/screen-dont_link_against_libelf.patch

@@ -1,22 +0,0 @@
-diff -Naur screen-4.3.1/configure screen-4.3.1.patch/configure
---- screen-4.3.1/configure	2015-06-28 23:42:40.000000000 +0200
-+++ screen-4.3.1.patch/configure	2016-03-26 17:52:12.807054501 +0100
-@@ -4156,7 +4156,6 @@
- 
- 
- oldlibs="$LIBS"
--LIBS="$LIBS -lelf"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking SVR4..." >&5
- $as_echo "$as_me: checking SVR4..." >&6;}
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-diff -Naur screen-4.3.1/configure.ac screen-4.3.1.patch/configure.ac
---- screen-4.3.1/configure.ac	2015-06-28 23:22:55.000000000 +0200
-+++ screen-4.3.1.patch/configure.ac	2016-03-26 17:52:03.538036990 +0100
-@@ -203,7 +203,6 @@
- ], LIBS="$LIBS -lsocket -linet";seqptx=1)
- 
- oldlibs="$LIBS"
--LIBS="$LIBS -lelf"
- AC_CHECKING(SVR4)
- AC_TRY_LINK([#include <utmpx.h>
- ],,

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="strace"
-PKG_VERSION="5.4"
-PKG_SHA256="f7d00514d51290b6db78ad7a9de709baf93caa5981498924cbc9a744cfd2a741"
+PKG_VERSION="5.7"
+PKG_SHA256="b284b59f9bcd95b9728cea5bd5c0edc5ebe360af73dc76fbf6334f11c777ccd8"
 PKG_LICENSE="BSD"
 PKG_SITE="https://strace.io/"
 PKG_URL="https://strace.io/files/$PKG_VERSION/strace-$PKG_VERSION.tar.xz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="stress-ng"
-PKG_VERSION="0.09.50"
-PKG_SHA256="b07290495794092cdf2f8d51ac631f28b8cec9455a16552d8ca48bc1f376c634"
+PKG_VERSION="0.11.14"
+PKG_SHA256="b21436fdbd9dc482a3fd95ae27cccf0097d0f226361ea3785215f7a4ad50136b"
 PKG_LICENSE="GPLv2"
 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"

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

@@ -2,30 +2,35 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="unrar"
-PKG_VERSION="5.6.8"
-PKG_SHA256="a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff"
+PKG_VERSION="5.9.3"
+PKG_SHA256="28c176c29da86d7efe3cb9a227255d8340f761ba95969195982ec87c8eb2dd69"
 PKG_LICENSE="free"
-PKG_SITE="http://www.rarlab.com"
-PKG_URL="http://www.rarlab.com/rar/unrarsrc-$PKG_VERSION.tar.gz"
+PKG_SITE="https://www.rarlab.com/rar_add.htm"
+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 -sysroot"
 
+unpack() {
+  mkdir -p $PKG_BUILD/unrar lib
+  tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz -C $PKG_BUILD/
+  cp -a $PKG_BUILD/unrar $PKG_BUILD/lib
+}
+
 make_target() {
   make CXX="$CXX" \
      CXXFLAGS="$TARGET_CXXFLAGS" \
      RANLIB="$RANLIB" \
      AR="$AR" \
-     STRIP="$STRIP" \
-     -f makefile unrar
-
-  make clean
+     -C unrar \
+     -f makefile
 
   make CXX="$CXX" \
      CXXFLAGS="$TARGET_CXXFLAGS" \
      RANLIB="$RANLIB" \
      AR="$AR" \
+     -C lib \
      -f makefile lib
 }
 
@@ -34,8 +39,8 @@ post_make_target() {
 }
 
 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/
+  mkdir -p $INSTALL/usr/include/unrar $INSTALL/usr/lib $INSTALL/usr/bin
+  cp -p lib/*.hpp $INSTALL/usr/include/unrar/
+  cp -p lib/libunrar.a $INSTALL/usr/lib/
+  cp -p unrar/unrar $INSTALL/usr/bin/
 }

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

@@ -0,0 +1,25 @@
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="ytop"
+PKG_VERSION="0.6.2"
+PKG_SHA256="d9fd6ce00e27de894bc0790947fbeab40e81e34afa5ead5a53d126c458d50e99"
+PKG_LICENSE="MIT"
+PKG_SITE="https://github.com/cjbassi/ytop"
+PKG_URL="https://github.com/cjbassi/ytop/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain rust"
+PKG_LONGDESC="A TUI system monitor written in Rust."
+PKG_TOOLCHAIN="manual"
+
+make_target() {
+  . "$(get_build_dir rust)/cargo/env"
+  cargo build \
+    --release \
+    --locked \
+    --all-features
+}
+
+makeinstall_target() {
+  mkdir -p $INSTALL
+  cp $PKG_BUILD/.$TARGET_NAME/*/release/ytop $INSTALL
+}

packages/addons/tools/system-tools/changelog.txt

@@ -1,3 +1,17 @@
+114
+- added ytop
+- fixed 7z
+- updated diffutils to 3.7
+- updated efibootmgr to 2020-04-27
+- updated evtest to 1.34
+- updated fdupes to 2.0.0
+- updated file to 5.39
+- updated lshw to 2.19.2
+- updated screen to 4.8.0
+- updated strace to 5.7
+- updated stress-ng to 0.11.14
+- updated unrar to 5.9.3
+
 113
 - update strace to 5.4
 

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="system-tools"
 PKG_VERSION="1.0"
-PKG_REV="113"
+PKG_REV="114"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -11,7 +11,7 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of system tools and programs"
-PKG_LONGDESC="This bundle currently includes autossh, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, lm_sensors, lshw, mc, mrxvt, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, strace, stress-ng, unrar, usb-modeswitch and vim."
+PKG_LONGDESC="This bundle currently includes autossh, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, lm_sensors, lshw, mc, mrxvt, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, strace, stress-ng, unrar, usb-modeswitch, vim and ytop."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="System Tools"
@@ -48,24 +48,21 @@ PKG_DEPENDS_TARGET="toolchain \
                     stress-ng \
                     unrar \
                     usb-modeswitch \
-                    vim"
+                    vim \
+                    ytop"
 
 if [ "$TARGET_ARCH" = "x86_64" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr mrxvt"
 fi
 
 addon() {
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/data/
-  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,data,lib}
+
     # autossh
     cp -P $(get_install_dir autossh)/usr/bin/autossh $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # diffutils
-    cp -P $(get_install_dir diffutils)/usr/bin/cmp $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir diffutils)/usr/bin/diff $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir diffutils)/usr/bin/diff3 $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir diffutils)/usr/bin/sdiff $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir diffutils)/usr/bin/{cmp,diff,diff3,sdiff} $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # dstat
     cp -P $(get_install_dir dstat)/usr/bin/dstat $ADDON_BUILD/$PKG_ADDON_ID/bin
@@ -77,8 +74,7 @@ addon() {
     cp -P $(get_install_dir efibootmgr)/usr/bin/efibootmgr $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
 
     # encfs
-    cp -P $(get_install_dir encfs)/usr/bin/encfs $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir encfs)/usr/bin/encfsctl $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir encfs)/usr/bin/{encfs,encfsctl} $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # evtest
     cp -P $(get_install_dir evtest)/usr/bin/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
@@ -107,15 +103,11 @@ addon() {
     cp -P $(get_install_dir htop)/usr/bin/htop $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # i2c-tools
-    cp -P $(get_install_dir i2c-tools)/usr/sbin/i2cdetect $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_install_dir i2c-tools)/usr/sbin/i2cget $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_install_dir i2c-tools)/usr/sbin/{i2cdetect,i2cdump,i2cget,i2cset} $ADDON_BUILD/$PKG_ADDON_ID/bin
     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_install_dir inotify-tools)/usr/bin/inotifywait $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir inotify-tools)/usr/bin/inotifywatch $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_install_dir inotify-tools)/usr/bin/{inotifywait,inotifywatch} $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # jq
     cp -P $(get_install_dir jq)/usr/bin/jq $ADDON_BUILD/$PKG_ADDON_ID/bin
@@ -141,10 +133,9 @@ addon() {
     cp -P $(get_install_dir nmon)/usr/bin/nmon $ADDON_BUILD/$PKG_ADDON_ID/bin/
 
     # p7zip
-    cp -P $(get_install_dir p7zip)/usr/bin/7z.so $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -PR $(get_install_dir p7zip)/usr/bin/Codecs $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir p7zip)/usr/bin/7z $ADDON_BUILD/$PKG_ADDON_ID/bin
-    cp -P $(get_install_dir p7zip)/usr/bin/7za $ADDON_BUILD/$PKG_ADDON_ID/bin
+    mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip
+    cp -P $(get_install_dir p7zip)/usr/bin/{7z,7za,7z.so} $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip
+    cp -PR $(get_install_dir p7zip)/usr/bin/Codecs $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip
 
     # patch
     cp -P $(get_install_dir patch)/usr/bin/patch $ADDON_BUILD/$PKG_ADDON_ID/bin
@@ -173,4 +164,7 @@ addon() {
     # vim
     cp -P $(get_install_dir vim)/usr/bin/vim $ADDON_BUILD/$PKG_ADDON_ID/bin
     cp -Pa $(get_install_dir vim)/storage/.kodi/addons/virtual.system-tools/data/vim/ $ADDON_BUILD/$PKG_ADDON_ID/data
+
+    # ytop
+    cp -P $(get_install_dir ytop)/ytop $ADDON_BUILD/$PKG_ADDON_ID/bin
 }

packages/addons/tools/system-tools/source/bin/7z

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /storage/.kodi/addons/virtual.system-tools/lib/p7zip/7z "$@"

packages/addons/tools/system-tools/source/bin/7za

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /storage/.kodi/addons/virtual.system-tools/lib/p7zip/7za "$@"