From: Alexandru Ardelean Date: Sun, 25 Sep 2022 14:12:03 +0000 (+0300) Subject: stress-ng: bump to version 0.14.06 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F19453%2Fhead;p=feed%2Fpackages.git stress-ng: bump to version 0.14.06 no longer needed: 010-dont_define_fortify.patch upstreamed: 020-stress-sysinval-fix-fstat-fstat64-compat-check.patch Signed-off-by: Alexandru Ardelean --- diff --git a/utils/stress-ng/Makefile b/utils/stress-ng/Makefile index 30590ccd10..d14d436759 100644 --- a/utils/stress-ng/Makefile +++ b/utils/stress-ng/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stress-ng -PKG_VERSION:=0.14.03 +PKG_VERSION:=0.14.06 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ColinIanKing/stress-ng/tar.gz/refs/tags/V$(PKG_VERSION)? -PKG_HASH:=95012c62883ab5826e6157557a075df98cce3cbce2a48bb40851bcc968a8441a +PKG_HASH:=54f6c3f84b20efedafd3394ec168e53632a685cfdd76f24270653e898d9ede08 PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=GPL-2.0-only diff --git a/utils/stress-ng/patches/010-dont_define_fortify.patch b/utils/stress-ng/patches/010-dont_define_fortify.patch deleted file mode 100644 index 26c452f109..0000000000 --- a/utils/stress-ng/patches/010-dont_define_fortify.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -34,10 +34,6 @@ - #ifndef _LARGEFILE64_SOURCE - #define _LARGEFILE64_SOURCE - #endif --#if !defined(__PCC__) && \ -- !defined(__TINYC__) --#define _FORTIFY_SOURCE 2 --#endif - - #if !defined(_FILE_OFFSET_BITS) - #define _FILE_OFFSET_BITS (64) diff --git a/utils/stress-ng/patches/020-stress-sysinval-fix-fstat-fstat64-compat-check.patch b/utils/stress-ng/patches/020-stress-sysinval-fix-fstat-fstat64-compat-check.patch deleted file mode 100644 index 32449bda3f..0000000000 --- a/utils/stress-ng/patches/020-stress-sysinval-fix-fstat-fstat64-compat-check.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a5e564bdd14dbda666fc7caffecc0f6e3527df85 Mon Sep 17 00:00:00 2001 -From: Alexandru Ardelean -Date: Fri, 12 Aug 2022 15:36:02 +0300 -Subject: [PATCH] stress-sysinval: fix fstat/fstat64 compat check - -It seems that __NR_fstat64 may be defined while __NR_fstat may be -undefined. -Looking at the kernel file 'include/uapi/asm-generic/unistd.h' this looks -possible where there is a 32-bit arch. - -In any case, checking that __NR_fstat64 exists/has-a-value when adding it -to the table looks like a good idea, vs adding __NR_fstat. - -This was found when updating stress-ng here: - https://github.com/openwrt/packages/pull/19048 - -The ARCHS (or ARC) build is failing. No idea why it's the only one. -But this patch fixes it. - -Signed-off-by: Alexandru Ardelean ---- - stress-sysinval.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/stress-sysinval.c -+++ b/stress-sysinval.c -@@ -590,8 +590,8 @@ static const stress_syscall_arg_t stress - { SYS(fstat), 2, { ARG_FD, ARG_PTR_WR, 0, 0, 0, 0 } }, - #endif - #if DEFSYS(fstat64) -- { SYS(fstat), 2, { ARG_FD, ARG_PTR, 0, 0, 0, 0 } }, -- { SYS(fstat), 2, { ARG_FD, ARG_PTR_WR, 0, 0, 0, 0 } }, -+ { SYS(fstat64), 2, { ARG_FD, ARG_PTR, 0, 0, 0, 0 } }, -+ { SYS(fstat64), 2, { ARG_FD, ARG_PTR_WR, 0, 0, 0, 0 } }, - #endif - #if DEFSYS(fstatat) - { SYS(fstatat), 4, { ARG_DIRFD, ARG_EMPTY_FILENAME, ARG_PTR, ARG_FLAG, 0, 0 } },