system/fio: Updated for version 2.15.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 22 insertions, 39 deletions

diff --git a/system/fio/README b/system/fio/README
index c8ef2e22d80a..e754c45083eb 100644
--- a/system/fio/README
+++ b/system/fio/README
@@ -1,14 +1,9 @@
-fio is an I/O tool meant to be used both for benchmark and stress/hardware
-verification. It has support for 13 different types of I/O engines (sync,
-mmap, libaio, posixaio, SG v3, splice, null, network, syslet, guasi,
-solarisaio, and more), I/O priorities (for newer Linux kernels), rate I/O,
-forked or threaded jobs, and much more. It can work on block devices as well
-as files. fio accepts job descriptions in a simple-to-understand text format.
-Several example job files are included. fio displays all sorts of I/O
-performance information. Fio is in wide use in many places, for both
-benchmarking, QA, and verification purposes. It supports Linux, FreeBSD,
-NetBSD, OS X, OpenSolaris, AIX, HP-UX, and Windows.
-
+fio is a tool that will spawn a number of threads or processes doing a
+particular type of io action as specified by the user. fio takes a
+number of global parameters, each inherited by the thread unless
+otherwise parameters given to them overriding that setting is given.
+The typical use of fio is to write a job file matching the io load
+one wants to simulate.
 
 Example Usage:
 
diff --git a/system/fio/fio.SlackBuild b/system/fio/fio.SlackBuild
index 6f022047ceb1..80911402e3af 100644
--- a/system/fio/fio.SlackBuild
+++ b/system/fio/fio.SlackBuild
@@ -24,13 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=fio
-VERSION=${VERSION:-2.13}
+VERSION=${VERSION:-2.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,8 +70,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 < $CWD/fio.patch
-
 make install DESTDIR=$PKG prefix="/usr"
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/system/fio/fio.info b/system/fio/fio.info
index c1068d70c66b..e1510e2b5857 100644
--- a/system/fio/fio.info
+++ b/system/fio/fio.info
@@ -1,8 +1,8 @@
 PRGNAM="fio"
-VERSION="2.13"
-HOMEPAGE="http://freecode.com/projects/fio"
-DOWNLOAD="http://brick.kernel.dk/snaps/fio-2.13.tar.gz"
-MD5SUM="db7bec9884f88ab78f9a19c9b34f35df"
+VERSION="2.15"
+HOMEPAGE="http://git.kernel.dk/cgit/fio/"
+DOWNLOAD="http://brick.kernel.dk/snaps/fio-2.15.tar.gz"
+MD5SUM="743368ecea46bcae69e4dfd442a6f469"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/fio/fio.patch b/system/fio/fio.patch
deleted file mode 100644
index fd8e256fd9a9..000000000000
--- a/system/fio/fio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fio-2.2.13/oslib/libmtd_legacy.c.old	2016-02-02 00:41:36.372100029 +0700
-+++ fio-2.2.13/oslib/libmtd_legacy.c	2016-02-02 00:42:29.906101418 +0700
-@@ -25,6 +25,7 @@
- 
- /* Imported from mtd-utils by dehrenberg */
- 
-+#include <stdint.h>
- #include <limits.h>
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/system/fio/slack-desc b/system/fio/slack-desc
index ff869ba38e03..6e1bf5d491c7 100644
--- a/system/fio/slack-desc
+++ b/system/fio/slack-desc
@@ -8,12 +8,12 @@
    |-----handy-ruler------------------------------------------------------|
 fio: fio (Flexible I/O Tester)
 fio:
-fio: fio is an I/O tool meant to be used both for benchmark and
-fio: stress/hardware verification. It has support for 13 different types of
-fio: I/O engines (sync, mmap, libaio, posixaio, SG v3, splice, null,
-fio: network, syslet, guasi, solarisaio, and more), I/O priorities (for
-fio: newer Linux kernels), rate I/O, forked or threaded jobs, and much
-fio: more. It can work on block devices as well as files. fio displays all
-fio: sorts of I/O performance information. Fio is in wide use in many
-fio: places, for both benchmarking, QA, and verification purposes.
+fio: fio is a tool that will spawn a number of threads or processes doing
+fio: a particular type of io action as specified by the user. fio takes a
+fio: number of global parameters, each inherited by the thread unless
+fio: otherwise parameters given to them overriding that setting is given.
+fio: The typical use of fio is to write a job file matching the io load
+fio: one wants to simulate.
+fio:
+fio:
 fio: