summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/stress-ng
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2022-08-06 21:15:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-08 15:44:21 +0100
commitfd3c99be517a98e58b9351777921b341582dfec3 (patch)
treeee97732ef567aed171ea1e2a37e89e66ee9258cd /meta/recipes-extended/stress-ng
parentce119b0617475c86204c631d930713a78579c4d1 (diff)
downloadpoky-fd3c99be517a98e58b9351777921b341582dfec3.tar.gz
stress-ng: Upgrade to 0.14.03
Backport fixes for build with glibc 2.36+ (From OE-Core rev: 6dc595b7ab00a37f4dd76c1b042bd900988016c1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/stress-ng')
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch34
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch34
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.14.02.bb)7
3 files changed, 73 insertions, 2 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
new file mode 100644
index 0000000000..52b2e61bc1
--- /dev/null
+++ b/meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch
@@ -0,0 +1,34 @@
1From 627e5227783ff2a0c3b11adee57ef7f0684a367e Mon Sep 17 00:00:00 2001
2From: Colin Ian King <colin.i.king@gmail.com>
3Date: Mon, 1 Aug 2022 21:39:39 +0100
4Subject: [PATCH 1/2] core-helper: remove include of sys/mount.h
5
6This is not required in the shim core and it fixes a build issue
7with newer glibc 2.36
8
9Fixes: https://github.com/ColinIanKing/stress-ng/issues/216
10
11Upstream-Status: Backport [https://github.com/ColinIanKing/stress-ng/commit/69f4f4d629c5f4304b5388b6a7fa8616de23f50e]
12Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
13---
14 core-helper.c | 4 ----
15 1 file changed, 4 deletions(-)
16
17diff --git a/core-helper.c b/core-helper.c
18index 6795410d..9e4533f2 100644
19--- a/core-helper.c
20+++ b/core-helper.c
21@@ -39,10 +39,6 @@
22 #include <sys/loadavg.h>
23 #endif
24
25-#if defined(HAVE_SYS_MOUNT_H)
26-#include <sys/mount.h>
27-#endif
28-
29 #if defined(HAVE_SYS_PRCTL_H)
30 #include <sys/prctl.h>
31 #endif
32--
332.37.1
34
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
new file mode 100644
index 0000000000..5cb95f1f2b
--- /dev/null
+++ b/meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch
@@ -0,0 +1,34 @@
1From 0503ec88e9187c0152b7b2840a1ad5bfb022bbfe Mon Sep 17 00:00:00 2001
2From: Colin Ian King <colin.i.king@gmail.com>
3Date: Mon, 1 Aug 2022 21:28:49 +0100
4Subject: [PATCH 2/2] core-shim: remove include of sys/mount.h
5
6This is not required in the shim core and it fixes a build issue
7with newer glibc 2.36
8
9Fixes: https://github.com/ColinIanKing/stress-ng/issues/216
10
11Upstream-Status: Backport [https://github.com/ColinIanKing/stress-ng/commit/0c9a711f213b5734729ab0c5ed90669e9fd11ca2]
12Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
13---
14 core-shim.c | 4 ----
15 1 file changed, 4 deletions(-)
16
17diff --git a/core-shim.c b/core-shim.c
18index 0343402a..324eba7d 100644
19--- a/core-shim.c
20+++ b/core-shim.c
21@@ -52,10 +52,6 @@
22 #include <asm/ldt.h>
23 #endif
24
25-#if defined(HAVE_SYS_MOUNT_H)
26-#include <sys/mount.h>
27-#endif
28-
29 #if defined(HAVE_SYS_PRCTL_H)
30 #include <sys/prctl.h>
31 #endif
32--
332.37.1
34
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.14.02.bb b/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb
index 000a640917..370662bbb3 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.14.02.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb
@@ -5,8 +5,11 @@ HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme"
5LICENSE = "GPL-2.0-only" 5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master" 8SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
9SRCREV = "5239ae6c82bfb239637b5a66cd39a035a158e641" 9 file://0001-core-helper-remove-include-of-sys-mount.h.patch \
10 file://0002-core-shim-remove-include-of-sys-mount.h.patch \
11"
12SRCREV = "346518caffe5302f9a6d36860459c297c6968aaa"
10S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
11 14
12DEPENDS = "coreutils-native" 15DEPENDS = "coreutils-native"