fio: upgraded package to upstream
Upgraded sys-block/fio to version 2.1.14 on amd64, arm, x86
with
cros_portage_upgrade --board=falco:daisy_spring:x86-generic --upgrade
--unstable-ok sys-block/fio
BUG=chromium:395682,chromium:426747
TEST=Check that c/209966 now works.
Test that hardware_StorageFio.quicktest works on Ryu, Gnawty and Samus.
Change-Id: I6c488dc0998f3187f1ded3a3e96dbb5e58af3607
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/224183
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/sys-block/fio-2.1.10-r1 b/metadata/md5-cache/sys-block/fio-2.1.10-r1
deleted file mode 100644
index 7ea31e9..0000000
--- a/metadata/md5-cache/sys-block/fio-2.1.10-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Jens Axboe's Flexible IO tester
-EAPI=5
-HOMEPAGE=http://brick.kernel.dk/snaps/
-IUSE=aio gnuplot gtk numa zlib python_targets_python2_7
-KEYWORDS=*
-LICENSE=GPL-2
-RDEPEND=aio? ( dev-libs/libaio ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot python_targets_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-SLOT=0
-SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.10.tar.bz2
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 cd956d5a4bac2209a64d0f4851cc115d python-utils-r1 3eaef07c45447158fad343dac1667938 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
-_md5_=424450b36bd45c659986054c5d9cff2e
diff --git a/metadata/md5-cache/sys-block/fio-2.1.14 b/metadata/md5-cache/sys-block/fio-2.1.14
new file mode 100644
index 0000000..f058897
--- /dev/null
+++ b/metadata/md5-cache/sys-block/fio-2.1.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Jens Axboe's Flexible IO tester
+EAPI=5
+HOMEPAGE=http://brick.kernel.dk/snaps/
+IUSE=aio glusterfs gnuplot gtk numa rbd zlib python_targets_python2_7
+KEYWORDS=*
+LICENSE=GPL-2
+RDEPEND=aio? ( dev-libs/libaio ) glusterfs? ( sys-cluster/glusterfs ) gtk? ( dev-libs/glib:2 x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) rbd? ( sys-cluster/ceph ) zlib? ( sys-libs/zlib ) gnuplot? ( sci-visualization/gnuplot python_targets_python2_7? ( >=dev-lang/python-2.7.3-r2:2.7 ) dev-lang/python-exec:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+SLOT=0
+SRC_URI=http://brick.kernel.dk/snaps/fio-2.1.14.tar.bz2
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multibuild 46527a4656956da3d58acff72c9b59b1 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 cd956d5a4bac2209a64d0f4851cc115d python-utils-r1 3eaef07c45447158fad343dac1667938 toolchain-funcs 48b38a216afb92db6314d6c3187abea3
+_md5_=b94ee6a7724bdae695e027bde3b15adc
diff --git a/sys-block/fio/Manifest b/sys-block/fio/Manifest
index 8c8671e..1df86b0 100644
--- a/sys-block/fio/Manifest
+++ b/sys-block/fio/Manifest
@@ -1 +1 @@
-DIST fio-2.1.10.tar.bz2 432787 SHA256 4dd98cfe7da343b82ce351dd2a12f9ea456f9a54efc80a380786956a68c4edfc SHA512 207e4dc2c3f2d39dda6d901e38baa7a4e40ab0c2b7af074d4d7c24e72ca6859a43d6a10a1de8ab0953a82234d114762bcb53c4adf12cd12f748b3c4aa3e02914 WHIRLPOOL faecbe02ccad8b8cb982a25bfd0aec0f410c90761c3add1f0f99b0fc0973ab8ebdf6da4914ce5683fe4127c3ee9475b57216844f53194dcc955176a98054079c
+DIST fio-2.1.14.tar.bz2 464442 SHA256 98f7c375c7b1c9f9b5e02578e858437059bc9bfa0db8edaa800a37dc5b21d854 SHA512 b6e8f81ca05d1c0441cd6d0a3e97d472e11697cb3aecb381f07901e81328e966a79bd3cb4ef42cdae9d1f04405fb667c026cd64d14afa8d67a3c78fe7b267213 WHIRLPOOL cc0303c5c8d34d4dd2a34b16700c652b0866216e1da56595eed3bd8776447d70eecdb5f8459629b54149cec4966df0d3742129f5e37513f0c53a007f64b38b92
diff --git a/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch b/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
new file mode 100644
index 0000000..fa35e27
--- /dev/null
+++ b/sys-block/fio/files/fio-2.0.14-pic-clobber-fix.patch
@@ -0,0 +1,29 @@
+diff -Nuar fio-2.0.14.orig/arch/arch-x86-common.h fio-2.0.14/arch/arch-x86-common.h
+--- fio-2.0.14.orig/arch/arch-x86-common.h 2013-02-21 18:12:32.000000000 +0000
++++ fio-2.0.14/arch/arch-x86-common.h 2013-03-27 01:48:04.000000000 +0000
+@@ -6,10 +6,24 @@
+ static inline void do_cpuid(unsigned int *eax, unsigned int *ebx,
+ unsigned int *ecx, unsigned int *edx)
+ {
++#ifdef __PIC__
++ /* 32-bit Hardened GCC (PIC) uses register EBX, so it must be preserved
++ * Fix ported from Gentoo's x86info-1.24-pic patch
++ * http://tuxion.com/2010/07/02/clobber-registers.html */
++ asm volatile(
++ "movl %%ebx,%%edi\n"
++ "cpuid\n"
++ "movl %%ebx,%1\n"
++ "movl %%edi,%%ebx\n"
++ : "=a" (*eax), "=m" (*ebx), "=c" (*ecx), "=d" (*edx)
++ : "0" (*eax), "2" (*ecx)
++ : "memory", "%edi");
++#else
+ asm volatile("cpuid"
+ : "=a" (*eax), "=b" (*ebx), "=c" (*ecx), "=d" (*edx)
+ : "0" (*eax), "2" (*ecx)
+ : "memory");
++#endif
+ }
+
+ static inline void cpuid(unsigned int op,
+
diff --git a/sys-block/fio/fio-2.1.10-r1.ebuild b/sys-block/fio/fio-2.1.14.ebuild
similarity index 85%
rename from sys-block/fio/fio-2.1.10-r1.ebuild
rename to sys-block/fio/fio-2.1.14.ebuild
index 5be3331..679ba3d 100644
--- a/sys-block/fio/fio-2.1.10-r1.ebuild
+++ b/sys-block/fio/fio-2.1.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.10-r1.ebuild,v 1.1 2014/06/25 17:53:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/fio/fio-2.1.14.ebuild,v 1.1 2014/11/18 19:32:01 vapier Exp $
EAPI="5"
PYTHON_COMPAT=( python2_7 )
@@ -16,14 +16,16 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="*"
-IUSE="aio gnuplot gtk numa zlib"
+IUSE="aio glusterfs gnuplot gtk numa rbd zlib"
DEPEND="aio? ( dev-libs/libaio )
+ glusterfs? ( sys-cluster/glusterfs )
gtk? (
dev-libs/glib:2
x11-libs/gtk+:2
)
numa? ( sys-process/numactl )
+ rbd? ( sys-cluster/ceph )
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}
gnuplot? (
@@ -35,7 +37,6 @@
src_prepare() {
sed -i '/^DEBUGFLAGS/s, -D_FORTIFY_SOURCE=2,,g' Makefile || die
- epatch "${FILESDIR}"/${P}-json.patch
epatch_user
# Many checks don't have configure flags.
@@ -47,12 +48,15 @@
}
src_configure() {
+ chmod g-w "${T}"
# not a real configure script
./configure \
--extra-cflags="${CFLAGS} ${CPPFLAGS}" \
--cc="$(tc-getCC)" \
+ $(usex glusterfs '' '--disable-gfapi') \
$(usex gtk '--enable-gfio' '') \
$(usex numa '' '--disable-numa') \
+ $(usex rbd '' '--disable-rbd') \
|| die 'configure failed'
}
diff --git a/sys-block/fio/metadata.xml b/sys-block/fio/metadata.xml
index c5decdf..17877aa 100644
--- a/sys-block/fio/metadata.xml
+++ b/sys-block/fio/metadata.xml
@@ -9,7 +9,9 @@
</maintainer>
<use>
<flag name="aio">Enable AIO ioengine</flag>
+ <flag name="glusterfs">Enable GlusterFS gfapi support via <pkg>sys-cluster/glusterfs</pkg></flag>
<flag name="gnuplot">Install tools for generating gnuplots</flag>
<flag name="numa">Enable numa support</flag>
+ <flag name="rbd">Enable Rados block device support via <pkg>sys-cluster/ceph</pkg></flag>
</use>
</pkgmetadata>
