* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/
@ 2017-03-01 5:41 Mike Frysinger
0 siblings, 0 replies; 6+ messages in thread
From: Mike Frysinger @ 2017-03-01 5:41 UTC (permalink / raw
To: gentoo-commits
commit: cb6f3225601c0c0dd4aee641fd4d7859a4b7e5dd
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 1 04:58:20 2017 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 1 05:40:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb6f3225
sys-block/fio: drop old <2.15 versions and old patches
sys-block/fio/Manifest | 6 -
sys-block/fio/files/fio-2.2.10-libmtd.patch | 12 --
sys-block/fio/files/fio-2.2.9-atomic-sync.patch | 140 ------------------------
sys-block/fio/files/fio-2.8-sysmacros.patch | 47 --------
sys-block/fio/fio-2.15.ebuild | 1 -
sys-block/fio/fio-2.16.ebuild | 2 +-
sys-block/fio/fio-2.2.10.ebuild | 91 ---------------
sys-block/fio/fio-2.2.13.ebuild | 91 ---------------
sys-block/fio/fio-2.2.9.ebuild | 90 ---------------
sys-block/fio/fio-2.5.ebuild | 91 ---------------
sys-block/fio/fio-2.6.ebuild | 92 ----------------
sys-block/fio/fio-2.8.ebuild | 94 ----------------
12 files changed, 1 insertion(+), 756 deletions(-)
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 28616c8d49a..cf77e929e9b 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,8 +1,2 @@
DIST fio-2.15.tar.bz2 545809 SHA256 60044f92cfbd2f656162864aae309ab88ff5983c2e49f4b9f8271c445852f5bd SHA512 fa3380031e6e0a597eb34e597af91efbc824a3d5753793fdb00cb10e693943e0358afaad9624eb4333e81182c94424a56fbd1d434eeff098dbf2fc4e19167db0 WHIRLPOOL 32215d63a373c88041d90c6d07d87f9b4e6d4070d1b263676a817dc9ddd8cb175cbbc25e8359cec956ea26a39f40c1cb501ba897475f628ce4f6a5502939239e
DIST fio-2.16.tar.bz2 558662 SHA256 7d8dd6897a5fa181b4b707ffb7b87306c23a5a99a3aefa1d6f510150302cb6ec SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75 WHIRLPOOL cdd11fd09dce3fec04b12f82fef6d53c8ae70623b35a39cbfe50039bf9be5d80e00715c58e9fa6dee67a471327bf6da7f741add880bfefa9eb26f432b265e9ac
-DIST fio-2.2.10.tar.bz2 497503 SHA256 04b4490c69f82bafeccbab51d33732cfd74e7a54e74eae0d9a2450faf4f1d857 SHA512 6ff71ca78b2ffa40cd9390b3e4f0b6f07db4d50c85f89c4a9e03c7f327153c0fed3eb8b7c44f3a8f8d0b1b35b48ccb5b1aa96a95fdca08581c22b99f2961c7d3 WHIRLPOOL 7bb881ecea82f3ad568d7513af0486494dc657ede69cc4de0f71e7bdf873ccf8f7a58744ab8f1fce8a1c507c3ce0f7e95eb3a7098a01fe041f04cd29a6a4afb7
-DIST fio-2.2.13.tar.bz2 503950 SHA256 66a0084c37bd8804d9f7d260d843a9a3bf51561954024d3b32062b9332281924 SHA512 b2adc4fb1b8c71bb909cfc2cfd9e0d25affcacd47908bc6d126625b448c0e964afa7c65fb88cf21662d4b9d07bfbaebbb2fd66b4c4662382ef68aaf8f053bd6d WHIRLPOOL 112af8620a73e907723760fd01caa4c582f7adba5eef5bf51bb6b695c1a15ff812957937cb67dff00b93c3e941df67d751ecf1aca1627722a6084c5494e7f70a
-DIST fio-2.2.9.tar.bz2 492404 SHA256 c881d9cf15500bd4436970d0467c356c5c021417131587931ba78845e965bf56 SHA512 e0cd26bb8a760ef5e40ddb73246671c1988f0c0886bd24fa510fcab93fe64d8853f120355f55fa109168c7fae0b081f63278f2233644f5ed20da4e4c3cb3f3fc WHIRLPOOL 4f5ada7f1140c7229fc3173fa0582a4ae7401121768d8dec828dcd42c1c22ec828e9c000c482b155ead4fd75ee15c4d7678fc7c6d18c8fbb9c749e83f87a4881
-DIST fio-2.5.tar.bz2 509978 SHA256 30f85cd6596125bd2f76b379f15a4edee1149bb0347a9c10a2dda15d7591a543 SHA512 44fc4bc342b611f9ed89685d73592389dd9e63970a9bbcc1b332aa8434a3e4a52b0c16d27b6a6dd96fcf3a9831a68af5249251895a6dbd9f7190ad0b8935eb40 WHIRLPOOL dced416aae899987ff80c6f37999a064d8a45c8ea809d7a3f3a2eea5dd3b6ae5633125326373a5da3b37429dc940f0c97fa9694e976a61819709db3b6ab7ac3e
-DIST fio-2.6.tar.bz2 509685 SHA256 b4b846fca614f724b8315348cb23e2d4a1046e63f10e79b4b310acf29c4d1ac0 SHA512 9831c3de2110c509f6c99ffe0fc8256aea2b9b337e6b2799108c89d1b5e472a85e6df9cb090549db80429658717aa75f2ab10d41359386e1dde861c600645b39 WHIRLPOOL c5138eb2def4c67ee0d5cca46db6aa663e2a1e0eead05aab5938ced20dd68bc214f217724d3bd1c4a1030b4ffee2c07ee37910b57c6f11b2ed6a0ff67d3b30cc
-DIST fio-2.8.tar.bz2 513800 SHA256 815344531a6c0201872aca43581c2e4b6fbc1d735266dd12a0c3408754ec862f SHA512 2228dab377f6664ce9e1bd6e5720e7eb256370758f6cea25c778a2480b5fbbf39630e8c5676e2cf34d9d664c7b1960c618feb1bd252fec290e09bf534672922c WHIRLPOOL fd32419a2d338a77f76d68831eb08ae7b1f34892d03bcd931a8cca3630813767fefa081148fd8f636531b62bd71c7fa0a7d4d71c53d8c8294f7cad7bb794eec6
diff --git a/sys-block/fio/files/fio-2.2.10-libmtd.patch b/sys-block/fio/files/fio-2.2.10-libmtd.patch
deleted file mode 100644
index 7e0a0c0d7d5..00000000000
--- a/sys-block/fio/files/fio-2.2.10-libmtd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude config.log fio-2.2.10/lib/libmtd.h fio-2.2.10.new/lib/libmtd.h
---- fio-2.2.10/lib/libmtd.h 2016-01-26 18:02:07.000000000 -0800
-+++ fio-2.2.10.new/lib/libmtd.h 2016-02-03 08:10:19.104693006 -0800
-@@ -29,6 +29,8 @@
- extern "C" {
- #endif
-
-+#include <stdint.h>
-+
- /* Maximum MTD device name length */
- #define MTD_NAME_MAX 127
- /* Maximum MTD device type string length */
diff --git a/sys-block/fio/files/fio-2.2.9-atomic-sync.patch b/sys-block/fio/files/fio-2.2.9-atomic-sync.patch
deleted file mode 100644
index a8b32022e44..00000000000
--- a/sys-block/fio/files/fio-2.2.9-atomic-sync.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-fix from upstream
-
-From 2a2743361cf643b9dd2ba3e491da62e7cb83a101 Mon Sep 17 00:00:00 2001
-From: Jens Axboe <axboe@fb.com>
-Date: Mon, 29 Jun 2015 09:34:39 -0600
-Subject: [PATCH] workqueue: make it work on platforms without
- __sync_fetch_and_add()
-
-Signed-off-by: Jens Axboe <axboe@fb.com>
----
- configure | 22 ++++++++++++++++++++++
- workqueue.c | 22 ++++++++++++++++++++++
- workqueue.h | 1 +
- 3 files changed, 45 insertions(+)
-
-diff --git a/configure b/configure
-index e459d63..e5cf34d 100755
---- a/configure
-+++ b/configure
-@@ -271,6 +271,7 @@ CYGWIN*)
- output_sym "CONFIG_TCP_NODELAY"
- output_sym "CONFIG_TLS_THREAD"
- output_sym "CONFIG_IPV6"
-+ output_sym "CONFIG_SFA"
- echo "CC=$CC" >> $config_host_mak
- echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
- exit 0
-@@ -1492,6 +1493,24 @@ if compile_prog "" "" "getmntinfo"; then
- fi
- echo "getmntinfo $getmntinfo"
-
-+##########################################
-+# Check whether we have __sync_fetch_and_add()
-+sfa=="no"
-+cat > $TMPC << EOF
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <inttypes.h>
-+int main(int argc, char **argv)
-+{
-+ uint64_t dst = 1, src = 3;
-+ __sync_fetch_and_add(&dst, src);
-+}
-+EOF
-+if compile_prog "" "" "__sync_fetch_and_add"; then
-+ sfa="yes"
-+fi
-+echo "__sync_fetch_and_add $sfa"
-+
- #############################################################################
-
- if test "$wordsize" = "64" ; then
-@@ -1671,6 +1690,9 @@ fi
- if test "$getmntinfo" = "yes" ; then
- output_sym "CONFIG_GETMNTINFO"
- fi
-+if test "$sfa" = "yes" ; then
-+ output_sym "CONFIG_SFA"
-+fi
-
- if test "$zlib" = "no" ; then
- echo "Consider installing zlib-dev (zlib-devel), some fio features depend on it."
-diff --git a/workqueue.c b/workqueue.c
-index b9a967f..8f6963f 100644
---- a/workqueue.c
-+++ b/workqueue.c
-@@ -197,6 +197,7 @@ err:
- return 1;
- }
-
-+#ifdef CONFIG_SFA
- static void sum_val(uint64_t *dst, uint64_t *src)
- {
- if (*src) {
-@@ -204,15 +205,34 @@ static void sum_val(uint64_t *dst, uint64_t *src)
- *src = 0;
- }
- }
-+#else
-+static void sum_val(uint64_t *dst, uint64_t *src)
-+{
-+ if (*src) {
-+ *dst += *src;
-+ *src = 0;
-+ }
-+}
-+#endif
-
- static void sum_ddir(struct thread_data *dst, struct thread_data *src,
- enum fio_ddir ddir)
- {
-+#ifndef CONFIG_SFA
-+ pthread_mutex_lock(&dst->io_wq.stat_lock);
-+ pthread_mutex_lock(&src->io_wq.stat_lock);
-+#endif
-+
- sum_val(&dst->io_bytes[ddir], &src->io_bytes[ddir]);
- sum_val(&dst->io_blocks[ddir], &src->io_blocks[ddir]);
- sum_val(&dst->this_io_blocks[ddir], &src->this_io_blocks[ddir]);
- sum_val(&dst->this_io_bytes[ddir], &src->this_io_bytes[ddir]);
- sum_val(&dst->bytes_done[ddir], &src->bytes_done[ddir]);
-+
-+#ifndef CONFIG_SFA
-+ pthread_mutex_unlock(&src->io_wq.stat_lock);
-+ pthread_mutex_unlock(&dst->io_wq.stat_lock);
-+#endif
- }
-
- static void update_accounting(struct submit_worker *sw)
-@@ -355,6 +375,7 @@ void workqueue_exit(struct workqueue *wq)
- free(wq->workers);
- pthread_mutex_destroy(&wq->flush_lock);
- pthread_cond_destroy(&wq->flush_cond);
-+ pthread_mutex_destroy(&wq->stat_lock);
- }
-
- static int start_worker(struct workqueue *wq, unsigned int index)
-@@ -393,6 +414,7 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
- wq->next_free_worker = 0;
- pthread_cond_init(&wq->flush_cond, NULL);
- pthread_mutex_init(&wq->flush_lock, NULL);
-+ pthread_mutex_init(&wq->stat_lock, NULL);
-
- wq->workers = calloc(wq->max_workers, sizeof(struct submit_worker));
-
-diff --git a/workqueue.h b/workqueue.h
-index 5d47a5e..4e92449 100644
---- a/workqueue.h
-+++ b/workqueue.h
-@@ -17,6 +17,7 @@ struct workqueue {
-
- pthread_cond_t flush_cond;
- pthread_mutex_t flush_lock;
-+ pthread_mutex_t stat_lock;
- volatile int wake_idle;
- };
-
---
-2.4.4
-
diff --git a/sys-block/fio/files/fio-2.8-sysmacros.patch b/sys-block/fio/files/fio-2.8-sysmacros.patch
deleted file mode 100644
index 0881c1b91d8..00000000000
--- a/sys-block/fio/files/fio-2.8-sysmacros.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/580592
-
-From a254805d9ca1872adced3f8be2a053211b8f27eb Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 20 Apr 2016 12:51:23 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor
-
-These functions have always been defined in sys/sysmacros.h under
-Linux C libraries. For some, including sys/types.h implicitly
-includes that as well, but glibc wants to deprecate that, and some
-others already have. Include the header explicitly for the funcs.
-
-The mtd change is already in upstream mtd-utils too.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- os/os-linux.h | 1 +
- oslib/libmtd_common.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/os/os-linux.h b/os/os-linux.h
-index 9e708f0..23c16b6 100644
---- a/os/os-linux.h
-+++ b/os/os-linux.h
-@@ -6,6 +6,7 @@
- #include <sys/ioctl.h>
- #include <sys/uio.h>
- #include <sys/syscall.h>
-+#include <sys/sysmacros.h>
- #include <sys/vfs.h>
- #include <sys/mman.h>
- #include <unistd.h>
-diff --git a/oslib/libmtd_common.h b/oslib/libmtd_common.h
-index a123323..9768066 100644
---- a/oslib/libmtd_common.h
-+++ b/oslib/libmtd_common.h
-@@ -30,6 +30,7 @@
- #include <errno.h>
- #include <features.h>
- #include <inttypes.h>
-+#include <sys/sysmacros.h>
-
- #ifndef PROGRAM_NAME
- # error "You must define PROGRAM_NAME before including this header"
---
-2.7.4
-
diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild
index 5ff7ba987f7..1158dbdae90 100644
--- a/sys-block/fio/fio-2.15.ebuild
+++ b/sys-block/fio/fio-2.15.ebuild
@@ -39,7 +39,6 @@ RDEPEND+="
S="${WORKDIR}/${MY_P}"
src_prepare() {
- #epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
epatch_user
diff --git a/sys-block/fio/fio-2.16.ebuild b/sys-block/fio/fio-2.16.ebuild
index f3c960214b7..c57607e80a2 100644
--- a/sys-block/fio/fio-2.16.ebuild
+++ b/sys-block/fio/fio-2.16.ebuild
@@ -39,9 +39,9 @@ RDEPEND+="
S="${WORKDIR}/${MY_P}"
PATCHES=(
- # "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
"${FILESDIR}"/fio-2.2.13-libmtd.patch
)
+
src_prepare() {
sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
diff --git a/sys-block/fio/fio-2.2.10.ebuild b/sys-block/fio/fio-2.2.10.ebuild
deleted file mode 100644
index acf467c2713..00000000000
--- a/sys-block/fio/fio-2.2.10.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
- glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
- gtk? (
- static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
- x11-libs/gtk+:2
- )
- numa? ( sys-process/numactl )
- rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
- zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/fio-2.2.10-libmtd.patch
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.2.13.ebuild b/sys-block/fio/fio-2.2.13.ebuild
deleted file mode 100644
index dd2f14e9d1b..00000000000
--- a/sys-block/fio/fio-2.2.13.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
- glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
- gtk? (
- static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
- x11-libs/gtk+:2
- )
- numa? ( sys-process/numactl )
- rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
- zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.2.9.ebuild b/sys-block/fio/fio-2.2.9.ebuild
deleted file mode 100644
index 5dd6921dfec..00000000000
--- a/sys-block/fio/fio-2.2.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ia64 ppc ppc64 x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
- glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
- gtk? (
- static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
- x11-libs/gtk+:2
- )
- numa? ( sys-process/numactl )
- rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
- zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
- epatch "${FILESDIR}"/${P}-atomic-sync.patch
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.5.ebuild b/sys-block/fio/fio-2.5.ebuild
deleted file mode 100644
index dd2f14e9d1b..00000000000
--- a/sys-block/fio/fio-2.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
- glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
- gtk? (
- static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
- x11-libs/gtk+:2
- )
- numa? ( sys-process/numactl )
- rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
- zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.6.ebuild b/sys-block/fio/fio-2.6.ebuild
deleted file mode 100644
index da3b76334ae..00000000000
--- a/sys-block/fio/fio-2.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-
-# GTK+:2 does not offer static libaries
-# numactl always includes static libraries
-DEPEND="aio? ( static? ( dev-libs/libaio[static-libs(+)] ) !static? ( dev-libs/libaio ) )
- glusterfs? ( static? ( sys-cluster/glusterfs[static-libs(+)] ) !static? ( sys-cluster/glusterfs ) )
- gtk? (
- static? ( dev-libs/glib:2[static-libs(+)] ) !static? ( dev-libs/glib:2 )
- x11-libs/gtk+:2
- )
- numa? ( sys-process/numactl )
- rbd? ( static? ( sys-cluster/ceph[static-libs(+)] ) !static? ( sys-cluster/ceph ) )
- zlib? ( static? ( sys-libs/zlib[static-libs(+)] ) !static? ( sys-libs/zlib ) )"
-RDEPEND="${DEPEND}
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
- epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.8.ebuild b/sys-block/fio/fio-2.8.ebuild
deleted file mode 100644
index cff874b73f0..00000000000
--- a/sys-block/fio/fio-2.8.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/fio-2.8-sysmacros.patch #580592
- epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/
@ 2019-11-11 19:55 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2019-11-11 19:55 UTC (permalink / raw
To: gentoo-commits
commit: a61a2972fba62810cf6ba82e3e747e303d171149
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 11 19:54:03 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Nov 11 19:54:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61a2972
sys-block/fio: fix USE=gtk build failure, bug #699878
With USE=gtk build failed as:
```
gclient.c:333:2: error: too many arguments to function 'strncpy'
333 | strncpy(message, sizeof(message), "%s", status_message);
| ^~~~~~~
```
Picked upstream fix as-is.
Reported-by: Rafal Kupiec
Closes: https://bugs.gentoo.org/699878
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
sys-block/fio/files/fio-3.16-snprintf.patch | 44 +++++++++++++++++++++++++++++
sys-block/fio/fio-3.16.ebuild | 1 +
2 files changed, 45 insertions(+)
diff --git a/sys-block/fio/files/fio-3.16-snprintf.patch b/sys-block/fio/files/fio-3.16-snprintf.patch
new file mode 100644
index 00000000000..1470290f3cb
--- /dev/null
+++ b/sys-block/fio/files/fio-3.16-snprintf.patch
@@ -0,0 +1,44 @@
+From 5b215853ed4b438b5b2d4ac3e56d5f0d19e145d9 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date: Mon, 23 Sep 2019 14:12:12 -0700
+Subject: [PATCH] Fix compilation error with gfio
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 36833fb04 replaced many usages of strncpy with snprintf.
+But there is one place where new arguments were added but the function
+name has not been changed. It leads to the following compilation error:
+
+gclient.c:333:2: error: too many arguments to function ‘strncpy’
+ 333 | strncpy(message, sizeof(message), "%s", status_message);
+ | ^~~~~~~
+In file included from /usr/include/features.h:450,
+ from /usr/include/bits/libc-header-start.h:33,
+ from /usr/include/stdlib.h:25,
+ from gclient.c:1:
+/usr/include/bits/string_fortified.h:103:1: note: declared here
+ 103 | __NTH (strncpy (char *__restrict __dest, const char *__restrict __src,
+ | ^~~~~
+
+Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
+---
+ gclient.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gclient.c b/gclient.c
+index 64324177..d8dc62d2 100644
+--- a/gclient.c
++++ b/gclient.c
+@@ -330,7 +330,7 @@ static void gfio_update_thread_status_all(struct gui *ui, char *status_message,
+ static char message[100];
+ const char *m = message;
+
+- strncpy(message, sizeof(message), "%s", status_message);
++ snprintf(message, sizeof(message), "%s", status_message);
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), m);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), perc / 100.0);
+ gtk_widget_queue_draw(ui->window);
+--
+2.24.0
+
diff --git a/sys-block/fio/fio-3.16.ebuild b/sys-block/fio/fio-3.16.ebuild
index 9547b89e0b7..440fa1282c4 100644
--- a/sys-block/fio/fio-3.16.ebuild
+++ b/sys-block/fio/fio-3.16.ebuild
@@ -55,6 +55,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/fio-2.2.13-libmtd.patch
+ "${FILESDIR}"/fio-3.16-snprintf.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/
@ 2020-01-24 18:36 Mike Frysinger
0 siblings, 0 replies; 6+ messages in thread
From: Mike Frysinger @ 2020-01-24 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 7e3015666946f8d6dde2c0674d35553bbb934888
Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Fri Jan 24 18:35:55 2020 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 18:36:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e301566
sys-block/fio: add fix from upstream for verification
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
.../fio/files/fio-3.16-verify_only_numberio.patch | 60 ++++++++++
sys-block/fio/fio-3.16-r1.ebuild | 130 +++++++++++++++++++++
2 files changed, 190 insertions(+)
diff --git a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch
new file mode 100644
index 00000000000..52fb389f62b
--- /dev/null
+++ b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch
@@ -0,0 +1,60 @@
+From 8859c0675aec03467ed65dfc79ecc874d026f165 Mon Sep 17 00:00:00 2001
+From: Gwendal Grignou <gwendal@chromium.org>
+Date: Mon, 13 Jan 2020 16:35:10 -0800
+Subject: [PATCH] verify: Fix test to not check for numberio when verify_only
+ is true
+
+io->numberio can not be populated when verify_only is true, because
+do_dry_run() build and complete IOs immediately, so it can not replicate
+the numberio that was produced when the data was layered on the media.
+
+Without this fix, using write_random
+[write_stress]
+filename=${FILENAME}
+size=${FILESIZE}
+verify_only=${VERIFY_ONLY}
+readwrite=randwrite
+bs=4k
+ioengine=libaio
+iodepth=32
+direct=1
+do_verify=1
+verify=crc32c
+
+'VERIFY_ONLY=1 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' passes,
+but
+'VERIFY_ONLY=0 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' fails:
+"""verify_only option fails with verify: bad header numberio 1, wanted
+0""".
+The fix addresses the problem by not checking numberio.
+
+Fixes #732
+
+Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
+---
+ verify.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/verify.c b/verify.c
+index a2c0d41dbb8c..cf299ebf9643 100644
+--- a/verify.c
++++ b/verify.c
+@@ -845,13 +845,11 @@ static int verify_header(struct io_u *io_u, struct thread_data *td,
+ * For read-only workloads, the program cannot be certain of the
+ * last numberio written to a block. Checking of numberio will be
+ * done only for workloads that write data. For verify_only,
+- * numberio will be checked in the last iteration when the correct
+- * state of numberio, that would have been written to each block
+- * in a previous run of fio, has been reached.
++ * numberio check is skipped.
+ */
+ if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) &&
+ !td->o.time_based)
+- if (!td->o.verify_only || td->o.loops == 0)
++ if (!td->o.verify_only)
+ if (hdr->numberio != io_u->numberio) {
+ log_err("verify: bad header numberio %"PRIu16
+ ", wanted %"PRIu16,
+--
+2.23.0
+
diff --git a/sys-block/fio/fio-3.16-r1.ebuild b/sys-block/fio/fio-3.16-r1.ebuild
new file mode 100644
index 00000000000..2538a0046ce
--- /dev/null
+++ b/sys-block/fio/fio-3.16-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib"
+REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )
+ libressl? ( curl )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+ curl? (
+ net-misc/curl:=[static-libs(+)]
+ !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+ libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+ )
+ glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+ gtk? ( dev-libs/glib:2[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ rbd? ( sys-cluster/ceph[static-libs(+)] )
+ rdma? (
+ sys-fabric/libibverbs[static-libs(+)]
+ sys-fabric/librdmacm[static-libs(+)]
+ )
+ tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+ zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+RDEPEND+="
+ gnuplot? (
+ sci-visualization/gnuplot
+ $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+ ${PYTHON_DEPS}
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/fio-2.2.13-libmtd.patch
+ "${FILESDIR}"/fio-3.16-snprintf.patch
+ "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
+)
+
+python_check_deps() {
+ has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+
+ sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+ # Many checks don't have configure flags.
+ sed -i \
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+ -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
+ -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
+ configure || die
+}
+
+src_configure() {
+ chmod g-w "${T}"
+ # not a real configure script
+ # TODO: pmem
+ set -- \
+ ./configure \
+ --disable-optimizations \
+ --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+ --cc="$(tc-getCC)" \
+ --disable-pmem \
+ $(usex curl '' '--disable-http') \
+ $(usex glusterfs '' '--disable-gfapi') \
+ $(usex gtk '--enable-gfio' '') \
+ $(usex numa '' '--disable-numa') \
+ $(usex rbd '' '--disable-rbd') \
+ $(usex rdma '' '--disable-rdma') \
+ $(usex static '--build-static' '') \
+ $(usex tcmalloc '' '--disable-tcmalloc')
+ echo "$@"
+ "$@" || die 'configure failed'
+}
+
+src_compile() {
+ emake V=1 OPTFLAGS=
+}
+
+src_install() {
+ emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+ if use gnuplot ; then
+ sed -i 's:python2.7:python:g' \
+ "${ED}/usr/bin/fio2gnuplot" \
+ "${ED}/usr/bin/fiologparser_hist.py" \
+ "${ED}/usr/bin/fiologparser.py"
+ python_replicate_script \
+ "${ED}/usr/bin/fio2gnuplot" \
+ "${ED}/usr/bin/fiologparser_hist.py" \
+ "${ED}/usr/bin/fiologparser.py"
+ else
+ rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
+ rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
+ rm "${ED}"/usr/share/fio/*.gpm || die
+ rmdir "${ED}"/usr/share/fio/ 2>/dev/null
+ fi
+
+ # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+ rm "${ED}"/usr/bin/genfio || die
+
+ dodoc README REPORTING-BUGS HOWTO
+ docinto examples
+ dodoc examples/*
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/
@ 2020-09-19 12:29 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-09-19 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 8a76bf34cf032ba87c31b9eeca103a375b928e0b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 11:54:03 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 12:29:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a76bf34
sys-block/fio: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-block/fio/Manifest | 3 -
sys-block/fio/files/fio-2.2.15-rdma.patch | 52 ---------------
sys-block/fio/fio-2.15.ebuild | 96 ---------------------------
sys-block/fio/fio-2.16.ebuild | 107 ------------------------------
sys-block/fio/fio-3.2.ebuild | 107 ------------------------------
5 files changed, 365 deletions(-)
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 1c6fdb48810..9a65f29d8ca 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,8 +1,5 @@
-DIST fio-2.15.tar.bz2 545809 BLAKE2B 163530097a6ff08016c977a328bc499d052c423890c8e7074bc91fb00b02b3d951dd0369ff772fa5f36a37e0b1b7d6b358c3df99bf70db9bec2bbc7f90eee596 SHA512 fa3380031e6e0a597eb34e597af91efbc824a3d5753793fdb00cb10e693943e0358afaad9624eb4333e81182c94424a56fbd1d434eeff098dbf2fc4e19167db0
-DIST fio-2.16.tar.bz2 558662 BLAKE2B cbc6e6000bd497fc92779c34688c0862f3adccd7c399ca5d4e4ce9ee9c40faddfec9b3fcca2fad2cd91ca00eee95c4a108273496c9e63db8017695ecf42d294d SHA512 f71c8ab8423e82ceae160bae8c17ac1222c1b2dde2ccb1b2aedb2288e0eb60485f8e9f3908640d4f6cebf166a148f4ad64026c035381c5db5141bf3059349d75
DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23
DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e
DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb
-DIST fio-3.2.tar.bz2 613565 BLAKE2B e721d698338dd8d2c6215780a2d9a10c643a5912d3c27b3e759b4c14585ae1afe4edab5bdc54df8cf19c6f3727f8f4b19ce9da3298a5f0ef3753a5d8f423f4ef SHA512 97ea5ed6587d1e7382a67ab7ad933b6e332ba84cb648d17dcebad3c95c9eb6b1c04a4537e3470f890607f2921da77fcd4e49079b8b78f2d15e9c199dab850d1e
DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266
diff --git a/sys-block/fio/files/fio-2.2.15-rdma.patch b/sys-block/fio/files/fio-2.2.15-rdma.patch
deleted file mode 100644
index 3ca9198840e..00000000000
--- a/sys-block/fio/files/fio-2.2.15-rdma.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fd6d9c789bcb8b7c7b1edf34249e034094d341fc Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 28 Feb 2017 22:25:58 -0700
-Subject: [PATCH] configure: add a --disable-rdma flag to control rdma deps
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 15b87fac0e4c..187ac3583805 100755
---- a/configure
-+++ b/configure
-@@ -166,6 +166,8 @@ for opt do
- ;;
- --disable-numa) disable_numa="yes"
- ;;
-+ --disable-rdma) disable_rdma="yes"
-+ ;;
- --disable-rbd) disable_rbd="yes"
- ;;
- --disable-rbd-blkin) disable_rbd_blkin="yes"
-@@ -204,6 +206,7 @@ if test "$show_help" = "yes" ; then
- echo "--esx Configure build options for esx"
- echo "--enable-gfio Enable building of gtk gfio"
- echo "--disable-numa Disable libnuma even if found"
-+ echo "--disable-rdma Disable RDMA support even if found"
- echo "--disable-gfapi Disable gfapi"
- echo "--enable-libhdfs Enable hdfs support"
- echo "--disable-lex Disable use of lex/yacc for math"
-@@ -642,7 +645,7 @@ int main(int argc, char **argv)
- return 0;
- }
- EOF
--if compile_prog "" "-libverbs" "libverbs" ; then
-+if test "$disable_rdma" != "yes" && compile_prog "" "-libverbs" "libverbs" ; then
- libverbs="yes"
- LIBS="-libverbs $LIBS"
- fi
-@@ -660,7 +663,7 @@ int main(int argc, char **argv)
- return 0;
- }
- EOF
--if compile_prog "" "-lrdmacm" "rdma"; then
-+if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then
- rdmacm="yes"
- LIBS="-lrdmacm $LIBS"
- fi
---
-2.11.1
-
diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild
deleted file mode 100644
index f10632dd4d7..00000000000
--- a/sys-block/fio/fio-2.15.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/fio-2.2.13-libmtd.patch
- epatch "${FILESDIR}"/fio-2.2.15-rdma.patch #542640
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
- epatch_user
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script "${ED}/usr/bin/fio2gnuplot"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-2.16.ebuild b/sys-block/fio/fio-2.16.ebuild
deleted file mode 100644
index 41ad19361c1..00000000000
--- a/sys-block/fio/fio-2.16.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- rdma? (
- sys-fabric/libibverbs[static-libs(+)]
- sys-fabric/librdmacm[static-libs(+)]
- )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
- "${FILESDIR}"/fio-2.2.15-rdma.patch #542640
-)
-
-src_prepare() {
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
- default
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fio_latency2csv.py" \
- "${ED}/usr/bin/fiologparser.py"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-3.2.ebuild b/sys-block/fio/fio-3.2.ebuild
deleted file mode 100644
index 0cc5ace16ed..00000000000
--- a/sys-block/fio/fio-3.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- rdma? (
- sys-fabric/libibverbs[static-libs(+)]
- sys-fabric/librdmacm[static-libs(+)]
- )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
-)
-
-src_prepare() {
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
- default
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- # TODO: pmem
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- --disable-pmem \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- python_replicate_script \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/
@ 2021-01-01 2:03 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2021-01-01 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 5255bb4ddd9b1f9e40c208bfe9d056c1acf323e3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 1 01:57:34 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 1 01:57:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5255bb4d
sys-block/fio: Remove old (py3.6)
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-block/fio/Manifest | 3 -
sys-block/fio/files/fio-3.16-snprintf.patch | 44 ------
.../fio/files/fio-3.16-verify_only_numberio.patch | 60 ---------
sys-block/fio/fio-3.16-r1.ebuild | 130 ------------------
sys-block/fio/fio-3.16.ebuild | 129 ------------------
sys-block/fio/fio-3.17-r1.ebuild | 147 ---------------------
sys-block/fio/fio-3.17.ebuild | 129 ------------------
sys-block/fio/fio-3.7.ebuild | 111 ----------------
8 files changed, 753 deletions(-)
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 9a65f29d8ca..d4ce5a3afc0 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1,5 +1,2 @@
-DIST fio-3.16.tar.bz2 881436 BLAKE2B fee99930d0245474eb67ceee2d1a6ec2f1a0eb4da6d52cf8616d7eda64699a8c2727715284134fd4931e91efad69b064f66a80a78f70ea03e66d4eab4e601120 SHA512 2d651b20cbc6c7babf3adc082dbe78e1f7de920764653cf5ffd99df7516cf6190ffefe2152d2739326d3102949d9bad7db978ff88866cfa54020f9ec3b0a2a23
-DIST fio-3.17.tar.bz2 888795 BLAKE2B 10277efb1234708aff336fc3c0723d0b9b5c903dce3a999ea2b8749b5034c778be4828549b9e0d9fc36a4f9429ca86ac0011f0c110e1a44ed3ad33b6e4a30a68 SHA512 27dba4c3e8f544c0fd40a5f42660f64f42e114e7b56199bc70f540b1a09b9dec9291e3fbae0fab9691189fa4a1f40edbcf4f9b53c313fd9c1a8ba0fdbb7f524e
DIST fio-3.19.tar.bz2 902391 BLAKE2B 84993717248add335a77c6fc03fa730f628806e1e001078d48a91bc5ac9703e42c6cc5c720cfe76a83d1daf4af2245bfd78fd6a871611de1c19562ca70a9cc89 SHA512 0004dbaf5a8ce4f2b13114a3bfb65c388bb6d01e9a82791208ff7e7eb54cd6741e60cc8cb0a19f6319301ee2040c03862725943972ea767e6cc65fce4a2b3ecb
DIST fio-3.20.tar.bz2 912040 BLAKE2B 44f8c20a390a6382aadc07881c1e7c65cca932099a1b3992e848669cf2a52b410fde67f9ae576efcd0d8e88ceec04174b6bc077d4b3f9b615b59be9f24f62bed SHA512 4e073754c95cb8d6416a80f48ca61003f34d664717f67a3f29b554e9205f8fe3553595ba6f8a8e9cb3463022d5c83be961f5b5a1ebcd2a9f4da9406a9986c1fb
-DIST fio-3.7.tar.bz2 629354 BLAKE2B 99a1c88481c7a693e31b1a0bc23bc80e85df92385f9d5a7de8d6479be8bc425326a20d794eb4809f822adfcd06e07c66ebed321faa9dbae7a2c1d3c766a6467d SHA512 b1f5cb35fe1c06e030c570959ab9a96d936f9eaa2f7f30d5a34f34fd93fae057da07c4084a06143cd5188ad6b2cc06b564484f8867e050cfeddc0ee3fb0fe266
diff --git a/sys-block/fio/files/fio-3.16-snprintf.patch b/sys-block/fio/files/fio-3.16-snprintf.patch
deleted file mode 100644
index 1470290f3cb..00000000000
--- a/sys-block/fio/files/fio-3.16-snprintf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5b215853ed4b438b5b2d4ac3e56d5f0d19e145d9 Mon Sep 17 00:00:00 2001
-From: Anatol Pomozov <anatol.pomozov@gmail.com>
-Date: Mon, 23 Sep 2019 14:12:12 -0700
-Subject: [PATCH] Fix compilation error with gfio
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 36833fb04 replaced many usages of strncpy with snprintf.
-But there is one place where new arguments were added but the function
-name has not been changed. It leads to the following compilation error:
-
-gclient.c:333:2: error: too many arguments to function ‘strncpy’
- 333 | strncpy(message, sizeof(message), "%s", status_message);
- | ^~~~~~~
-In file included from /usr/include/features.h:450,
- from /usr/include/bits/libc-header-start.h:33,
- from /usr/include/stdlib.h:25,
- from gclient.c:1:
-/usr/include/bits/string_fortified.h:103:1: note: declared here
- 103 | __NTH (strncpy (char *__restrict __dest, const char *__restrict __src,
- | ^~~~~
-
-Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
----
- gclient.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gclient.c b/gclient.c
-index 64324177..d8dc62d2 100644
---- a/gclient.c
-+++ b/gclient.c
-@@ -330,7 +330,7 @@ static void gfio_update_thread_status_all(struct gui *ui, char *status_message,
- static char message[100];
- const char *m = message;
-
-- strncpy(message, sizeof(message), "%s", status_message);
-+ snprintf(message, sizeof(message), "%s", status_message);
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ui->thread_status_pb), m);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ui->thread_status_pb), perc / 100.0);
- gtk_widget_queue_draw(ui->window);
---
-2.24.0
-
diff --git a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch b/sys-block/fio/files/fio-3.16-verify_only_numberio.patch
deleted file mode 100644
index 52fb389f62b..00000000000
--- a/sys-block/fio/files/fio-3.16-verify_only_numberio.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 8859c0675aec03467ed65dfc79ecc874d026f165 Mon Sep 17 00:00:00 2001
-From: Gwendal Grignou <gwendal@chromium.org>
-Date: Mon, 13 Jan 2020 16:35:10 -0800
-Subject: [PATCH] verify: Fix test to not check for numberio when verify_only
- is true
-
-io->numberio can not be populated when verify_only is true, because
-do_dry_run() build and complete IOs immediately, so it can not replicate
-the numberio that was produced when the data was layered on the media.
-
-Without this fix, using write_random
-[write_stress]
-filename=${FILENAME}
-size=${FILESIZE}
-verify_only=${VERIFY_ONLY}
-readwrite=randwrite
-bs=4k
-ioengine=libaio
-iodepth=32
-direct=1
-do_verify=1
-verify=crc32c
-
-'VERIFY_ONLY=1 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' passes,
-but
-'VERIFY_ONLY=0 FILENAME=/dev/sda1 FILESIZE=1M fio write_random' fails:
-"""verify_only option fails with verify: bad header numberio 1, wanted
-0""".
-The fix addresses the problem by not checking numberio.
-
-Fixes #732
-
-Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
----
- verify.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/verify.c b/verify.c
-index a2c0d41dbb8c..cf299ebf9643 100644
---- a/verify.c
-+++ b/verify.c
-@@ -845,13 +845,11 @@ static int verify_header(struct io_u *io_u, struct thread_data *td,
- * For read-only workloads, the program cannot be certain of the
- * last numberio written to a block. Checking of numberio will be
- * done only for workloads that write data. For verify_only,
-- * numberio will be checked in the last iteration when the correct
-- * state of numberio, that would have been written to each block
-- * in a previous run of fio, has been reached.
-+ * numberio check is skipped.
- */
- if (td_write(td) && (td_min_bs(td) == td_max_bs(td)) &&
- !td->o.time_based)
-- if (!td->o.verify_only || td->o.loops == 0)
-+ if (!td->o.verify_only)
- if (hdr->numberio != io_u->numberio) {
- log_err("verify: bad header numberio %"PRIu16
- ", wanted %"PRIu16,
---
-2.23.0
-
diff --git a/sys-block/fio/fio-3.16-r1.ebuild b/sys-block/fio/fio-3.16-r1.ebuild
deleted file mode 100644
index f77ee340c37..00000000000
--- a/sys-block/fio/fio-3.16-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="https://brick.kernel.dk/snaps/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib"
-REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )
- libressl? ( curl )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- curl? (
- net-misc/curl:=[static-libs(+)]
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- rdma? (
- sys-fabric/libibverbs[static-libs(+)]
- sys-fabric/librdmacm[static-libs(+)]
- )
- tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
- "${FILESDIR}"/fio-3.16-snprintf.patch
- "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
-)
-
-python_check_deps() {
- has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- # TODO: pmem
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- --disable-pmem \
- $(usex curl '' '--disable-http') \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '') \
- $(usex tcmalloc '' '--disable-tcmalloc')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- sed -i 's:python2.7:python:g' \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- python_replicate_script \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-3.16.ebuild b/sys-block/fio/fio-3.16.ebuild
deleted file mode 100644
index fa28576751a..00000000000
--- a/sys-block/fio/fio-3.16.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="https://brick.kernel.dk/snaps/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib"
-REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )
- libressl? ( curl )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- curl? (
- net-misc/curl:=[static-libs(+)]
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- rdma? (
- sys-fabric/libibverbs[static-libs(+)]
- sys-fabric/librdmacm[static-libs(+)]
- )
- tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
- "${FILESDIR}"/fio-3.16-snprintf.patch
-)
-
-python_check_deps() {
- has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- # TODO: pmem
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- --disable-pmem \
- $(usex curl '' '--disable-http') \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '') \
- $(usex tcmalloc '' '--disable-tcmalloc')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- sed -i 's:python2.7:python:g' \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- python_replicate_script \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-3.17-r1.ebuild b/sys-block/fio/fio-3.17-r1.ebuild
deleted file mode 100644
index 213a718797a..00000000000
--- a/sys-block/fio/fio-3.17-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="https://brick.kernel.dk/snaps/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio curl glusterfs gnuplot gtk libressl numa python rbd rdma static tcmalloc zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- libressl? ( curl )
- gnuplot? ( python )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- curl? (
- net-misc/curl:=[static-libs(+)]
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- rdma? (
- sys-fabric/libibverbs[static-libs(+)]
- sys-fabric/librdmacm[static-libs(+)]
- )
- tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- python? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
- )
- gnuplot? ( sci-visualization/gnuplot )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
- "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
-)
-
-python_check_deps() {
- has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- # TODO: pmem
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- --disable-pmem \
- $(usex curl '' '--disable-http') \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '') \
- $(usex tcmalloc '' '--disable-tcmalloc')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- local python2_7_files=(
- "${ED}"/usr/bin/fiologparser_hist.py
- "${ED}"/usr/bin/fiologparser.py
- )
- local python_files=(
- "${python2_7_files[@]}"
- "${ED}"/usr/bin/fio_jsonplus_clat2csv
- )
- if use python ; then
- sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
- python_replicate_script "${python2_7_files[@]}"
- else
- rm "${python_files[@]}" || die
- fi
-
- local gnuplot_python2_7_files=(
- "${ED}"/usr/bin/fio2gnuplot
- )
- local gnuplot_files=(
- "${gnuplot_python2_7_files[@]}"
- "${ED}"/usr/bin/fio_generate_plots
- "${ED}"/usr/share/man/man1/fio_generate_plots.1
- "${ED}"/usr/share/man/man1/fio2gnuplot.1
- "${ED}"/usr/share/fio/*.gpm
- )
- if use gnuplot ; then
- sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
- python_replicate_script "${gnuplot_python2_7_files[@]}"
- else
- rm "${gnuplot_files[@]}" || die
- rmdir "${ED}"/usr/share/fio/ || die
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-3.17.ebuild b/sys-block/fio/fio-3.17.ebuild
deleted file mode 100644
index 49775e5a636..00000000000
--- a/sys-block/fio/fio-3.17.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="https://brick.kernel.dk/snaps/"
-SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio curl glusterfs gnuplot gtk libressl numa rbd rdma static tcmalloc zlib"
-REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )
- libressl? ( curl )"
-
-BDEPEND="virtual/pkgconfig"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- curl? (
- net-misc/curl:=[static-libs(+)]
- !libressl? ( dev-libs/openssl:0=[static-libs(+)] )
- libressl? ( dev-libs/libressl:0=[static-libs(+)] )
- )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- rdma? (
- sys-fabric/libibverbs[static-libs(+)]
- sys-fabric/librdmacm[static-libs(+)]
- )
- tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
- "${FILESDIR}"/fio-3.16-verify_only_numberio.patch
-)
-
-python_check_deps() {
- has_version "dev-python/pandas[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
- default
-
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- # TODO: pmem
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- --disable-pmem \
- $(usex curl '' '--disable-http') \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '') \
- $(usex tcmalloc '' '--disable-tcmalloc')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- sed -i 's:python2.7:python:g' \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- python_replicate_script \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
diff --git a/sys-block/fio/fio-3.7.ebuild b/sys-block/fio/fio-3.7.ebuild
deleted file mode 100644
index d3a0e110fd2..00000000000
--- a/sys-block/fio/fio-3.7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils python-r1 toolchain-funcs
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Jens Axboe's Flexible IO tester"
-HOMEPAGE="http://brick.kernel.dk/snaps/"
-SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib"
-REQUIRED_USE="gnuplot? ( ${PYTHON_REQUIRED_USE} )"
-
-# GTK+:2 does not offer static libaries.
-LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
- glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
- gtk? ( dev-libs/glib:2[static-libs(+)] )
- numa? ( sys-process/numactl[static-libs(+)] )
- rbd? ( sys-cluster/ceph[static-libs(+)] )
- rdma? (
- sys-fabric/libibverbs[static-libs(+)]
- sys-fabric/librdmacm[static-libs(+)]
- )
- zlib? ( sys-libs/zlib[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-RDEPEND+="
- gnuplot? (
- sci-visualization/gnuplot
- ${PYTHON_DEPS}
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/fio-2.2.13-libmtd.patch
-)
-
-src_prepare() {
- sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
-
- # Many checks don't have configure flags.
- sed -i \
- -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
- -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
- -e '/if compile_prog "" "-laio" "libaio" ; then/'"s::if $(usex aio true false) ; then:" \
- configure || die
- default
-}
-
-src_configure() {
- chmod g-w "${T}"
- # not a real configure script
- # TODO: pmem
- set -- \
- ./configure \
- --disable-optimizations \
- --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
- --cc="$(tc-getCC)" \
- --disable-pmem \
- $(usex glusterfs '' '--disable-gfapi') \
- $(usex gtk '--enable-gfio' '') \
- $(usex numa '' '--disable-numa') \
- $(usex rbd '' '--disable-rbd') \
- $(usex rdma '' '--disable-rdma') \
- $(usex static '--build-static' '')
- echo "$@"
- "$@" || die 'configure failed'
-}
-
-src_compile() {
- emake V=1 OPTFLAGS=
-}
-
-src_install() {
- emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
-
- if use gnuplot ; then
- sed -i 's:python2.7:python:g' \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- python_replicate_script \
- "${ED}/usr/bin/fio2gnuplot" \
- "${ED}/usr/bin/fiologparser_hist.py" \
- "${ED}/usr/bin/fiologparser.py"
- else
- rm "${ED}"/usr/bin/{fio2gnuplot,fio_generate_plots} || die
- rm "${ED}"/usr/share/man/man1/{fio2gnuplot,fio_generate_plots}.1 || die
- rm "${ED}"/usr/share/fio/*.gpm || die
- rmdir "${ED}"/usr/share/fio/ 2>/dev/null
- fi
-
- # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
- rm "${ED}"/usr/bin/genfio || die
-
- dodoc README REPORTING-BUGS HOWTO
- docinto examples
- dodoc examples/*
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/
@ 2021-09-05 5:48 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-09-05 5:48 UTC (permalink / raw
To: gentoo-commits
commit: dd501e0c4e7026e86a65885333ec84275bb6f003
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 5 04:19:39 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 5 05:24:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd501e0c
sys-block/fio: fix build with linux-headers-5.14
Closes: https://bugs.gentoo.org/811699
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-block/fio/files/fio-2.2.13-libmtd.patch | 5 +-
sys-block/fio/files/fio-3.27-drop-raw.patch | 118 +++++++++++++++++++++
sys-block/fio/fio-3.27-r1.ebuild | 155 ++++++++++++++++++++++++++++
3 files changed, 275 insertions(+), 3 deletions(-)
diff --git a/sys-block/fio/files/fio-2.2.13-libmtd.patch b/sys-block/fio/files/fio-2.2.13-libmtd.patch
index 7ab9a96c25e..9581def526e 100644
--- a/sys-block/fio/files/fio-2.2.13-libmtd.patch
+++ b/sys-block/fio/files/fio-2.2.13-libmtd.patch
@@ -1,6 +1,5 @@
-diff -Nuar --exclude config.log fio-2.2.13/oslib/libmtd.h fio-2.2.13.new/oslib/libmtd.h
---- fio-2.2.13/oslib/libmtd.h 2016-01-26 18:02:07.000000000 -0800
-+++ fio-2.2.13.new/oslib/libmtd.h 2016-02-03 08:10:19.104693006 -0800
+--- fio-2.2.13/oslib/libmtd.h
++++ fio-2.2.13.new/oslib/libmtd.h
@@ -29,6 +29,8 @@
extern "C" {
#endif
diff --git a/sys-block/fio/files/fio-3.27-drop-raw.patch b/sys-block/fio/files/fio-3.27-drop-raw.patch
new file mode 100644
index 00000000000..1c9f8671d12
--- /dev/null
+++ b/sys-block/fio/files/fio-3.27-drop-raw.patch
@@ -0,0 +1,118 @@
+https://github.com/axboe/fio/commit/382975557e632efb506836bc1709789e615c9094.patch
+
+Fixes build with >=sys-kernel/linux-headers-5.14.
+
+From: Eric Sandeen <esandeen@redhat.com>
+Date: Tue, 3 Aug 2021 10:23:35 -0700
+Subject: [PATCH] fio: remove raw device support
+
+As of Linux kernel commit 603e4922f1c ("remove the raw driver"),
+linux/raw.h is gone, and raw device support no longer exists.
+Because of this, fio can no longer build against the current Linux
+kernel headers.
+
+So, remove raw device support from fio as well.
+
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+--- a/diskutil.c
++++ b/diskutil.c
+@@ -166,14 +166,10 @@ static int get_device_numbers(char *file_name, int *maj, int *min)
+ if (S_ISBLK(st.st_mode)) {
+ majdev = major(st.st_rdev);
+ mindev = minor(st.st_rdev);
+- } else if (S_ISCHR(st.st_mode)) {
+- majdev = major(st.st_rdev);
+- mindev = minor(st.st_rdev);
+- if (fio_lookup_raw(st.st_rdev, &majdev, &mindev))
+- return -1;
+- } else if (S_ISFIFO(st.st_mode))
++ } else if (S_ISCHR(st.st_mode) ||
++ S_ISFIFO(st.st_mode)) {
+ return -1;
+- else {
++ } else {
+ majdev = major(st.st_dev);
+ mindev = minor(st.st_dev);
+ }
+--- a/fio.1
++++ b/fio.1
+@@ -1700,9 +1700,7 @@ Sets size to something really large and waits for ENOSPC (no space left on
+ device) or EDQUOT (disk quota exceeded)
+ as the terminating condition. Only makes sense with sequential
+ write. For a read workload, the mount point will be filled first then I/O
+-started on the result. This option doesn't make sense if operating on a raw
+-device node, since the size of that is already known by the file system.
+-Additionally, writing beyond end-of-device will not return ENOSPC there.
++started on the result.
+ .SS "I/O engine"
+ .TP
+ .BI ioengine \fR=\fPstr
+--- a/os/os-linux.h
++++ b/os/os-linux.h
+@@ -14,7 +14,6 @@
+ #include <errno.h>
+ #include <sched.h>
+ #include <linux/unistd.h>
+-#include <linux/raw.h>
+ #include <linux/major.h>
+ #include <linux/fs.h>
+ #include <scsi/sg.h>
+@@ -41,7 +40,6 @@
+ #define FIO_HAVE_IOSCHED_SWITCH
+ #define FIO_HAVE_ODIRECT
+ #define FIO_HAVE_HUGETLB
+-#define FIO_HAVE_RAWBIND
+ #define FIO_HAVE_BLKTRACE
+ #define FIO_HAVE_CL_SIZE
+ #define FIO_HAVE_CGROUPS
+@@ -178,36 +176,6 @@ static inline unsigned long long os_phys_mem(void)
+ return (unsigned long long) pages * (unsigned long long) pagesize;
+ }
+
+-static inline int fio_lookup_raw(dev_t dev, int *majdev, int *mindev)
+-{
+- struct raw_config_request rq;
+- int fd;
+-
+- if (major(dev) != RAW_MAJOR)
+- return 1;
+-
+- /*
+- * we should be able to find /dev/rawctl or /dev/raw/rawctl
+- */
+- fd = open("/dev/rawctl", O_RDONLY);
+- if (fd < 0) {
+- fd = open("/dev/raw/rawctl", O_RDONLY);
+- if (fd < 0)
+- return 1;
+- }
+-
+- rq.raw_minor = minor(dev);
+- if (ioctl(fd, RAW_GETBIND, &rq) < 0) {
+- close(fd);
+- return 1;
+- }
+-
+- close(fd);
+- *majdev = rq.block_major;
+- *mindev = rq.block_minor;
+- return 0;
+-}
+-
+ #ifdef O_NOATIME
+ #define FIO_O_NOATIME O_NOATIME
+ #else
+--- a/os/os.h
++++ b/os/os.h
+@@ -157,10 +157,6 @@ extern int fio_cpus_split(os_cpu_mask_t *mask, unsigned int cpu);
+ #define OS_RAND_MAX RAND_MAX
+ #endif
+
+-#ifndef FIO_HAVE_RAWBIND
+-#define fio_lookup_raw(dev, majdev, mindev) 1
+-#endif
+-
+ #ifndef FIO_PREFERRED_ENGINE
+ #define FIO_PREFERRED_ENGINE "psync"
+ #endif
diff --git a/sys-block/fio/fio-3.27-r1.ebuild b/sys-block/fio/fio-3.27-r1.ebuild
new file mode 100644
index 00000000000..21af4692777
--- /dev/null
+++ b/sys-block/fio/fio-3.27-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-r1 toolchain-funcs
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Jens Axboe's Flexible IO tester"
+HOMEPAGE="https://brick.kernel.dk/snaps/"
+SRC_URI="https://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="aio curl glusterfs gnuplot gtk io-uring numa python rbd rdma static tcmalloc test zbc zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ gnuplot? ( python )
+ io-uring? ( aio )"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+# GTK+:2 does not offer static libaries.
+LIB_DEPEND="aio? ( dev-libs/libaio[static-libs(+)] )
+ curl? (
+ net-misc/curl:=[static-libs(+)]
+ dev-libs/openssl:0=[static-libs(+)]
+ )
+ glusterfs? ( sys-cluster/glusterfs[static-libs(+)] )
+ gtk? ( dev-libs/glib:2[static-libs(+)] )
+ io-uring? ( sys-libs/liburing:=[static-libs(+)] )
+ numa? ( sys-process/numactl[static-libs(+)] )
+ rbd? ( sys-cluster/ceph[static-libs(+)] )
+ rdma? (
+ sys-fabric/libibverbs[static-libs(+)]
+ sys-fabric/librdmacm[static-libs(+)]
+ )
+ tcmalloc? ( dev-util/google-perftools:=[static-libs(+)] )
+ zbc? ( >=sys-block/libzbc-5 )
+ zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+ test? ( dev-util/cunit )"
+RDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/pandas[${PYTHON_USEDEP}]')
+ )
+ gnuplot? ( sci-visualization/gnuplot )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/fio-2.2.13-libmtd.patch
+ # Upstream patch, should be able to drop in the next release
+ "${FILESDIR}"/fio-3.27-drop-raw.patch
+)
+
+python_check_deps() {
+ has_version "dev-python/pandas[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+ default
+
+ sed -i '/^DEBUGFLAGS/s: -D_FORTIFY_SOURCE=2::g' Makefile || die
+
+ # Many checks don't have configure flags.
+ sed -i \
+ -e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+ -e '/if compile_prog "" "-lzbc" "libzbc" *; *then/ '"s::if $(usex zbc true false) ; then:" \
+ -e '/if compile_prog "" "-lz" "zlib" *; *then/ '"s::if $(usex zlib true false) ; then:" \
+ -e '/if compile_prog "" "-laio" "libaio" *; *then/'"s::if $(usex aio true false) ; then:" \
+ -e '/if compile_prog "" "-lcunit" "CUnit" *; *then/'"s::if $(usex test true false) ; then:" \
+ configure || die
+}
+
+src_configure() {
+ chmod g-w "${T}"
+ # not a real configure script
+ # TODO: cuda
+ # TODO: libnbd - not packaged in Gentoo
+ # TODO: pmem - not packaged in Gentoo
+ set -- \
+ ./configure \
+ --disable-optimizations \
+ --extra-cflags="${CFLAGS} ${CPPFLAGS}" \
+ --cc="$(tc-getCC)" \
+ --disable-pmem \
+ $(usex curl '' '--disable-http') \
+ $(usex glusterfs '' '--disable-gfapi') \
+ $(usex gtk '--enable-gfio' '') \
+ $(usex numa '' '--disable-numa') \
+ $(usex rbd '' '--disable-rbd') \
+ $(usex rdma '' '--disable-rdma') \
+ $(usex static '--build-static' '') \
+ $(usex tcmalloc '' '--disable-tcmalloc')
+ echo "$@"
+ "$@" || die 'configure failed'
+}
+
+src_compile() {
+ emake V=1 OPTFLAGS=
+}
+
+src_install() {
+ emake install DESTDIR="${D}" prefix="${EPREFIX}/usr" mandir="${EPREFIX}/usr/share/man"
+
+ local python2_7_files=(
+ "${ED}"/usr/bin/fiologparser_hist.py
+ "${ED}"/usr/bin/fiologparser.py
+ )
+ local python_files=(
+ "${python2_7_files[@]}"
+ "${ED}"/usr/bin/fio_jsonplus_clat2csv
+ )
+ if use python ; then
+ sed -i 's:python2.7:python:g' "${python2_7_files[@]}" || die
+ python_replicate_script "${python2_7_files[@]}"
+ else
+ rm "${python_files[@]}" || die
+ fi
+
+ local gnuplot_python2_7_files=(
+ "${ED}"/usr/bin/fio2gnuplot
+ )
+ local gnuplot_files=(
+ "${gnuplot_python2_7_files[@]}"
+ "${ED}"/usr/bin/fio_generate_plots
+ "${ED}"/usr/share/man/man1/fio_generate_plots.1
+ "${ED}"/usr/share/man/man1/fio2gnuplot.1
+ "${ED}"/usr/share/fio/*.gpm
+ )
+ if use gnuplot ; then
+ sed -i 's:python2.7:python:g' "${gnuplot_python2_7_files[@]}" || die
+ python_replicate_script "${gnuplot_python2_7_files[@]}"
+ else
+ rm "${gnuplot_files[@]}" || die
+ rmdir "${ED}"/usr/share/fio/ || die
+ fi
+
+ # This tool has security/parallel issues -- it hardcodes /tmp/template.fio.
+ rm "${ED}"/usr/bin/genfio || die
+
+ dodoc README REPORTING-BUGS HOWTO
+ docinto examples
+ dodoc examples/*
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-05 5:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-11 19:55 [gentoo-commits] repo/gentoo:master commit in: sys-block/fio/, sys-block/fio/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2021-09-05 5:48 Sam James
2021-01-01 2:03 Michał Górny
2020-09-19 12:29 Michał Górny
2020-01-24 18:36 Mike Frysinger
2017-03-01 5:41 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox