diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-25 22:55:05 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 14:22:49 +0000 |
commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/meta-openembedded/meta-oe/recipes-benchmark | |
parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
download | talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.gz talos-openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.zip |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-benchmark')
13 files changed, 213 insertions, 157 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch new file mode 100644 index 000000000..6a5350c37 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone-2.1/dhrystone.patch @@ -0,0 +1,81 @@ +dhrystone: fix compilation problems + +This patch fixes two compilation errors with original +dhrystone sources: +* Redefinition of times() with wrong return type + - Fixed by commenting out the unnecessary redefinition +* Undefined identifier HZ + - Originally HZ was supposed to be the clock frequency + value for times() + - For Linux, the frequency should come from sysconf + - This patch defines global varible HZ and initializes + it from sysconf + +Additionally, this patch adds a simple Makefile. + +Upstream-status: Pending + +Sign-off-by: Kimmo Surakka <kimmo.surakka@ge.com> +Signed-off-by: Jose Alarcon <jose.alarcon@ge.com> +--- + +diff -Naur dhry.orig/dhry_1.c dhry/dhry_1.c +--- dhry.orig/dhry_1.c 2015-07-20 14:25:58.059945353 +0300 ++++ dhry/dhry_1.c 2015-07-20 12:43:25.318945353 +0300 +@@ -45,11 +45,15 @@ + + #ifdef TIMES + struct tms time_info; +-extern int times (); ++/* extern int times (); */ + /* see library function "times" */ + #define Too_Small_Time 120 + /* Measurements should last at least about 2 seconds */ + #endif ++#ifndef HZ ++#include <unistd.h> /* sysconf */ ++ long HZ; ++#endif + #ifdef TIME + extern long time(); + /* see library function "time" */ +@@ -84,6 +88,9 @@ + + /* Initializations */ + ++#ifndef HZ ++ HZ = sysconf(_SC_CLK_TCK); ++#endif + Next_Ptr_Glob = (Rec_Pointer) malloc (sizeof (Rec_Type)); + Ptr_Glob = (Rec_Pointer) malloc (sizeof (Rec_Type)); + +diff -Naur dhry.orig/dhry.h dhry/dhry.h +--- dhry.orig/dhry.h 2015-07-20 14:25:58.054945353 +0300 ++++ dhry/dhry.h 2015-07-20 12:42:59.903945353 +0300 +@@ -420,4 +420,6 @@ + } variant; + } Rec_Type, *Rec_Pointer; + +- ++#ifndef HZ ++ extern long HZ; ++#endif +diff -Naur dhry.orig/Makefile dhry/Makefile +--- dhry.orig/Makefile 1970-01-01 02:00:00.000000000 +0200 ++++ dhry/Makefile 2015-07-20 14:10:45.832945353 +0300 +@@ -0,0 +1,15 @@ ++CC=gcc ++ ++all: dhry ++ ++dhry: dhry_1.o dhry_2.o ++ $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS) ++ ++dhry_1.o: dhry_1.c dhry.h ++ ++dhry_2.o: dhry_2.c dhry.h ++ ++clean: ++ rm -f *.o *~ ++ ++.PHONY: all clean diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb new file mode 100644 index 000000000..17e8c700c --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Dhrystone CPU benchmark" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/PD;md5=b3597d12946881e13cb3b548d1173851" + +SRC_URI = "http://www.netlib.org/benchmark/dhry-c;downloadfilename=dhry-c.shar \ + file://dhrystone.patch" +SRC_URI[md5sum] = "75aa5909c174eed98c134be2f56307da" +SRC_URI[sha256sum] = "038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e" + +# Need to override Makefile variables +EXTRA_OEMAKE = "-e MAKEFLAGS=" + +do_unpack() { + [ -d ${S} ] || mkdir -p ${S} + cd ${S} + sh ${DL_DIR}/dhry-c.shar +} +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/dhry ${D}${bindir} +} + +# Prevent procedure merging as required by dhrystone.c: +CFLAGS += "-fno-lto" + +LDFLAGS += "-fno-lto" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch new file mode 100644 index 000000000..cdf09faec --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch @@ -0,0 +1,31 @@ +From 35e9f80518d666db5f9c62e8072ffbc307b4af4f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 26 Aug 2017 08:30:01 -0700 +Subject: [PATCH] Fix clang warnings + +../src/native-state-drm.cpp:334:20: error: cannot pass object of non-trivial type 'std::__cxx11::basic_string<char>' through variadic function; call will abort at runtime [-Wnon-pod-varargs] + dev_path); + ^ +1 error generated. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/native-state-drm.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp +index dc2b323..62566ee 100644 +--- a/src/native-state-drm.cpp ++++ b/src/native-state-drm.cpp +@@ -331,7 +331,7 @@ static int open_using_udev_scan() + if (!valid_fd(fd)) { + // %m is GLIBC specific... Maybe use strerror here... + Log::error("Tried to use '%s' but failed.\nReason : %m", +- dev_path); ++ dev_path.c_str()); + } + else + Log::debug("Success!\n"); +-- +2.14.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch deleted file mode 100644 index 439508102..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001 -From: Yong Gan <b45748@freescale.com> -Date: Tue, 27 Oct 2015 18:15:20 +0800 -Subject: [PATCH] Fix: wl_surface should be destoryed after the wl_window - destroyed. - -Upstream-Status: Submitted [https://github.com/glmark2/glmark2/issues/12] - -Signed-off-by: Yong Gan <b45748@freescale.com> - ---- - src/native-state-wayland.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/native-state-wayland.cpp b/src/native-state-wayland.cpp -index 41fc743..cdcdf34 100644 ---- a/src/native-state-wayland.cpp -+++ b/src/native-state-wayland.cpp -@@ -56,10 +56,10 @@ NativeStateWayland::~NativeStateWayland() - wl_shell_surface_destroy(window_->shell_surface); - if (window_->opaque_reqion) - wl_region_destroy(window_->opaque_reqion); -- if (window_->surface) -- wl_surface_destroy(window_->surface); - if (window_->native) - wl_egl_window_destroy(window_->native); -+ if (window_->surface) -+ wl_surface_destroy(window_->surface); - delete window_; - } - --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 26c5c0482..b72ced06a 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -8,21 +8,24 @@ LICENSE = "GPLv3+ & SGIv1" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.SGI;beginline=5;md5=269cdab4af6748677acce51d9aa13552" -DEPENDS = "libpng12 jpeg" +DEPENDS = "libpng jpeg udev" -PV = "2014.03+${SRCPV}" +PV = "2017.07+${SRCPV}" -SRC_URI = " \ - git://github.com/glmark2/glmark2.git;protocol=https \ - file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ - file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \ - file://Fix-configure-for-sqrt-check.patch \ -" -SRCREV = "f413c5b423250b4fde8f95639ad368d5b02c5b9b" +COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" + +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ + file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ + file://Fix-configure-for-sqrt-check.patch \ + file://0001-Fix-clang-warnings.patch \ + " +SRCREV = "ed20c633f1926d1dd78e3e89043c85a81302cbe6" S = "${WORKDIR}/git" -inherit waf pkgconfig +inherit waf pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES += "opengl" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl x11-gles2', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb index 4a01896ca..4d1b0c437 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb @@ -9,7 +9,9 @@ SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues" AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3434c5a9a53c78c7739f0bc9e5adda" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d098223e44bdd19585315ee75cd9d2d7" + +DEPENDS = "openssl" SRC_URI = "git://github.com/esnet/iperf.git \ file://automake-foreign.patch \ @@ -17,8 +19,7 @@ SRC_URI = "git://github.com/esnet/iperf.git \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ " -PV = "3.1.3+gitr${SRCPV}" -SRCREV = "099244ec686b620393e9845478a554b1c7ca5c8b" +SRCREV = "88d907f7fb58bfab5d086c5da60c922e1c582c92" S = "${WORKDIR}/git" @@ -28,4 +29,6 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc CFLAGS += "-D_GNU_SOURCE" +EXTRA_OECONF = "--with-openssl=${RECIPE_SYSROOT}" + BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch deleted file mode 100644 index 676fa8a7a..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/fix-lib64-can-not-be-shiped-in-64bit-target.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Inappropriate [oe-core specific] - - -fix the below error: - ERROR: QA Issue: libhugetlbfs: Files/directories were installed but not shipped - /usr/lib64 - /usr/lib64/libhugetlbfs.so - /usr/lib64/libhugetlbfs.a - /usr/lib64/libhugetlbfs_privutils.so - /usr/lib64/perl5 - /usr/lib64/perl5/TLBC - /usr/lib64/perl5/TLBC/PerfCollect.pm - /usr/lib64/perl5/TLBC/Report.pm - /usr/lib64/perl5/TLBC/DataCollect.pm - /usr/lib64/perl5/TLBC/OpCollect.pm -$<50>ERROR: QA run found fatal errors. Please consider fixing them. - - -Signed-off-by: Guo Chunrong <B40290@freescale.com> - ---- a/Makefile 2013-09-23 02:28:57.340566998 -0500 -+++ b/Makefile 2013-09-23 02:31:05.344569896 -0500 -@@ -33,7 +33,6 @@ - CPPFLAGS += -D__LIBHUGETLBFS__ -DPPC_NO_SEGMENTS - - ARCH = $(shell uname -m | sed -e s/i.86/i386/) --CC = gcc - - CUSTOM_LDSCRIPTS = yes - -@@ -59,9 +58,9 @@ - CUSTOM_LDSCRIPTS = no - else - ifeq ($(ARCH),aarch64) --CC64 = gcc -+CC64 = $(CC) - ELF64 = aarch64elf --TMPLIB64 = lib64 -+TMPLIB64 = lib - CUSTOM_LDSCRIPTS = no - else - ifeq ($(ARCH),i386) -@@ -72,7 +71,7 @@ - ifeq ($(ARCH),x86_64) - CC64 = $(CC) -m64 - ELF64 = elf_x86_64 --TMPLIB64 = lib64 -+TMPLIB64 = lib - TMPLIB32 = lib - ifneq ($(BUILDTYPE),NATIVEONLY) - CC32 = $(CC) -m32 -@@ -172,11 +171,23 @@ - BINDIR = $(PREFIX)/share/libhugetlbfs - EXEDIR = $(PREFIX)/bin - DOCDIR = $(PREFIX)/share/doc/libhugetlbfs -+ - ifdef CC32 - PMDIR = $(PREFIX)/lib/perl5/TLBC -+endif -+ -+ifdef CC64 -+ifeq ($(ARCH),x86_64) -+PMDIR = $(PREFIX)/lib/perl5/TLBC -+else -+ifeq ($(ARCH),aarch64) -+PMDIR = $(PREFIX)/lib/perl5/TLBC - else - PMDIR = $(PREFIX)/lib64/perl5/TLBC - endif -+endif -+endif -+ - MANDIR1 = $(PREFIX)/share/man/man1 - MANDIR3 = $(PREFIX)/share/man/man3 - MANDIR7 = $(PREFIX)/share/man/man7 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 823e07c18..a63494a62 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -33,6 +33,8 @@ EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS PARALLEL_MAKE = "" CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0" +export HUGETLB_LDSCRIPT_PATH="${S}/ldscripts" + TARGET_CC_ARCH += "${LDFLAGS}" #The CUSTOM_LDSCRIPTS doesn't work with the gold linker diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb index 56272d985..da2cb4b32 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb @@ -1,3 +1,4 @@ +SUMMARY = "A CPU benchmark utility" DESCRIPTION = "BYTE Magazine's native benchmarks (also called BYTEmark) \ designed to expose the capabilities of a system's CPU, FPU, \ and memory system." @@ -6,7 +7,7 @@ LICENSE = "nbench-byte" LIC_FILES_CHKSUM = "file://README;beginline=57;endline=66;md5=020ef579f8fa5746b7e307a54707834f" SECTION = "console/utils" -SRC_URI = "http://www.tux.org/~mayer/linux/${BP}.tar.gz \ +SRC_URI = "https://fossies.org/linux/misc/${BP}.tar.gz \ file://nbench_32bits.patch \ file://Makefile-add-more-dependencies-to-pointer.h.patch" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.4.0.bb index b3217790d..3ccd5db44 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_7.4.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "5bcac5896a4a34fc6ae4ae94991e1637" -SRC_URI[sha256sum] = "631ceb808d8bd6cebe69c8b711d55090d6880e906a65837f18fa8200fe7d2c4d" +SRC_URI[md5sum] = "86fa3eede43ffff88992fe21368b11b7" +SRC_URI[sha256sum] = "de9aec3ef4f980581756fd0bf7b30dd1ccb20e7aae637078a587606bf75a6b67" S = "${WORKDIR}/phoronix-test-suite" @@ -34,5 +34,3 @@ FILES_${PN} += " \ ${datadir}/mime/packages/openbenchmarking-mime.xml \ ${systemd_unitdir}/* \ " - -PNBLACKLIST[phoronix-test-suite] ?= "Runtime depends on blacklisted php-cli - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/pmbw/pmbw_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/pmbw/pmbw_git.bb deleted file mode 100644 index 8113da76d..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/pmbw/pmbw_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMERY = "Parallel Memory Bandwidth Measurement / Benchmark" -DESCRIPTION = "\ -The tool pmbw is a set of assembler routines to measure the parallel memory \ -(cache and RAM) bandwidth of modern multi-core machines." -HOMEPAGE = "http://panthema.net/2013/pmbw/" -SECTION = "benchmark/tests" -AUTHOR = "Timo Bingmann" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "git://github.com/bingmann/pmbw;protocol=https" - -PV = "0.6.2+git${SRCPV}" -SRCREV = "4a3b37728060a8aba06fc83f157a1965088d79d6" - -S = "${WORKDIR}/git" - -inherit autotools - -# the hand coded asm uses r11, which therefore cannot be used for storing -# the frame pointer when debugging on arm -SELECTED_OPTIMIZATION_remove_arm = "-fno-omit-frame-pointer" - -PACKAGES =+ "${PN}-stats2gnuplot" - -FILES_${PN}-stats2gnuplot = "${bindir}/stats2gnuplot" - -RRECOMMENDS_${PN} = "${PN}-stats2gnuplot" - -PNBLACKLIST[pmbw] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130568/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch new file mode 100644 index 000000000..cfd34f02a --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/0001-Specify-printf-formats.patch @@ -0,0 +1,49 @@ +From b08e61ef64eece23ce8ffa2784cd3c4f70b6169e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 17 Jun 2017 08:08:56 -0700 +Subject: [PATCH] Specify printf formats + +Fixes +tiotest.c:555:4: error: format not a string literal and no format arguments [-Werror=format-security] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tiotest.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tiotest.c b/tiotest.c +index 6b3d0c3..3e6166a 100644 +--- a/tiotest.c ++++ b/tiotest.c +@@ -91,7 +91,7 @@ inline void checkIntZero(int value, char *mess) + { + if (value <= 0) + { +- printf(mess); ++ printf("%s",mess); + printf("Try 'tiotest -h' for more information.\n"); + exit(1); + } +@@ -101,7 +101,7 @@ inline void checkLong(long value, char *mess) + { + if (value < 0) + { +- printf(mess); ++ printf("%s", mess); + printf("Try 'tiotest -h' for more information\n"); + exit(1); + } +@@ -552,7 +552,7 @@ void do_test( ThreadTest *test, int testCase, int sequential, + if(args.debugLevel > 4) + { + printf("Created %d threads\n", i); +- fprintf(stderr, debugMessage); ++ fprintf(stderr, "%s", debugMessage); + fflush(stderr); + } + +-- +2.13.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb index 35af35fd3..427ce67d6 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb @@ -10,6 +10,7 @@ SRC_URI = "\ file://tiobench-makefile.patch \ file://avoid-glibc-clashes.patch \ file://0001-Drop-inline-of-crc32-function-to-fix-build-using-GCC.patch \ + file://0001-Specify-printf-formats.patch \ " SRC_URI[md5sum] = "bf485bf820e693c79e6bd2a38702a128" SRC_URI[sha256sum] = "8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc" |