fio: fix do_compile error

* Update to v2.2.6

Signed-off-by: Raphael Silva <raphael.philipe@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

2 files changed, 5 insertions, 36 deletions

diff --git a/meta-oe/recipes-benchmark/fio/fio/0001-ARM-Use-generic-assembly-nop-and-barrier-code-for-ar.patch b/meta-oe/recipes-benchmark/fio/fio/0001-ARM-Use-generic-assembly-nop-and-barrier-code-for-ar.patch
deleted file mode 100644
index db97244bc..000000000
--- a/meta-oe/recipes-benchmark/fio/fio/0001-ARM-Use-generic-assembly-nop-and-barrier-code-for-ar.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 152b969cd4ff5b4b7e1c65eca1f9ab243b8a30c8 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Sun, 14 Apr 2013 13:53:35 -0300
-Subject: [PATCH] ARM: Use generic assembly nop and barrier code for armv6
-
-Upstream-Status: Submitted
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- arch/arch-arm.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arch-arm.h b/arch/arch-arm.h
-index 658b688..7cd9502 100644
---- a/arch/arch-arm.h
-+++ b/arch/arch-arm.h
-@@ -18,7 +18,9 @@
- #define __NR_sys_vmsplice      343
- #endif
- 
--#if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__)
-+#if defined (__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__) \
-+       || defined (__ARM_ARCH_5__) || defined (__ARM_ARCH_5T__) || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__) \
-+       || defined(__ARM_ARCH_6__)  || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__)
- #define nop             __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t")
- #define read_barrier() __asm__ __volatile__ ("" : : : "memory")
- #define write_barrier()        __asm__ __volatile__ ("" : : : "memory")
--- 
-1.7.2.5
-
diff --git a/meta-oe/recipes-benchmark/fio/fio_2.0.5.bb b/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb
index 8dcf63796..016b1f21a 100644
--- a/meta-oe/recipes-benchmark/fio/fio_2.0.5.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb
@@ -12,17 +12,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 DEPENDS = "libaio"
 
-# rev for v2.0.5
-SRCREV = "02efadeb8b05144bcf2fc7796e1da2e7db211d00"
-SRC_URI = "git://git.kernel.dk/fio.git \
-           file://0001-ARM-Use-generic-assembly-nop-and-barrier-code-for-ar.patch"
+# rev for v2.2.6
+SRCREV = "f52c9691bc8c285f3445235c69acdfd6de7f9b82"
+SRC_URI = "git://git.kernel.dk/fio.git"
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "CC='${CC}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'"
 
 do_install() {
-    oe_runmake install DESTDIR=${D} bindir=${bindir} mandir=${mandir}
+    oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir}
     install -d ${D}/${docdir}/${PN}
     cp -a ${S}/examples ${D}/${docdir}/${PN}/
 }