From 0f99a5cd40f66a38f4305969cfd4a8abca921d6f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 14 Jul 2023 12:49:57 +0000 Subject: [PATCH 1/9] dstat: drop package replaced by dool --- .../system-tools-depends/dstat/package.mk | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 packages/addons/addon-depends/system-tools-depends/dstat/package.mk diff --git a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk deleted file mode 100644 index 9c65e0fed8..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="dstat" -PKG_VERSION="e428c7dc7137f81f8ca6bef8854b37a4ddd4f337" # 19 Jun 2020 -PKG_SHA256="3315f5cefc7cd4e968430baa19247fc32af36dd42c9ad3edf5962ae4f597013f" -PKG_LICENSE="GPL" -PKG_SITE="http://dag.wiee.rs/home-made/dstat" -PKG_URL="https://github.com/dstat-real/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 -} - -makeinstall_target() { - mkdir -p ${INSTALL}/usr/bin - cp -p dstat ${INSTALL}/usr/bin -} From 6fbbd1c695c8abf024e4575408c48818a304c2c9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 14 Jul 2023 12:23:51 +0000 Subject: [PATCH 2/9] dool: initial package --- .../system-tools-depends/dool/package.mk | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/addons/addon-depends/system-tools-depends/dool/package.mk diff --git a/packages/addons/addon-depends/system-tools-depends/dool/package.mk b/packages/addons/addon-depends/system-tools-depends/dool/package.mk new file mode 100644 index 0000000000..930085e308 --- /dev/null +++ b/packages/addons/addon-depends/system-tools-depends/dool/package.mk @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="dool" +PKG_VERSION="1.2.0" +PKG_SHA256="a626ec796a2508443625314e464adec885cb22543157794a6255570b19f68a7d" +PKG_LICENSE="GPL-3.0-or-later" +PKG_SITE="https://github.com/scottchiefbaker/dool" +PKG_URL="https://github.com/scottchiefbaker/dool/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain Python3" +PKG_LONGDESC="Python3 compatible clone of dstat" +PKG_TOOLCHAIN="manual" +PKG_BUILD_FLAGS="-sysroot" + +post_unpack() { + rm ${PKG_BUILD}/Makefile +} + +makeinstall_target() { + mkdir -p ${INSTALL}/usr/bin + cp -p dool ${INSTALL}/usr/bin + cp -pr plugins ${INSTALL}/usr/bin + printf "#!/bin/sh\n\necho \"\${0} has been replaced by dool\"" > ${INSTALL}/usr/bin/dstat + chmod 755 ${INSTALL}/usr/bin/dstat +} From 451b245ecc43c3e79e9bcab3c3515d96878691cc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 14 May 2023 11:35:30 +0000 Subject: [PATCH 3/9] unrar: update to 6.2.8 --- .../addon-depends/system-tools-depends/unrar/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk index 245477ed66..02c4413ed4 100644 --- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="unrar" -PKG_VERSION="6.2.6" -PKG_SHA256="0c2d4cbc8b34d0e3bec7b474e0f52bbcc6c4320ec089b4141223ee355f63c318" +PKG_VERSION="6.2.8" +PKG_SHA256="1777e3d3b073815ff68a411ddb1ab76d0a4e1f58ecc7080035b27b52967ff911" PKG_LICENSE="free" PKG_SITE="https://www.rarlab.com/rar_add.htm" PKG_URL="https://www.rarlab.com/rar/unrarsrc-${PKG_VERSION}.tar.gz" From 7482afd0acc81e4966445cf49d9317bfe9d343b2 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 13 Apr 2023 22:25:30 +0000 Subject: [PATCH 4/9] stress-ng: update to 0.16.02 --- .../system-tools-depends/stress-ng/package.mk | 4 ++-- .../stress-ng-01-compile-with-glibc-2.36.patch | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-01-compile-with-glibc-2.36.patch diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk index 9951d0e21a..5dda3fe52b 100644 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk +++ b/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.15.06" -PKG_SHA256="c38cefcf0a83f6c65aed7c36e57a9a1ee8373418ef71cf089a75b0661dcd4623" +PKG_VERSION="0.16.02" +PKG_SHA256="71ac375826cc58dcbcf5f1609959ed1a5afd71192c52025b5cb273baa3df2317" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/ColinIanKing/stress-ng" PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-01-compile-with-glibc-2.36.patch b/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-01-compile-with-glibc-2.36.patch deleted file mode 100644 index f7d10d4925..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-01-compile-with-glibc-2.36.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/core-helper.c 2022-06-12 11:38:26.000000000 +0000 -+++ b/core-helper.c 2022-07-19 10:00:39.040379407 +0000 -@@ -55,10 +55,6 @@ - #include - #endif - --#if defined(HAVE_LINUX_FS_H) --#include --#endif -- - #if defined(HAVE_SYS_VFS_H) - #include - #endif From 7c0f412e468908fe0c98a51fafd50afc8697102e Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 22 May 2023 13:32:58 +0000 Subject: [PATCH 5/9] diffutils: update to 3.10 --- .../addon-depends/system-tools-depends/diffutils/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk index abe1dc3e69..0717419456 100644 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk +++ b/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.9" -PKG_SHA256="d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1" +PKG_VERSION="3.10" +PKG_SHA256="90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/diffutils/" PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" From d4e56b2ee0ba620c470340d4f8c6619d017b31d2 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 31 May 2023 12:47:37 +0000 Subject: [PATCH 6/9] libssh2: update to 1.11.0 --- .../system-tools-depends/depends/libssh2/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk index ba875bf13a..b9a025af56 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libssh2" -PKG_VERSION="1.10.0" -PKG_SHA256="2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51" +PKG_VERSION="1.11.0" +PKG_SHA256="3736161e41e2693324deb38c26cfdc3efe6209d634ba4258db1cecff6a5ad461" PKG_LICENSE="BSD" PKG_SITE="https://www.libssh2.org" PKG_URL="https://www.libssh2.org/download/libssh2-${PKG_VERSION}.tar.gz" From 0426c1cb32bd625162765a4d70a9991d49cd5f95 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 30 Mar 2023 11:08:40 +0000 Subject: [PATCH 7/9] bottom: update to 0.9.3 --- .../addon-depends/system-tools-depends/bottom/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk index 7b66b6470b..e724304e57 100644 --- a/packages/addons/addon-depends/system-tools-depends/bottom/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/bottom/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv) PKG_NAME="bottom" -PKG_VERSION="0.8.0" -PKG_SHA256="0fe6a826d18570ab33b2af3b26ce28c61e3aa830abb2b622f2c3b81da802437a" +PKG_VERSION="0.9.3" +PKG_SHA256="53a1466c3d2ed8f38401e8929cf2da796e703e4d70339d215f855b2304c07f72" PKG_LICENSE="MIT" PKG_SITE="https://github.com/ClementTsang/bottom" PKG_URL="https://github.com/ClementTsang/bottom/archive/${PKG_VERSION}.tar.gz" From 87b612738f266cabefdc4d184f68e603a6424481 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 14 Jul 2023 12:47:55 +0000 Subject: [PATCH 8/9] system-tools: replace dstat with dool and updates and addon (2) - bottom: update to 0.9.3 - diffutils: update to 3.10 - dool: initial package - dstat: drop package - libssh2: update to 1.11.0 - stress-ng: update to 0.16.02 - unrar: update to 6.2.8 --- packages/addons/tools/system-tools/changelog.txt | 8 ++++++++ packages/addons/tools/system-tools/package.mk | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/addons/tools/system-tools/changelog.txt b/packages/addons/tools/system-tools/changelog.txt index 0d4638af04..7a51e1c004 100644 --- a/packages/addons/tools/system-tools/changelog.txt +++ b/packages/addons/tools/system-tools/changelog.txt @@ -1,3 +1,11 @@ +2 +- replace dstat with dool +- bottom: update to 0.9.3 +- diffutils: update to 3.10 +- libssh2: update to 1.11.0 +- stress-ng: update to 0.16.02 +- unrar: update to 6.2.8 + 1 - bottom: update to 0.8.0 - diffutils: update to 3.9 diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index 802feaddaa..a2bfc59fb6 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="1" +PKG_REV="2" 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 7-zip, autossh, bottom, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, libgpiod, lm_sensors, lshw, mc, mmc-utils, mtpfs, nmon, patch, pv, screen, smartmontools, stress-ng, unrar, usb-modeswitch and vim." +PKG_LONGDESC="This bundle currently includes 7-zip, autossh, bottom, diffutils, dool, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, libgpiod, lm_sensors, lshw, mc, mmc-utils, mtpfs, nmon, patch, pv, screen, smartmontools, stress-ng, unrar, usb-modeswitch and vim." PKG_IS_ADDON="yes" PKG_ADDON_NAME="System Tools" @@ -22,7 +22,7 @@ PKG_DEPENDS_TARGET="toolchain \ autossh \ bottom \ diffutils \ - dstat \ + dool \ dtach \ encfs \ evtest \ @@ -72,8 +72,8 @@ addon() { # diffutils 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 + # dool + cp -Pa $(get_install_dir dool)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # dtach cp -P $(get_install_dir dtach)/usr/bin/dtach ${ADDON_BUILD}/${PKG_ADDON_ID}/bin From 8807e2e8eb25be37349340ffa3141d71d4b9a3c8 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 16 Jul 2023 05:09:54 +0000 Subject: [PATCH 9/9] stress-ng: workaround cross compilation issue since 0.15.09 --- ...s-ng-0001-workaround-cross-compilation-issue.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-workaround-cross-compilation-issue.patch diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-workaround-cross-compilation-issue.patch b/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-workaround-cross-compilation-issue.patch new file mode 100644 index 0000000000..cc4a558133 --- /dev/null +++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-workaround-cross-compilation-issue.patch @@ -0,0 +1,11 @@ +--- a/Makefile.config 2023-07-13 07:58:21.000000000 +0000 ++++ b/Makefile.config 2023-07-16 05:05:35.766646855 +0000 +@@ -311,7 +311,7 @@ + compiler: configdir + @echo "checking compiler ..." + @$(CC) test/test-compiler.c -o test/test-compiler +- @echo "" > $(CONFIGS)/$$(./test/test-compiler) ++ @echo "" > $(CONFIGS)/HAVE_COMPILER_GCC + @rm -f test/test-compiler + $(call check,test-glibc,HAVE_GLIBC,using glibc) +