diff options
author | Sam James <sam@gentoo.org> | 2023-04-06 06:23:40 +0100 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2024-01-05 14:02:38 +0000 |
commit | 5da286555726a0937c3d55260438f7e4f7133ce9 (patch) | |
tree | 7459942e240bcb8eb53db8d96c7d10ebb97cf8f2 /app-benchmarks/stress-ng | |
parent | sys-fs/ecryptfs-utils: unkeyword 111_p20170609-r1 for ~ppc (diff) | |
download | gentoo-5da286555726a0937c3d55260438f7e4f7133ce9.tar.gz gentoo-5da286555726a0937c3d55260438f7e4f7133ce9.tar.bz2 gentoo-5da286555726a0937c3d55260438f7e4f7133ce9.zip |
app-benchmarks/stress-ng: make keyutils optional
keyutils fails tests on several niche arches.
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-benchmarks/stress-ng')
-rw-r--r-- | app-benchmarks/stress-ng/Manifest | 1 | ||||
-rw-r--r-- | app-benchmarks/stress-ng/metadata.xml | 3 | ||||
-rw-r--r-- | app-benchmarks/stress-ng/stress-ng-0.15.06-r2.ebuild (renamed from app-benchmarks/stress-ng/stress-ng-0.17.04.ebuild) | 5 | ||||
-rw-r--r-- | app-benchmarks/stress-ng/stress-ng-0.17.04-r1.ebuild | 59 |
4 files changed, 66 insertions, 2 deletions
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest index d18f98cc095e..c361e843cc1a 100644 --- a/app-benchmarks/stress-ng/Manifest +++ b/app-benchmarks/stress-ng/Manifest @@ -1 +1,2 @@ +DIST stress-ng-0.15.06.tar.gz 3813785 BLAKE2B ebed2b6b087afc615e3a94ae239df32a7847f1ddc5db83a733ce8415d76818000bb742604643ebdd06d13e584a66c6814feb660752738f3fe7e714670e4ad396 SHA512 a999ecb813504cdcd56cb3f9ac6633c91ee3df2c203866d29fb04b61c41ee5e7738ca84cdbdb2cb8c6fe969f29a64d21a8df17419901266efc7f1170eb18013a DIST stress-ng-0.17.04.tar.gz 6205049 BLAKE2B a5247c33d9c0266f31784469561088675f5e987fde441ce1d3bbb4e2fda150c2b277e4bc4cdf9ec2fee0276f1f63a30d3d19af96afa9685eb01940cf34fb715e SHA512 df143add8400f2bd6e7ade9f05ca4616f9d713e38676f179da123fb1865789a62ed878e6fb536dc3975bff1151020424053348c43b8f9b6818fbe95f517fffcd diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml index cf330e398b38..8a4dc8829191 100644 --- a/app-benchmarks/stress-ng/metadata.xml +++ b/app-benchmarks/stress-ng/metadata.xml @@ -13,6 +13,9 @@ that exercise floating point, integer, bit manipulation and control flow and over 20 virtual memory stress tests. </longdescription> + <use> + <flag name="keyutils">Stress test the kernel's key generation facilities via <pkg>sys-apps/keyutils</pkg></flag> + </use> <upstream> <bugs-to>https://github.com/ColinIanKing/stress-ng/issues</bugs-to> <remote-id type="github">ColinIanKing/stress-ng</remote-id> diff --git a/app-benchmarks/stress-ng/stress-ng-0.17.04.ebuild b/app-benchmarks/stress-ng/stress-ng-0.15.06-r2.ebuild index 5b514143db21..5eab59d89bc9 100644 --- a/app-benchmarks/stress-ng/stress-ng-0.17.04.ebuild +++ b/app-benchmarks/stress-ng/stress-ng-0.15.06-r2.ebuild @@ -12,14 +12,13 @@ SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz - LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" -IUSE="apparmor jpeg sctp" +IUSE="apparmor keyutils jpeg sctp" DEPEND=" dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= sys-apps/attr - sys-apps/keyutils:= sys-libs/libcap sys-libs/zlib virtual/libcrypt:= @@ -28,6 +27,7 @@ DEPEND=" sys-libs/libapparmor ) jpeg? ( media-libs/libjpeg-turbo:= ) + keyutils? ( sys-apps/keyutils:= ) sctp? ( net-misc/lksctp-tools ) " @@ -50,6 +50,7 @@ src_compile() { local myemakeopts=( HAVE_APPARMOR="$(usex apparmor 1 0)" HAVE_LIB_JPEG="$(usex jpeg 1 0)" + HAVE_KEYUTILS_H="$(usex keyutils 1 0)" HAVE_LIB_SCTP="$(usex sctp 1 0)" VERBOSE="1" ) diff --git a/app-benchmarks/stress-ng/stress-ng-0.17.04-r1.ebuild b/app-benchmarks/stress-ng/stress-ng-0.17.04-r1.ebuild new file mode 100644 index 000000000000..5eab59d89bc9 --- /dev/null +++ b/app-benchmarks/stress-ng/stress-ng-0.17.04-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info toolchain-funcs + +DESCRIPTION="Stress test for a computer system with various selectable ways" +HOMEPAGE="https://github.com/ColinIanKing/stress-ng" +SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86" +IUSE="apparmor keyutils jpeg sctp" + +DEPEND=" + dev-libs/libaio + dev-libs/libbsd + dev-libs/libgcrypt:0= + sys-apps/attr + sys-libs/libcap + sys-libs/zlib + virtual/libcrypt:= + apparmor? ( + sys-apps/apparmor-utils + sys-libs/libapparmor + ) + jpeg? ( media-libs/libjpeg-turbo:= ) + keyutils? ( sys-apps/keyutils:= ) + sctp? ( net-misc/lksctp-tools ) +" + +RDEPEND="${DEPEND}" + +DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" ) + +pkg_pretend() { + if use apparmor; then + CONFIG_CHECK="SECURITY_APPARMOR" + check_extra_config + fi +} + +src_compile() { + tc-export CC + + export MAN_COMPRESS="0" + + local myemakeopts=( + HAVE_APPARMOR="$(usex apparmor 1 0)" + HAVE_LIB_JPEG="$(usex jpeg 1 0)" + HAVE_KEYUTILS_H="$(usex keyutils 1 0)" + HAVE_LIB_SCTP="$(usex sctp 1 0)" + VERBOSE="1" + ) + + emake "${myemakeopts[@]}" +} |