diff options
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.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.17.08.bb (renamed from meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb) | 18 |
3 files changed, 11 insertions, 75 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.17.08.bb index 370662bbb3..fffe6a1823 100644 --- a/meta/recipes-extended/stress-ng/stress-ng_0.14.03.bb +++ b/meta/recipes-extended/stress-ng/stress-ng_0.17.08.bb @@ -6,13 +6,11 @@ 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" + " +SRCREV = "b7c7a5877501679a3b0a67d877e6274a801d1e4e" S = "${WORKDIR}/git" -DEPENDS = "coreutils-native" +DEPENDS = "coreutils-native libbsd" PROVIDES = "stress" RPROVIDES:${PN} = "stress" @@ -21,12 +19,18 @@ RCONFLICTS:${PN} = "stress" inherit bash-completion -do_compile:prepend() { +EXTRA_OEMAKE = "VERBOSE=1" + +do_configure() { mkdir -p configs touch configs/HAVE_APPARMOR + oe_runmake makeconfig } do_install() { - oe_runmake DESTDIR=${D} install + oe_runmake DESTDIR=${D} BINDIR=${bindir} install ln -s stress-ng ${D}${bindir}/stress } + +# upstream issue: https://github.com/ColinIanKing/stress-ng/issues/315 +DEBUG_BUILD = "0" |