From 2d6f791a6ff27dbd65916259613d8cc8909deece Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 9 Jan 2021 15:31:49 -0800 Subject: [PATCH] stress-ng: update to 0.12.01 Simplified bsd patch to be compatible with glibc. It's easier to just use libbsd with glibc. Size shouldn't be an issue. Signed-off-by: Rosen Penev --- utils/stress-ng/Makefile | 6 +- utils/stress-ng/patches/010-soft-float.patch | 4 +- utils/stress-ng/patches/020-no-bsd-aio.patch | 65 -------------------- 3 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 utils/stress-ng/patches/020-no-bsd-aio.patch diff --git a/utils/stress-ng/Makefile b/utils/stress-ng/Makefile index 4ee2a7de89..acf8763051 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.12.00 +PKG_VERSION:=0.12.01 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://kernel.ubuntu.com/~cking/tarballs/stress-ng -PKG_HASH:=b2b738f574671926654b1623103a7aa58ee6911894ac78760ee188c4bfa96fe2 +PKG_HASH:=d354bbbb1500cfe043c761014dc9c3f62779747fafea8a19af94402327f6d3fc PKG_MAINTAINER:=Alexandru Ardelean PKG_LICENSE:=GPL-2.0-only @@ -27,7 +27,7 @@ define Package/stress-ng CATEGORY:=Utilities TITLE:=stress-ng is a stress test utility URL:=https://kernel.ubuntu.com/~cking/stress-ng/ - DEPENDS:=+zlib + DEPENDS:=+zlib +libbsd endef define Package/stress-ng/description diff --git a/utils/stress-ng/patches/010-soft-float.patch b/utils/stress-ng/patches/010-soft-float.patch index ef8a95aad2..5aea2e26f7 100644 --- a/utils/stress-ng/patches/010-soft-float.patch +++ b/utils/stress-ng/patches/010-soft-float.patch @@ -1,6 +1,6 @@ --- a/stress-fp-error.c +++ b/stress-fp-error.c -@@ -109,42 +109,43 @@ static int stress_fp_error(const stress_args_t *args) +@@ -115,42 +115,43 @@ static int stress_fp_error(const stress_ do { volatile double d1, d2; @@ -50,7 +50,7 @@ /* * Use volatiles to force compiler to generate code * to perform run time computation of 1.0 / M_PI -@@ -165,14 +166,15 @@ static int stress_fp_error(const stress_args_t *args) +@@ -171,14 +172,15 @@ static int stress_fp_error(const stress_ stress_fp_check(args, "DBL_MAX + DBL_MAX / 2.0", DBL_MAX + DBL_MAX / 2.0, INFINITY, false, true, 0, FE_OVERFLOW | FE_INEXACT); diff --git a/utils/stress-ng/patches/020-no-bsd-aio.patch b/utils/stress-ng/patches/020-no-bsd-aio.patch deleted file mode 100644 index 0fb07e7987..0000000000 --- a/utils/stress-ng/patches/020-no-bsd-aio.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/Makefile.config -+++ b/Makefile.config -@@ -67,7 +67,7 @@ ifeq ($(shell uname -s),SunOS) - endif - - ifndef $(HAVE_LIB_AIO) --HAVE_LIB_AIO = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_AIO) TEST_PROG=test-libaio have_test_prog) -+#HAVE_LIB_AIO = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_AIO) TEST_PROG=test-libaio have_test_prog) - ifeq ($(HAVE_LIB_AIO),1) - CONFIG_CFLAGS += -DHAVE_LIB_AIO - CONFIG_LDFLAGS += $(LIB_AIO) -@@ -76,7 +76,7 @@ endif - endif - - ifndef $(HAVE_LIB_BSD) --HAVE_LIB_BSD = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-libbsd have_test_prog) -+#HAVE_LIB_BSD = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-libbsd have_test_prog) - ifeq ($(HAVE_LIB_BSD),1) - CONFIG_CFLAGS += -DHAVE_LIB_BSD - CONFIG_LDFLAGS += $(LIB_BSD) -@@ -103,7 +103,7 @@ endif - endif - - ifndef $(HAVE_LIB_SCTP) --HAVE_LIB_SCTP = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_SCTP) TEST_PROG=test-libsctp have_test_prog) -+#HAVE_LIB_SCTP = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_SCTP) TEST_PROG=test-libsctp have_test_prog) - ifeq ($(HAVE_LIB_SCTP),1) - CONFIG_CFLAGS += -DHAVE_LIB_SCTP - CONFIG_LDFLAGS += $(LIB_SCTP) -@@ -178,7 +178,7 @@ endif - endif - - ifndef $(HAVE_AIO_H) --HAVE_AIO_H = $(shell $(MAKE) $(MAKE_OPTS) HEADER=aio.h have_header_h) -+#HAVE_AIO_H = $(shell $(MAKE) $(MAKE_OPTS) HEADER=aio.h have_header_h) - ifeq ($(HAVE_AIO_H),1) - CONFIG_CFLAGS += -DHAVE_AIO_H - $(info autoconfig: using aio.h) -@@ -2516,7 +2516,7 @@ endif - endif - - ifndef $(HAVE_SETPROCTITLE) --HAVE_SETPROCTITLE = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-setproctitle have_test_prog) -+#HAVE_SETPROCTITLE = $(shell $(MAKE) $(MAKE_OPTS) TEST_LIBS=$(LIB_BSD) TEST_PROG=test-setproctitle have_test_prog) - ifeq ($(HAVE_SETPROCTITLE),1) - CONFIG_CFLAGS += -DHAVE_SETPROCTITLE - $(info autoconfig: using setproctitle) -@@ -3140,7 +3140,7 @@ endif - ifndef $(HAVE_WCSLCAT) - WCSFUNC=wcslcat - export WCSFUNC --HAVE_WCSLCAT = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcat have_wcsfunc) -+#HAVE_WCSLCAT = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcat have_wcsfunc) - ifeq ($(HAVE_WCSLCAT),1) - CONFIG_CFLAGS += -DHAVE_WCSLCAT - $(info autoconfig: using wcslcat) -@@ -3150,7 +3150,7 @@ endif - ifndef $(HAVE_WCSLCPY) - WCSFUNC=wcslcpy - export WCSFUNC --HAVE_WCSLCPY = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcpy have_wcsfunc) -+#HAVE_WCSLCPY = $(shell $(MAKE) $(MAKE_OPTS) WCSFUNC=wcslcpy have_wcsfunc) - ifeq ($(HAVE_WCSLCPY),1) - CONFIG_CFLAGS += -DHAVE_WCSLCPY - $(info autoconfig: using wcslcpy)