diff --git a/packages/addons/addon-depends/system-tools-depends/ytop/package.mk b/packages/addons/addon-depends/system-tools-depends/ytop/package.mk deleted file mode 100644 index 87ad992b67..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/ytop/package.mk +++ /dev/null @@ -1,25 +0,0 @@ -# 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 -} diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index 3dfe7de085..fea5cf4dfc 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -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, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, strace, stress-ng, unrar, usb-modeswitch, vim and ytop." +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, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, strace, stress-ng, unrar, usb-modeswitch and vim." PKG_IS_ADDON="yes" PKG_ADDON_NAME="System Tools" @@ -48,8 +48,7 @@ PKG_DEPENDS_TARGET="toolchain \ stress-ng \ unrar \ usb-modeswitch \ - vim \ - ytop" + vim" if [ "$TARGET_ARCH" = "x86_64" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr st" @@ -164,7 +163,4 @@ 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 }