diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-01-16 10:39:35 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-15 23:17:45 -0800 |
commit | 77e647912eebf51197ddf777102a02bf6f993756 (patch) | |
tree | e5e79f7e708451a6b17eaf9a77a4b1c364034c1f | |
parent | 02d0a59daa74eb190e29d4675724632ac98f39da (diff) | |
download | meta-openembedded-contrib-77e647912eebf51197ddf777102a02bf6f993756.tar.gz |
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@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch | 28 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/fio/fio_3.17.bb (renamed from meta-oe/recipes-benchmark/fio/fio_3.16.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 983a76fb6d..0000000000 --- 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@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@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 327b9f5b73..c9c3a08dfc 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@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@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 index adab618780..e41c21d1e2 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" |