diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt index 71aefda845..e89f87b4d0 100644 --- a/packages/addons/tools/system-tools/changelog.txt +++ b/packages/addons/tools/system-tools/changelog.txt @@ -1,3 +1,6 @@ +121 +- remove strace + 120 - htop: update to 3.0.5 - i2c-tools: fix runtime libraries diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index ae9647c73c..f0209e7fa7 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="system-tools" PKG_VERSION="1.0" -PKG_REV="120" +PKG_REV="121" 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, 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, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, stress-ng, unrar, usb-modeswitch and vim." PKG_IS_ADDON="yes" PKG_ADDON_NAME="System Tools" @@ -44,7 +44,6 @@ PKG_DEPENDS_TARGET="toolchain \ pv \ screen \ smartmontools \ - strace \ stress-ng \ unrar \ usb-modeswitch \ @@ -151,9 +150,6 @@ addon() { # st cp -P $(get_build_dir st)/st ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || : - # strace - 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 diff --git a/packages/addons/addon-depends/system-tools-depends/strace/package.mk b/packages/debug/strace/package.mk similarity index 95% rename from packages/addons/addon-depends/system-tools-depends/strace/package.mk rename to packages/debug/strace/package.mk index ca6be953e8..72c8c15a75 100644 --- a/packages/addons/addon-depends/system-tools-depends/strace/package.mk +++ b/packages/debug/strace/package.mk @@ -10,7 +10,6 @@ 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" if [ "${TARGET_ARCH}" = x86_64 ]; then PKG_CONFIGURE_OPTS_TARGET="--enable-mpers=no" diff --git a/packages/addons/addon-depends/system-tools-depends/strace/patches/strace-0001-autoreconf.patch b/packages/debug/strace/patches/strace-0001-autoreconf.patch similarity index 100% rename from packages/addons/addon-depends/system-tools-depends/strace/patches/strace-0001-autoreconf.patch rename to packages/debug/strace/patches/strace-0001-autoreconf.patch diff --git a/packages/addons/addon-depends/system-tools-depends/strace/patches/strace-0002-fix-autoconf-archive.patch b/packages/debug/strace/patches/strace-0002-fix-autoconf-archive.patch similarity index 100% rename from packages/addons/addon-depends/system-tools-depends/strace/patches/strace-0002-fix-autoconf-archive.patch rename to packages/debug/strace/patches/strace-0002-fix-autoconf-archive.patch diff --git a/packages/virtual/debug/package.mk b/packages/virtual/debug/package.mk index bc1a2c5982..23d9254b78 100644 --- a/packages/virtual/debug/package.mk +++ b/packages/virtual/debug/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain gdb edid-decode memtester" +PKG_DEPENDS_TARGET="toolchain gdb edid-decode memtester strace" PKG_SECTION="virtual" PKG_LONGDESC="debug is a Metapackage for installing debugging tools"