[oe-commits] [meta-openembedded] 26/26: fio: upgrade 3.16 -> 3.17

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit d09c18144d59945671d0311191798de24bc8c3d0
Author: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
AuthorDate: Thu Jan 16 10:39:35 2020 +0800

    fio: upgrade 3.16 -> 3.17
    
    -files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch
    Removed since this is included in 3.17.
    
    -Refresh the following patch:
    files/0001-update-the-interpreter-paths.patch
    
    Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 ...01-arch-arm-Consider-armv7ve-arch-as-well.patch | 28 ----------------------
 .../files/0001-update-the-interpreter-paths.patch  | 13 +---------
 .../fio/{fio_3.16.bb => fio_3.17.bb}               |  3 +--
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch b/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch
deleted file mode 100644
index 983a76f..0000000
--- a/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2af58909cd9f2862d1dc07836e201361a2cd8d5d Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Sat, 5 Oct 2019 08:53:22 -0700
-Subject: [PATCH] arch-arm: Consider armv7ve arch as well
-
-Upstream-Status: Submitted []
-
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- arch/arch-arm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arch-arm.h b/arch/arch-arm.h
-index 78cb2ebe..4f722967 100644
---- a/arch/arch-arm.h
-+++ b/arch/arch-arm.h
-@@ -11,7 +11,7 @@
- #define nop             __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t")
- #define read_barrier()	__asm__ __volatile__ ("" : : : "memory")
- #define write_barrier()	__asm__ __volatile__ ("" : : : "memory")
--#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__)
-+#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH_7VE__)
- #define	nop		__asm__ __volatile__ ("nop")
- #define read_barrier()	__sync_synchronize()
- #define write_barrier()	__sync_synchronize()
--- 
-2.23.0
-
diff --git a/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch b/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch
index 327b9f5..c9c3a08 100644
--- a/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch
+++ b/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch
@@ -16,8 +16,7 @@ Signed-off-by: Mingli Yu <mingli.yu at windriver.com>
  tools/hist/fiologparser_hist.py | 2 +-
  tools/hist/half-bins.py         | 2 +-
  tools/plot/fio2gnuplot          | 2 +-
- t/steadystate_tests.py | 2 +-
- 7 files changed, 7 insertions(+), 7 deletions(-)
+ 6 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv
 index 78a007e5..0524b6e6 100755
@@ -79,16 +78,6 @@ index 4d1815cf..509141af 100755
  # Note: this script is python2 and python3 compatible.
  #
  #  Copyright (C) 2013 eNovance SAS <licensing at enovance.com>
-diff --git a/t/steadystate_tests.py b/t/steadystate_tests.py
-index 50254dcc..95e7dfde 100755
---- a/t/steadystate_tests.py
-+++ b/t/steadystate_tests.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.7
-+#!/usr/bin/env python
- # Note: this script is python2 and python 3 compatible.
- #
- # steadystate_tests.py
 -- 
 2.17.1
 
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.16.bb b/meta-oe/recipes-benchmark/fio/fio_3.17.bb
similarity index 92%
rename from meta-oe/recipes-benchmark/fio/fio_3.16.bb
rename to meta-oe/recipes-benchmark/fio/fio_3.17.bb
index adab618..e41c21d 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.16.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.17.bb
@@ -21,10 +21,9 @@ PACKAGECONFIG_NUMA_armeb = ""
 PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
 PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 
-SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d"
+SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03"
 SRC_URI = "git://git.kernel.dk/fio.git \
           file://0001-update-the-interpreter-paths.patch \
-          file://0001-arch-arm-Consider-armv7ve-arch-as-well.patch \
 "
 
 S = "${WORKDIR}/git"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.