diff options
Diffstat (limited to 'meta/recipes-extended/stress-ng')
4 files changed, 36 insertions, 82 deletions
diff --git a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch deleted file mode 100644 index c860c717ac..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | From bbc85a439672120fa1d36be79e959b28fe840919 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 30 Jul 2019 18:38:03 +0200 | ||
4 | Subject: [PATCH] Do not preserve ownership when installing example jobs | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | Makefile | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/Makefile b/Makefile | ||
13 | index f36e57e..20488af 100644 | ||
14 | --- a/Makefile | ||
15 | +++ b/Makefile | ||
16 | @@ -452,6 +452,6 @@ install: stress-ng stress-ng.1.gz | ||
17 | mkdir -p ${DESTDIR}${MANDIR} | ||
18 | cp stress-ng.1.gz ${DESTDIR}${MANDIR} | ||
19 | mkdir -p ${DESTDIR}${JOBDIR} | ||
20 | - cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR} | ||
21 | + cp -r example-jobs/*.job ${DESTDIR}${JOBDIR} | ||
22 | mkdir -p ${DESTDIR}${BASHDIR} | ||
23 | cp bash-completion/stress-ng ${DESTDIR}${BASHDIR} | ||
diff --git a/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch b/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch deleted file mode 100644 index dba4494b91..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng/no_daddr_t.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 55e11765af2bdc8adfac87dab1fb2682f7e6c236 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 9 Jun 2020 22:10:28 -0700 | ||
4 | Subject: [PATCH] Define daddr_t if __DADDR_T_TYPE is not defined | ||
5 | |||
6 | glibc defined daddr_t but musl does not, ideally it should not be used | ||
7 | and simple int type is enough. However, its better to leave glibc behavior | ||
8 | as it is and only define it to int if daddr_t is not provided by libc | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | |||
14 | --- | ||
15 | stress-ng.h | 4 ++++ | ||
16 | 1 file changed, 4 insertions(+) | ||
17 | |||
18 | diff --git a/stress-ng.h b/stress-ng.h | ||
19 | index 1a66293..802dc25 100644 | ||
20 | --- a/stress-ng.h | ||
21 | +++ b/stress-ng.h | ||
22 | @@ -3763,6 +3763,10 @@ struct shim_statx { | ||
23 | uint64_t __spare2[14]; | ||
24 | }; | ||
25 | |||
26 | +#ifndef __DADDR_T_TYPE | ||
27 | +typedef int daddr_t; | ||
28 | +#endif | ||
29 | + | ||
30 | /* old ustat struct */ | ||
31 | struct shim_ustat { | ||
32 | #if defined(HAVE_DADDR_T) | ||
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.12.03.bb b/meta/recipes-extended/stress-ng/stress-ng_0.12.03.bb deleted file mode 100644 index 73539c9268..0000000000 --- a/meta/recipes-extended/stress-ng/stress-ng_0.12.03.bb +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | SUMMARY = "System load testing utility" | ||
2 | DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ | ||
3 | imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." | ||
4 | HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/" | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
7 | |||
8 | SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \ | ||
9 | file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \ | ||
10 | file://no_daddr_t.patch \ | ||
11 | " | ||
12 | SRC_URI[sha256sum] = "f27ff439b76a17641291d4234c73655cddcb0a5a588441d6ade290b06ca4b805" | ||
13 | |||
14 | DEPENDS = "coreutils-native" | ||
15 | |||
16 | PROVIDES = "stress" | ||
17 | RPROVIDES_${PN} = "stress" | ||
18 | RREPLACES_${PN} = "stress" | ||
19 | RCONFLICTS_${PN} = "stress" | ||
20 | |||
21 | inherit bash-completion | ||
22 | |||
23 | do_install() { | ||
24 | oe_runmake DESTDIR=${D} install | ||
25 | ln -s stress-ng ${D}${bindir}/stress | ||
26 | } | ||
27 | |||
diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb b/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb new file mode 100644 index 0000000000..fb88e06a7f --- /dev/null +++ b/meta/recipes-extended/stress-ng/stress-ng_0.17.07.bb | |||
@@ -0,0 +1,36 @@ | |||
1 | SUMMARY = "System load testing utility" | ||
2 | DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \ | ||
3 | imposes a configurable amount of CPU, memory, I/O, and disk stress on the system." | ||
4 | HOMEPAGE = "https://github.com/ColinIanKing/stress-ng#readme" | ||
5 | LICENSE = "GPL-2.0-only" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
7 | |||
8 | SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \ | ||
9 | " | ||
10 | SRCREV = "519151f460738cd62b69b84f8096cd218131e0a2" | ||
11 | S = "${WORKDIR}/git" | ||
12 | |||
13 | DEPENDS = "coreutils-native libbsd" | ||
14 | |||
15 | PROVIDES = "stress" | ||
16 | RPROVIDES:${PN} = "stress" | ||
17 | RREPLACES:${PN} = "stress" | ||
18 | RCONFLICTS:${PN} = "stress" | ||
19 | |||
20 | inherit bash-completion | ||
21 | |||
22 | EXTRA_OEMAKE = "VERBOSE=1" | ||
23 | |||
24 | do_configure() { | ||
25 | mkdir -p configs | ||
26 | touch configs/HAVE_APPARMOR | ||
27 | oe_runmake makeconfig | ||
28 | } | ||
29 | |||
30 | do_install() { | ||
31 | oe_runmake DESTDIR=${D} BINDIR=${bindir} install | ||
32 | ln -s stress-ng ${D}${bindir}/stress | ||
33 | } | ||
34 | |||
35 | # upstream issue: https://github.com/ColinIanKing/stress-ng/issues/315 | ||
36 | DEBUG_BUILD = "0" | ||