From 4515da64cc0dc0e1bb8daf6023484a50c03bddd4 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 27 Oct 2022 22:15:55 +0200 Subject: stress-ng: update 0.14.03 -> 0.14.06 (From OE-Core rev: ec701b7054a9731ddd4f44fe39457054fd790e09) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...core-helper-remove-include-of-sys-mount.h.patch | 34 ---------------------- ...2-core-shim-remove-include-of-sys-mount.h.patch | 34 ---------------------- .../stress-ng/stress-ng_0.14.03.bb | 32 -------------------- .../stress-ng/stress-ng_0.14.06.bb | 29 ++++++++++++++++++ 4 files changed, 29 insertions(+), 100 deletions(-) delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch delete mode 100644 meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch delete mode 100644 meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb create mode 100644 meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch deleted file mode 100644 index 52b2e61bc1..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 627e5227783ff2a0c3b11adee57ef7f0684a367e Mon Sep 17 00:00:00 2001 -From: Colin Ian King -Date: Mon, 1 Aug 2022 21:39:39 +0100 -Subject: [PATCH 1/2] core-helper: remove include of sys/mount.h - -This is not required in the shim core and it fixes a build issue -with newer glibc 2.36 - -Fixes: https://github.com/ColinIanKing/stress-ng/issues/216 - -Upstream-Status: Backport [https://github.com/ColinIanKing/stress-ng/commit/69f4f4d629c5f4304b5388b6a7fa8616de23f50e] -Signed-off-by: Colin Ian King ---- - core-helper.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/core-helper.c b/core-helper.c -index 6795410d..9e4533f2 100644 ---- a/core-helper.c -+++ b/core-helper.c -@@ -39,10 +39,6 @@ - #include - #endif - --#if defined(HAVE_SYS_MOUNT_H) --#include --#endif -- - #if defined(HAVE_SYS_PRCTL_H) - #include - #endif --- -2.37.1 - diff --git a/meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch b/meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch deleted file mode 100644 index 5cb95f1f2b..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0503ec88e9187c0152b7b2840a1ad5bfb022bbfe Mon Sep 17 00:00:00 2001 -From: Colin Ian King -Date: Mon, 1 Aug 2022 21:28:49 +0100 -Subject: [PATCH 2/2] core-shim: remove include of sys/mount.h - -This is not required in the shim core and it fixes a build issue -with newer glibc 2.36 - -Fixes: https://github.com/ColinIanKing/stress-ng/issues/216 - -Upstream-Status: Backport [https://github.com/ColinIanKing/stress-ng/commit/0c9a711f213b5734729ab0c5ed90669e9fd11ca2] -Signed-off-by: Colin Ian King ---- - core-shim.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/core-shim.c b/core-shim.c -index 0343402a..324eba7d 100644 ---- a/core-shim.c -+++ b/core-shim.c -@@ -52,10 +52,6 @@ - #include - #endif - --#if defined(HAVE_SYS_MOUNT_H) --#include --#endif -- - #if defined(HAVE_SYS_PRCTL_H) - #include - #endif --- -2.37.1 - diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb b/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb deleted file mode 100644 index 370662bbb3..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "System load testing utility" -DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ -imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." -HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ - file://0001-core-helper-remove-include-of-sys-mount.h.patch \ - file://0002-core-shim-remove-include-of-sys-mount.h.patch \ -" -SRCREV = "346518caffe5302f9a6d36860459c297c6968aaa" -S = "${WORKDIR}/git" - -DEPENDS = "coreutils-native" - -PROVIDES = "stress" -RPROVIDES:${PN} = "stress" -RREPLACES:${PN} = "stress" -RCONFLICTS:${PN} = "stress" - -inherit bash-completion - -do_compile:prepend() { - mkdir -p configs - touch configs/HAVE_APPARMOR -} - -do_install() { - oe_runmake DESTDIR=${D} install - ln -s stress-ng ${D}${bindir}/stress -} diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb b/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb new file mode 100644 index 0000000000..359560b9e2 --- /dev/null +++ b/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb @@ -0,0 +1,29 @@ +SUMMARY = "System load testing utility" +DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ +imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." +HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master" +SRCREV = "03493cb69e91c29718ff9f645514355cd99762c6" +S = "${WORKDIR}/git" + +DEPENDS = "coreutils-native" + +PROVIDES = "stress" +RPROVIDES:${PN} = "stress" +RREPLACES:${PN} = "stress" +RCONFLICTS:${PN} = "stress" + +inherit bash-completion + +do_compile:prepend() { + mkdir -p configs + touch configs/HAVE_APPARMOR +} + +do_install() { + oe_runmake DESTDIR=${D} install + ln -s stress-ng ${D}${bindir}/stress +} -- cgit v1.2.3-54-g00ecf