diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark')
12 files changed, 233 insertions, 196 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 deleted file mode 100644 index c9c3a08df..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch +++ /dev/null @@ -1,83 +0,0 @@ -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 +- - 6 files changed, 6 insertions(+), 6 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> --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch deleted file mode 100644 index 068b02164..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch +++ /dev/null @@ -1,38 +0,0 @@ -python3: change four shebangs to python3 - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <joe.slater@windriver.com> - ---- a/tools/fio_jsonplus_clat2csv -+++ b/tools/fio_jsonplus_clat2csv -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Note: this script is python2 and python3 compatible. - # - # fio_jsonplus_clat2csv ---- a/tools/fiologparser.py -+++ b/tools/fiologparser.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Note: this script is python2 and python 3 compatible. - # - # fiologparser.py ---- a/tools/hist/fiologparser_hist.py -+++ b/tools/hist/fiologparser_hist.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - """ - Utility for converting *_clat_hist* files generated by fio into latency statistics. - ---- a/tools/plot/fio2gnuplot -+++ b/tools/plot/fio2gnuplot -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # Note: this script is python2 and python3 compatible. - # - # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.22.bb index 759d1087c..b50ed9f27 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.22.bb @@ -22,10 +22,8 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" +SRCREV = "477b6753ad068983d49fea0abc91fab82da9bad0" SRC_URI = "git://git.kernel.dk/fio.git \ - file://0001-update-the-interpreter-paths.patch \ - file://python3_shebangs.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch deleted file mode 100644 index df208cf87..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch +++ /dev/null @@ -1,12 +0,0 @@ -Use Python 3 instead of Python 2. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/waf b/waf -index 6ce2a24..de3c898 100755 ---- a/waf -+++ b/waf -@@ -1 +1 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 6d20bbdaf..2e727a01c 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -14,8 +14,7 @@ PV = "20191226+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" -SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ - file://python3.patch" +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" S = "${WORKDIR}/git" @@ -24,9 +23,9 @@ inherit waf pkgconfig 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)} \ - drm-gl drm-gles2" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gles2', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gles2', '', d)} \ + drm-gles2" PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb index e4b7e4f49..1d2e53a31 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_490.bb @@ -11,12 +11,12 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "e863281987689cd6d9729e535637b77d" -SRC_URI[sha256sum] = "6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584" +SRC_URI[md5sum] = "95cb73dfdd58a0dfa42804f016dbb83c" +SRC_URI[sha256sum] = "5eadb4235ae2a956911204c50ebf2d8d8d59ddcd4a2841a1baf42f3145ad4fed" UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" -S = "${WORKDIR}/${BPN}_${PV}/src/current/" +S = "${WORKDIR}/${BPN}_${PV}/src/current" # # All other arches can use the default OEMAKE except those diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb index c7ad91b24..d969555c2 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb @@ -9,13 +9,13 @@ SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues" AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f9088fe7ffdccd042f7645f1012d7f70" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b7fb682e9941a49f1214dcd7441410d7" SRC_URI = "git://github.com/esnet/iperf.git \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ " -SRCREV = "dfcea9f6a09ead01089a3c9d20c7032f2c0af2c1" +SRCREV = "1f8fb13297f3e3e40169ebcd12e171167e394473" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch new file mode 100644 index 000000000..0787ef27d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch @@ -0,0 +1,210 @@ +From 0a163f60b4a316c4b6f1726a71c84755f3bd85e7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@lge.com> +Date: Wed, 16 Sep 2020 04:36:04 -0700 +Subject: [PATCH] Revert "ld.hugetlbfs: fix -Ttext-segment argument on AArch64" + +This reverts commit 852dcc963ce44861ed7c4e225aa92ff2b5b43579. + +* works around + ERROR: libhugetlbfs-1_2.23-r0 do_populate_sysroot: Fatal errors occurred in subprocesses: + Command '['arm-oe-linux-gnueabi-strip', '--remove-section=.comment', '--remove-section=.note', 'libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw']' returned non-zero exit status 1. + Subprocess output:arm-oe-linux-gnueabi-strip: + libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58: error: PHDR segment not covered by LOAD segment + arm-oe-linux-gnueabi-strip: libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58[.interp]: file format not recognized + +I don't see anything suspicious in the build (the same cmdline as in 2.22 +version), but it uses + +libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot +-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c +libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot +-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl +-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o +obj32/testutils.o +libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot +-I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c +libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc + -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 +-Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security +-Werror=format-security -Werror=return-type +--sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot +-B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now +-ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl +-lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o +obj32/testutils.o + +And the git log between 2.22 and 2.23 is also very short and looks +reasonable. +https://github.com/libhugetlbfs/libhugetlbfs/compare/2.22...2.23 + +When checking with readelf -l it also shows the error about PHDR segment: +arm-oe-linux-gnueabi-readelf -l +./1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw + +Elf file type is DYN (Shared object file) +Entry point 0x201105 +There are 10 program headers, starting at offset 52 + +Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align + PHDR 0x000034 0x00200034 0x00200034 0x00140 0x00140 R 0x4 + INTERP 0x000174 0x00200174 0x00200174 0x0001d 0x0001d R 0x1 + [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] + LOAD 0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000 + LOAD 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW 0x200000 + DYNAMIC 0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW 0x4 + NOTE 0x000194 0x00200194 0x00200194 0x00044 0x00044 R 0x4 + GNU_EH_FRAME 0x012224 0x00212224 0x00212224 0x00008 0x00008 R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 + EXIDX 0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R 0x4 + GNU_RELRO 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW 0x4 + + Section to Segment mapping: + Segment Sections... + 00 + 01 .interp + 02 .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr +.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text +.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr + 03 .fini_array .init_array .dynamic .got .data .bss + 04 .dynamic + 05 .note.ABI-tag .note.gnu.build-id + 06 .eh_frame_hdr + 07 + 08 .ARM.extab .ARM.exidx + 09 .fini_array .init_array .dynamic .got + +arm-oe-linux-gnueabi-readelf -l +./1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw + +Elf file type is DYN (Shared object file) +Entry point 0x31cd1 +There are 10 program headers, starting at offset 52 + +Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align + PHDR 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0 +readelf: Error: the PHDR segment is not covered by a LOAD segment + INTERP 0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R 0x1 + [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] + LOAD 0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000 + LOAD 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW 0x200000 + DYNAMIC 0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW 0x4 + NOTE 0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R 0x4 + GNU_EH_FRAME 0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 + EXIDX 0x032828 0x00032828 0x00032828 0x00008 0x00008 R 0x4 + GNU_RELRO 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW 0x4 + + Section to Segment mapping: + Segment Sections... + 00 + 01 .interp + 02 .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr +.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text +.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr + 03 .fini_array .init_array .dynamic .got .data .bss + 04 .dynamic + 05 .note.ABI-tag .note.gnu.build-id + 06 .eh_frame_hdr + 07 + 08 .ARM.extab .ARM.exidx + 09 .fini_array .init_array .dynamic .got + +And the diff between these 2: + +1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf +1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf + Elf file type is DYN (Shared object file) +-Entry point 0x201105 ++Entry point 0x31cd1 + There are 10 program headers, starting at offset 52 + + Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align +- PHDR 0x000034 0x00200034 0x00200034 0x00140 0x00140 R 0x4 +- INTERP 0x000174 0x00200174 0x00200174 0x0001d 0x0001d R 0x1 ++ PHDR 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0 ++readelf: Error: the PHDR segment is not covered by a LOAD segment ++ INTERP 0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R 0x1 + [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] +- LOAD 0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000 +- LOAD 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW 0x200000 +- DYNAMIC 0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW 0x4 +- NOTE 0x000194 0x00200194 0x00200194 0x00044 0x00044 R 0x4 +- GNU_EH_FRAME 0x012224 0x00212224 0x00212224 0x00008 0x00008 R 0x4 ++ LOAD 0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000 ++ LOAD 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW 0x200000 ++ DYNAMIC 0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW 0x4 ++ NOTE 0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R 0x4 ++ GNU_EH_FRAME 0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 +- EXIDX 0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R 0x4 +- GNU_RELRO 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW 0x4 ++ EXIDX 0x032828 0x00032828 0x00032828 0x00008 0x00008 R 0x4 ++ GNU_RELRO 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW 0x4 + + Section to Segment mapping: + +Revert fixes this build issue, but I still don't see why it fails this way. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Date: Wed Sep 16 13:43:09 2020 +0200 +# +# On branch jansa/master +# Changes to be committed: +# new file: meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch +# modified: meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +# +# Untracked files: +# counts.txt +# diff +# log.svn +# log.svn2 +# wip/ +# +--- + ld.hugetlbfs | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/ld.hugetlbfs b/ld.hugetlbfs +index 5e4e497..6ee8238 100755 +--- a/ld.hugetlbfs ++++ b/ld.hugetlbfs +@@ -130,9 +130,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then + # targeting the ARM platform one needs to explicitly set the text segment offset + # otherwise it will be NULL. + case "$EMU" in +- armelf*_linux_eabi|aarch64elf*|aarch64linux*) +- printf -v TEXTADDR "%x" "$SLICE_SIZE" +- HTLBOPTS="$HTLBOPTS -Ttext-segment=$TEXTADDR" ;; ++ armelf*_linux_eabi|aarch64elf*|aarch64linux*) HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;; + elf_i386) HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;; + elf64ppc|elf64lppc) + if [ "$MMU_TYPE" == "Hash" ] ; then +-- +2.17.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch deleted file mode 100644 index 9d52b908e..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d07d2f9601b49bb72cd4b36838f0c238bd1b0fc1 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 15 Jan 2020 18:45:09 -0800 -Subject: [PATCH] tests: add explicit permissions to open() call - -Fixes -gethugepagesizes.c:227:35: error: open with O_CREAT in second argument needs 3 arguments -| fd = open(fname, O_WRONLY|O_CREAT); -| ^ - -Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/libhugetlbfs/anNtDXbQKro] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/gethugepagesizes.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c -index 9551b38..5777265 100644 ---- a/tests/gethugepagesizes.c -+++ b/tests/gethugepagesizes.c -@@ -223,7 +223,7 @@ void setup_fake_data(long sizes[], int n_elem) - FAIL("mkdtemp: %s", strerror(errno)); - - sprintf(fname, "%s/meminfo-none", fake_meminfo); -- fd = open(fname, O_WRONLY|O_CREAT); -+ fd = open(fname, O_WRONLY|O_CREAT, 0600); - if (fd < 0) - FAIL("open: %s", strerror(errno)); - if (write(fd, meminfo_base, -@@ -233,7 +233,7 @@ void setup_fake_data(long sizes[], int n_elem) - FAIL("close: %s", strerror(errno)); - - sprintf(fname, "%s/meminfo-hugepages", fake_meminfo); -- fd = open(fname, O_WRONLY|O_CREAT); -+ fd = open(fname, O_WRONLY|O_CREAT, 0600); - if (fd < 0) - FAIL("open: %s", strerror(errno)); - if (write(fd, meminfo_base, --- -2.25.0 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 4768d7b63..2f07c938b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -7,10 +7,10 @@ DEPENDS = "sysfsutils" RDEPENDS_${PN} += "bash python3-core" RDEPENDS_${PN}-tests += "bash python3-core" -PV = "2.22" +PV = "2.23" PE = "1" -SRCREV = "e6499ff92b4a7dcffbd131d1f5d24933e48c3f20" +SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc" SRC_URI = " \ git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ @@ -24,8 +24,8 @@ SRC_URI = " \ file://0004-shm.c-Mark-glibc-specific-changes-so.patch \ file://0005-Include-dirent.h-for-ino_t.patch \ file://0006-include-limits.h-for-PATH_MAX.patch \ - file://0001-tests-add-explicit-permissions-to-open-call.patch \ file://0001-huge_page_setup_helper-use-python3-interpreter.patch \ + file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 7e20b7da6..171ac31ac 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -5,7 +5,7 @@ LICENSE = "GPLv2 & GPL-2.0-with-lmbench-restriction" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \ file://COPYING-2;md5=8e9aee2ccc75d61d107e43794a25cdf9" -inherit autotools-brokensep +inherit autotools-brokensep update-alternatives DEPENDS += "libtirpc" CFLAGS += "-I${STAGING_INCDIR}/tirpc" @@ -89,3 +89,7 @@ pkg_postinst_${PN} () { RDEPENDS_${PN} = "perl" FILES_${PN} += "${datadir}/lmbench" + +ALTERNATIVE_${PN} = "stream" +ALTERNATIVE_LINK_NAME[stream] = "${bindir}/stream" + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb index 0964c0487..1a041101b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb @@ -5,11 +5,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" -SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz" -SRC_URI += "file://Makefile.patch" - -SRC_URI[md5sum] = "598f41b7308e1f736164bca3ab84ddbe" -SRC_URI[sha256sum] = "f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88" +SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \ + file://Makefile.patch \ + " +SRC_URI[md5sum] = "674a8a88ff54bdb229ca4148218a41f1" +SRC_URI[sha256sum] = "8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37" do_compile () { echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc |