diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-27 22:15:55 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-29 16:23:26 +0100 |
commit | ec701b7054a9731ddd4f44fe39457054fd790e09 (patch) | |
tree | 71e206861070051c1171674d7f32a2454df076ad /meta/recipes-extended | |
parent | 438083e2ec628b563130bda5005ea10fd685d5b7 (diff) | |
download | openembedded-core-contrib-ec701b7054a9731ddd4f44fe39457054fd790e09.tar.gz |
stress-ng: update 0.14.03 -> 0.14.06
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch | 34 | ||||
-rw-r--r-- | meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch | 34 | ||||
-rw-r--r-- | meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb) | 7 |
3 files changed, 2 insertions, 73 deletions
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 <colin.i.king@gmail.com> -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 <colin.i.king@gmail.com> ---- - 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 <sys/loadavg.h> - #endif - --#if defined(HAVE_SYS_MOUNT_H) --#include <sys/mount.h> --#endif -- - #if defined(HAVE_SYS_PRCTL_H) - #include <sys/prctl.h> - #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 <colin.i.king@gmail.com> -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 <colin.i.king@gmail.com> ---- - 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 <asm/ldt.h> - #endif - --#if defined(HAVE_SYS_MOUNT_H) --#include <sys/mount.h> --#endif -- - #if defined(HAVE_SYS_PRCTL_H) - #include <sys/prctl.h> - #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.06.bb index 370662bbb3..359560b9e2 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.14.06.bb @@ -5,11 +5,8 @@ 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" +SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master" +SRCREV = "03493cb69e91c29718ff9f645514355cd99762c6" S = "${WORKDIR}/git" DEPENDS = "coreutils-native" |