summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-07-30 18:47:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-31 23:03:01 +0100
commit23e9a8835e5b756ce91c7cdf924fdc45778cdb41 (patch)
treedd9d5b6c4fd958df9c94419659c2bbe2a7f802a6 /meta/recipes-extended
parentfc0c93a62eff08876f8f6b701e3a221ace2fc767 (diff)
downloadpoky-23e9a8835e5b756ce91c7cdf924fdc45778cdb41.tar.gz
stress-ng: add a recipe that replaces the original stress
The original stress is no longer maintained and the homepage went down. This commit replaces it with a maintained re-implementation by Ubuntu. Stress-ng preserves command line option compatibility (for the options that are used in rt-tests), so adjustment is simply changing the name of the executable. Rt-tests is the only user of stress(-ng) in oe-core. (From OE-Core rev: 3fcc10aeba208381166f09861d098d6459d44dfe) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch23
-rw-r--r--meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb20
-rw-r--r--meta/recipes-extended/stress/files/texinfo.patch80
-rw-r--r--meta/recipes-extended/stress/stress_1.0.4.bb15
4 files changed, 43 insertions, 95 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
new file mode 100644
index 0000000000..c860c717ac
--- /dev/null
+++ b/meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
@@ -0,0 +1,23 @@
1From bbc85a439672120fa1d36be79e959b28fe840919 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 30 Jul 2019 18:38:03 +0200
4Subject: [PATCH] Do not preserve ownership when installing example jobs
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 Makefile | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/Makefile b/Makefile
13index 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_0.10.00.bb b/meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb
new file mode 100644
index 0000000000..f7faf97e68
--- /dev/null
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb
@@ -0,0 +1,20 @@
1SUMMARY = "System load testing utility"
2DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \
3imposes a configurable amount of CPU, memory, I/O, and disk stress on the system."
4HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/"
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7
8SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
9 file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
10 "
11SRC_URI[md5sum] = "46aa41d37690324ceab4febfcc549018"
12SRC_URI[sha256sum] = "d09dd2a1aea549e478995bf9be90b38906a4cdf33ea7b245ef9d46aa5213c074"
13
14DEPENDS = "coreutils-native"
15
16inherit bash-completion
17
18do_install() {
19 oe_runmake DESTDIR=${D} install
20}
diff --git a/meta/recipes-extended/stress/files/texinfo.patch b/meta/recipes-extended/stress/files/texinfo.patch
deleted file mode 100644
index f23a1f69c4..0000000000
--- a/meta/recipes-extended/stress/files/texinfo.patch
+++ /dev/null
@@ -1,80 +0,0 @@
1Upstream-Status: Pending
2--- a/doc/stress.texi
3+++ b/doc/stress.texi
4@@ -62,47 +62,47 @@
5
6 @table @samp
7 @item -?
8-@itemx --help
9+@item --help
10 Show help information.
11
12-@itemx --version
13+@item --version
14 Show version information.
15
16 @item -v
17-@itemx --verbose
18+@item --verbose
19 Turn up verbosity.
20
21 @item -q
22-@itemx --quiet
23+@item --quiet
24 Turn down verbosity.
25
26 @item -n
27-@itemx --dry-run
28+@item --dry-run
29 Show what would have been done.
30
31 @item -t @var{secs}
32-@itemx --timeout @var{secs}
33+@item --timeout @var{secs}
34 Time out after @var{secs} seconds.
35
36-@itemx --backoff @var{usecs}
37+@item --backoff @var{usecs}
38 Wait for factor of @var{usecs} microseconds before starting work.
39
40 @item -c @var{forks}
41-@itemx --cpu @var{forks}
42+@item --cpu @var{forks}
43 Spawn @var{forks} processes each spinning on @samp{sqrt()}.
44
45 @item -i @var{forks}
46-@itemx --io @var{forks}
47+@item --io @var{forks}
48 Spawn @var{forks} processes each spinning on @samp{sync()}.
49
50 @item -m @var{forks}
51-@itemx --vm @var{forks}
52+@item --vm @var{forks}
53 Spawn @var{forks} processes each spinning on @samp{malloc()}.
54
55-@itemx --vm-bytes @var{bytes}
56+@item --vm-bytes @var{bytes}
57 Allocate @var{bytes} number of bytes. The default is 1.
58
59-@itemx --vm-hang
60+@item --vm-hang
61 Instruct each vm hog process to go to sleep after allocating memory. This
62 contrasts with their normal behavior, which is to free the memory and
63 reallocate @emph{ad infinitum}. This is useful for simulating low memory
64@@ -114,13 +114,13 @@
65 @end example
66
67 @item -d @var{forks}
68-@itemx --hdd @var{forks}
69+@item --hdd @var{forks}
70 Spawn @var{forks} processes each spinning on @samp{write()}.
71
72-@itemx --hdd-bytes @var{bytes}
73+@item --hdd-bytes @var{bytes}
74 Write @var{bytes} number of bytes. The default is 1GB.
75
76-@itemx --hdd-noclean
77+@item --hdd-noclean
78 Do not unlink file(s) to which random ASCII data is written.
79
80 @end table
diff --git a/meta/recipes-extended/stress/stress_1.0.4.bb b/meta/recipes-extended/stress/stress_1.0.4.bb
deleted file mode 100644
index e9179d3e19..0000000000
--- a/meta/recipes-extended/stress/stress_1.0.4.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1SUMMARY = "System load testing utility"
2DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \
3imposes a configurable amount of CPU, memory, I/O, and disk stress on the system."
4HOMEPAGE = "http://people.seas.harvard.edu/~apw/stress/"
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7
8SRC_URI = "http://people.seas.harvard.edu/~apw/${BPN}/${BP}.tar.gz \
9 file://texinfo.patch \
10 "
11
12SRC_URI[md5sum] = "890a4236dd1656792f3ef9a190cf99ef"
13SRC_URI[sha256sum] = "057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b"
14
15inherit autotools