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 9119edd622..4885e2a7b9 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.09.36" -PKG_SHA256="16102abee20fe26b1a8784ab05c61b3e72474503bc50b9debc9f457cb4b4e228" +PKG_VERSION="0.09.50" +PKG_SHA256="b07290495794092cdf2f8d51ac631f28b8cec9455a16552d8ca48bc1f376c634" 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" diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-rename-statx_timestamp-to-shim_statx_timestamp.patch b/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-rename-statx_timestamp-to-shim_statx_timestamp.patch deleted file mode 100644 index 7e14bfec93..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-rename-statx_timestamp-to-shim_statx_timestamp.patch +++ /dev/null @@ -1,44 +0,0 @@ -From bf606ae577cd9142517a2170e14d4f9377a49deb Mon Sep 17 00:00:00 2001 -From: Colin Ian King -Date: Sat, 4 Aug 2018 07:05:17 +0100 -Subject: stress-ng.h: rename statx_timestamp to shim_statx_timestamp - -Newer versions of glibc now habe statx_timestamp defined, so -rename this struct so it won't clash. - -Signed-off-by: Colin Ian King ---- - stress-ng.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/stress-ng.h b/stress-ng.h -index ae03a7b..b9359a4 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -2932,7 +2932,7 @@ struct shim_sched_attr { - #define SHIM_STATX_BTIME 0x00000800U - #define SHIM_STATX_ALL 0x00000fffU - --struct statx_timestamp { -+struct shim_statx_timestamp { - int64_t tv_sec; - int32_t tv_nsec; - int32_t __reserved; -@@ -2952,10 +2952,10 @@ struct shim_statx { - uint64_t stx_size; - uint64_t stx_blocks; - uint64_t __spare1[1]; -- struct statx_timestamp stx_atime; -- struct statx_timestamp stx_btime; -- struct statx_timestamp stx_ctime; -- struct statx_timestamp stx_mtime; -+ struct shim_statx_timestamp stx_atime; -+ struct shim_statx_timestamp stx_btime; -+ struct shim_statx_timestamp stx_ctime; -+ struct shim_statx_timestamp stx_mtime; - uint32_t stx_rdev_major; - uint32_t stx_rdev_minor; - uint32_t stx_dev_major; --- -cgit v0.11.2 - diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0002-only-use-ustat-if-HAVE_USTAT-is-defined.patch b/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0002-only-use-ustat-if-HAVE_USTAT-is-defined.patch deleted file mode 100644 index ec52e3611b..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0002-only-use-ustat-if-HAVE_USTAT-is-defined.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 04322c0d653aec755517f771e6e400fc14cf611c Mon Sep 17 00:00:00 2001 -From: Colin Ian King -Date: Sat, 4 Aug 2018 07:11:58 +0100 -Subject: stress-sysbadaddr: only use ustat if HAVE_USTAT is defined - -We should be using HAVE_USTAT as ustat.h is not available on -newer versions of glibc and HAVE_USTAT is undefined if this -is not available. - -Signed-off-by: Colin Ian King ---- - stress-sysbadaddr.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/stress-sysbadaddr.c b/stress-sysbadaddr.c -index eab9213..0b6465f 100644 ---- a/stress-sysbadaddr.c -+++ b/stress-sysbadaddr.c -@@ -28,7 +28,7 @@ - #include - #include - #include --#if defined(__NR_ustat) -+#if defined(HAVE_USTAT) - #include - #endif - #endif -@@ -379,7 +379,7 @@ static int bad_times(void *addr) - return times(addr); - } - --#if defined(__linux__) && defined(__NR_ustat) -+#if defined(HAVE_USTAT) - static int bad_ustat(void *addr) - { - dev_t dev = { 0 }; -@@ -495,7 +495,7 @@ static bad_syscall_t bad_syscalls[] = { - bad_timer_create, - #endif - bad_times, --#if defined(__linux__) && defined(__NR_ustat) -+#if defined(HAVE_USTAT) - bad_ustat, - #endif - #if defined(__linux__) --- -cgit v0.11.2 -