From 6dc595b7ab00a37f4dd76c1b042bd900988016c1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Aug 2022 21:15:38 -0700 Subject: [PATCH] stress-ng: Upgrade to 0.14.03 Backport fixes for build with glibc 2.36+ Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- ...helper-remove-include-of-sys-mount.h.patch | 34 +++++++++++++++++++ ...e-shim-remove-include-of-sys-mount.h.patch | 34 +++++++++++++++++++ ...ess-ng_0.14.02.bb => stress-ng_0.14.03.bb} | 7 ++-- 3 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch create mode 100644 meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch rename meta/recipes-extended/stress-ng/{stress-ng_0.14.02.bb => stress-ng_0.14.03.bb} (77%) 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 00000000000..52b2e61bc14 --- /dev/null +++ b/meta/recipes-extended/stress-ng/stress-ng/0001-core-helper-remove-include-of-sys-mount.h.patch @@ -0,0 +1,34 @@ +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 new file mode 100644 index 00000000000..5cb95f1f2b8 --- /dev/null +++ b/meta/recipes-extended/stress-ng/stress-ng/0002-core-shim-remove-include-of-sys-mount.h.patch @@ -0,0 +1,34 @@ +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.02.bb b/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb similarity index 77% rename from meta/recipes-extended/stress-ng/stress-ng_0.14.02.bb rename to meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb index 000a640917c..370662bbb30 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" 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 = "5239ae6c82bfb239637b5a66cd39a035a158e641" +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" -- 2.47.2