stress-ng: upgraded package to upstream
Upgraded app-benchmarks/stress-ng to version 0.11.17
BUG=None
TEST=cros deploy to Trogdor, run some benchmarks
Change-Id: Ia7044d44596cf56e0058eb7a8c974c9b714b3ffe
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2348089
Tested-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Stephen Boyd <swboyd@chromium.org>
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
new file mode 100644
index 0000000..db5c9e0
--- /dev/null
+++ b/app-benchmarks/stress-ng/Manifest
@@ -0,0 +1 @@
+DIST stress-ng-0.11.17.tar.xz 467156 BLAKE2B fab734e0dcd7633e6a47a3b6a41111dd900a2dfb2e3666d8fbf439d2d40ea6b7f5f25763aba5d774cf20ce43598e0bce2229e321c2a9512d5f26d8a795d70ce8 SHA512 8320e10fb2a2f224b23efe72af7d84e6beb73bbd54eff0a6c04afee14de5cbbf6584e1a6d936f52651467138e9647dfb0ff092aa7e73a9f8304627a603546f79
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
new file mode 100644
index 0000000..d3c5e93
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch
@@ -0,0 +1,61 @@
+--- stress-ng-0.11.17.orig/Makefile 2020-07-27 13:38:23.000000000 +0200
++++ stress-ng-0.11.17/Makefile 2020-08-09 13:43:30.919796477 +0200
+@@ -21,7 +21,7 @@
+ # Codename "synthetic system strainer"
+ #
+
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
+
+ #
+ # Pedantic flags
+@@ -358,12 +358,10 @@
+ .o: stress-ng.h Makefile
+
+ .c.o:
+- @echo "CC $<"
+- @$(CC) $(CFLAGS) -c -o $@ $<
++ $(CC) $(CFLAGS) -c -o $@ $<
+
+ stress-ng: $(OBJS)
+- @echo "LD $@"
+- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
+ @sync
+
+ makeconfig:
+@@ -384,7 +382,7 @@
+ sed '$$ s/.$$//' >> apparmor-data.c
+ @echo "};" >> apparmor-data.c
+ @echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
+- @echo "CC $<"
++ echo "CC $<"
+ @$(CC) -c apparmor-data.c -o apparmor-data.o
+ @rm -rf apparmor-data.c apparmor-data.bin
+
+@@ -401,12 +399,12 @@
+ @$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \
+ sed 's/,/ /' | sed s/'^ *//' | \
+ awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
+- @echo CC $<
+- @$(CC) $(CFLAGS) -c -o $@ $<
++ echo CC $<
++ $(CC) $(CFLAGS) -c -o $@ $<
+
+ stress-vecmath.o: stress-vecmath.c
+- @echo CC $<
+- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++ echo CC $<
++ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
+ @touch stress-ng.c
+
+ $(OBJS): stress-ng.h Makefile
+@@ -459,7 +457,7 @@
+ mkdir -p ${DESTDIR}${BINDIR}
+ cp stress-ng ${DESTDIR}${BINDIR}
+ mkdir -p ${DESTDIR}${MANDIR}
+- cp stress-ng.1.gz ${DESTDIR}${MANDIR}
++ cp stress-ng.1 ${DESTDIR}${MANDIR}
+ mkdir -p ${DESTDIR}${JOBDIR}
+ cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
+ mkdir -p ${DESTDIR}${BASHDIR}
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
new file mode 100644
index 0000000..c2c4763
--- /dev/null
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>conikost@gentoo.org</email>
+ <name>Conrad Kostecki</name>
+ </maintainer>
+ <longdescription>
+ Stress-ng will stress test a computer system in various selectable ways.
+ It was designed to exercise various physical subsystems of a computer
+ as well as the various operating system kernel interfaces.
+ It features 200 stress tests, 70 CPU specific stress tests,
+ that exercise floating point, integer, bit manipulation and control flow
+ and over 20 virtual memory stress tests.
+ </longdescription>
+ <upstream>
+ <bugs-to>https://github.com/ColinIanKing/stress-ng/issues</bugs-to>
+ <remote-id type="github">ColinIanKing/stress-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild
new file mode 100644
index 0000000..2a129f0
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="*"
+
+DEPEND="
+ dev-libs/libaio
+ dev-libs/libbsd
+ dev-libs/libgcrypt:0=
+ sys-apps/attr
+ sys-apps/keyutils:=
+ sys-libs/libcap
+ sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
+
+src_compile() {
+ tc-export CC
+
+ default
+}
+
+pkg_postinst() {
+ optfeature "AppArmor support" sys-libs/libapparmor
+ optfeature "SCTP support" net-misc/lksctp-tools
+}
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.11.17 b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.17
new file mode 100644
index 0000000..0f7e33e
--- /dev/null
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.11.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile postinst
+DEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+DESCRIPTION=Stress test for a computer system with various selectable ways
+EAPI=7
+HOMEPAGE=https://kernel.ubuntu.com/~cking/stress-ng/
+KEYWORDS=*
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib
+SLOT=0
+SRC_URI=https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.11.17.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=db84754d9fe1a8de86deebf9ab0de701
