diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-benchmark/fio | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark/fio')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch | 94 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb (renamed from meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb) | 12 |
2 files changed, 102 insertions, 4 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch new file mode 100644 index 000000000..327b9f5b7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch @@ -0,0 +1,94 @@ +From 55078e494bdf7da7dd9cb76077fa7ac2a66b6dd6 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Fri, 20 Jul 2018 02:33:25 -0700 +Subject: [PATCH] update the interpreter paths + +Update the interpreter path to make it more +compatible + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + tools/fio_jsonplus_clat2csv | 2 +- + tools/fiologparser.py | 2 +- + tools/genfio | 2 +- + 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(-) + +diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv +index 78a007e5..0524b6e6 100755 +--- a/tools/fio_jsonplus_clat2csv ++++ b/tools/fio_jsonplus_clat2csv +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/env python + # Note: this script is python2 and python3 compatible. + # + # fio_jsonplus_clat2csv +diff --git a/tools/fiologparser.py b/tools/fiologparser.py +index cc29f1c7..ea60e783 100755 +--- a/tools/fiologparser.py ++++ b/tools/fiologparser.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/env python + # Note: this script is python2 and python 3 compatible. + # + # fiologparser.py +diff --git a/tools/genfio b/tools/genfio +index 286d814d..8518bbcc 100755 +--- a/tools/genfio ++++ b/tools/genfio +@@ -1,4 +1,4 @@ +-#!/usr/bin/bash ++#!/bin/bash + # + # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> + # Author: Erwan Velu <erwan@enovance.com> +diff --git a/tools/hist/fiologparser_hist.py b/tools/hist/fiologparser_hist.py +index 8910d5fa..b77c2933 100755 +--- a/tools/hist/fiologparser_hist.py ++++ b/tools/hist/fiologparser_hist.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/env python + """ + Utility for converting *_clat_hist* files generated by fio into latency statistics. + +diff --git a/tools/hist/half-bins.py b/tools/hist/half-bins.py +index 1bba8ff7..58d53e36 100755 +--- a/tools/hist/half-bins.py ++++ b/tools/hist/half-bins.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/env python + """ Cut the number bins in half in fio histogram output. Example usage: + + $ half-bins.py -c 2 output_clat_hist.1.log > smaller_clat_hist.1.log +diff --git a/tools/plot/fio2gnuplot b/tools/plot/fio2gnuplot +index 4d1815cf..509141af 100755 +--- a/tools/plot/fio2gnuplot ++++ b/tools/plot/fio2gnuplot +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/env python + # 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-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb index 67b513fa0..2deb42db9 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb @@ -8,9 +8,10 @@ files are included. fio displays all sorts of I/O performance information." HOMEPAGE = "http://freecode.com/projects/fio" SECTION = "console/tests" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libaio zlib" +RDEPENDS_${PN} = "python bash" PACKAGECONFIG_NUMA = "numa" # ARM does not currently support NUMA @@ -19,9 +20,11 @@ PACKAGECONFIG_NUMA_arm = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -# rev for v2.9 -SRCREV = "fe8d0f4c54f0c308c9a02a4e3c2f5084e8bf5461" -SRC_URI = "git://git.kernel.dk/fio.git" +# rev for v3.8 +SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e" +SRC_URI = "git://git.kernel.dk/fio.git \ + file://0001-update-the-interpreter-paths.patch \ +" S = "${WORKDIR}/git" @@ -29,6 +32,7 @@ S = "${WORKDIR}/git" DISABLE_STATIC = "" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "--disable-optimizations" do_configure() { ./configure ${EXTRA_OECONF} |