Skip to contentSkip to conversation

stress-ng: add a recipe that replaces the original stress

PATCH New Alexander Kanavin 1 participant 1 message Jul 30, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 meta/conf/distro/include/maintainers.inc      |  2 +-
 ...ownership-when-installing-example-jo.patch | 23 ++++++
 .../stress-ng/stress-ng_0.10.00.bb            | 20 +++++
 .../stress/files/texinfo.patch                | 80 -------------------
 meta/recipes-extended/stress/stress_1.0.4.bb  | 15 ----
 meta/recipes-rt/rt-tests/files/rt_bmark.py    |  2 +-
 meta/recipes-rt/rt-tests/rt-tests_1.1.bb      |  2 +-
 7 files changed, 46 insertions(+), 98 deletions(-)
 create mode 100644 meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch
 create mode 100644 meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb
 delete mode 100644 meta/recipes-extended/stress/files/texinfo.patch
 delete mode 100644 meta/recipes-extended/stress/stress_1.0.4.bb
meta/conf/distro/include/maintainers.inc +1 -1
index 3d5ab9dcd6c..77af8b6dad8 100644
@@ -661,7 +661,7 @@ RECIPE_MAINTAINER_pn-sqlite3 = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-squashfs-tools = "Robert Yang <[email protected]>"
 RECIPE_MAINTAINER_pn-startup-notification = "Alexander Kanavin <[email protected]>"
 RECIPE_MAINTAINER_pn-strace = "Robert Yang <[email protected]>"
-RECIPE_MAINTAINER_pn-stress = "Anuj Mittal <[email protected]>"
+RECIPE_MAINTAINER_pn-stress-ng = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-subversion = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-sudo = "Chen Qi <[email protected]>"
 RECIPE_MAINTAINER_pn-swig = "Anuj Mittal <[email protected]>"
meta/recipes-extended/stress-ng/stress-ng/0001-Do-not-preserve-ownership-when-installing-example-jo.patch new file +23 -0
new file mode 100644
index 00000000000..c860c717ac4
@@ -0,0 +1,23 @@
+From bbc85a439672120fa1d36be79e959b28fe840919 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <[email protected]>
+Date: Tue, 30 Jul 2019 18:38:03 +0200
+Subject: [PATCH] Do not preserve ownership when installing example jobs
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <[email protected]>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f36e57e..20488af 100644
+--- a/Makefile
++++ b/Makefile
+@@ -452,6 +452,6 @@ install: stress-ng stress-ng.1.gz
+ 	mkdir -p ${DESTDIR}${MANDIR}
+ 	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
+ 	mkdir -p ${DESTDIR}${JOBDIR}
+-	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
++	cp -r example-jobs/*.job ${DESTDIR}${JOBDIR}
+ 	mkdir -p ${DESTDIR}${BASHDIR}
+ 	cp bash-completion/stress-ng ${DESTDIR}${BASHDIR}
meta/recipes-extended/stress-ng/stress-ng_0.10.00.bb new file +20 -0
new file mode 100644
index 00000000000..f7faf97e681
@@ -0,0 +1,20 @@
+SUMMARY = "System load testing utility"
+DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \
+imposes a configurable amount of CPU, memory, I/O, and disk stress on the system."
+HOMEPAGE = "https://kernel.ubuntu.com/~cking/stress-ng/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRC_URI = "https://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
+           file://0001-Do-not-preserve-ownership-when-installing-example-jo.patch \
+           "
+SRC_URI[md5sum] = "46aa41d37690324ceab4febfcc549018"
+SRC_URI[sha256sum] = "d09dd2a1aea549e478995bf9be90b38906a4cdf33ea7b245ef9d46aa5213c074"
+
+DEPENDS = "coreutils-native"
+
+inherit bash-completion
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+}
meta/recipes-extended/stress/files/texinfo.patch deleted +0 -80

80 lines not on this page · raw message

meta/recipes-extended/stress/stress_1.0.4.bb deleted +0 -15
deleted file mode 100644
index e9179d3e19e..00000000000
@@ -1,15 +0,0 @@
-SUMMARY = "System load testing utility"
-DESCRIPTION = "Deliberately simple workload generator for POSIX systems. It \
-imposes a configurable amount of CPU, memory, I/O, and disk stress on the system."
-HOMEPAGE = "http://people.seas.harvard.edu/~apw/stress/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-
-SRC_URI = "http://people.seas.harvard.edu/~apw/${BPN}/${BP}.tar.gz \
-           file://texinfo.patch \
-           "
-
-SRC_URI[md5sum] = "890a4236dd1656792f3ef9a190cf99ef"
-SRC_URI[sha256sum] = "057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b"
-
-inherit autotools
meta/recipes-rt/rt-tests/files/rt_bmark.py +1 -1
index 080a6558935..57b39b52a1e 100755
@@ -130,7 +130,7 @@ def log_test_header(seq_no, nr_of_tests, name):
 #-------------------------------------------------------------------------------
 
 def start_stress(*args):
-        stress_cmd         = [ "stress" ]
+        stress_cmd         = [ "stress-ng" ]
         added_stress_types = []
         req_stress_types   = set(args)
         cpu_cnt            = str(multiprocessing.cpu_count())
meta/recipes-rt/rt-tests/rt-tests_1.1.bb +1 -1
index 496f04fdbae..b673cd784ff 100644
@@ -26,6 +26,6 @@ do_install_ptest() {
         cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH}
 }
 
-RDEPENDS_${PN}-ptest += " stress python3 python3-multiprocessing python3-datetime python3-misc"
+RDEPENDS_${PN}-ptest += " stress-ng python3 python3-multiprocessing python3-datetime python3-misc"
 
 FILES_${PN} += "${prefix}/src/backfire"
Signature · 1 line
2.17.1