Upgrade 3 benchmark packages
cover Upgrade 3 benchmark packages
From: Kai Kang <[email protected]>
Build PASS on qemux86-64 qemuarm qemuppc and qemuarm64.
Build PASS iozone3 and phoronix-test-suite on qemumips64 that mips* are not compatible hosts for libhugetlbfs.
Kai Kang (3):
iozone3: 434 -> 465
libhugetlbfs: 1.19 -> 1.20
phoronix-test-suite: 6.0.1 -> 6.6.1
.../iozone3/{iozone3_434.bb => iozone3_465.bb} | 9 +++---
...ugetlbfs-avoid-using-restrict-as-var-name.patch | 34 ----------------------
.../libhugetlbfs/libhugetlbfs_git.bb | 5 ++--
...suite_6.0.1.bb => phoronix-test-suite_6.6.1.bb} | 5 ++--
4 files changed, 10 insertions(+), 43 deletions(-)
rename meta-oe/recipes-benchmark/iozone3/{iozone3_434.bb => iozone3_465.bb} (92%)
delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch
rename meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_6.0.1.bb => phoronix-test-suite_6.6.1.bb} (89%)Signature · 1 line
2.10.1
PATCH 1/3 iozone3: 434 -> 465
From: Kai Kang <[email protected]>
Update LIC_FILES_CHKSUM according to:
http://www.iozone.org/docs/Iozone_License.txt
Signed-off-by Kai Kang <[email protected]>
---
.../recipes-benchmark/iozone3/{iozone3_434.bb => iozone3_465.bb} | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
rename meta-oe/recipes-benchmark/iozone3/{iozone3_434.bb => iozone3_465.bb} (92%)meta-oe/recipes-benchmark/iozone3/iozone3_465.bb renamed from meta-oe/recipes-benchmark/iozone3/iozone3_434.bb +5 -4
@@ -3,13 +3,14 @@ HOMEPAGE = "http://www.iozone.org/" AUTHOR = "Don Capps <[email protected]>, William D. Norcott <[email protected]>" SECTION = "console/tests" LICENSE = "iozone3" -LIC_FILES_CHKSUM = "file://iozone.c;beginline=268;endline=272;md5=ab42a6185fd0443978871f11a007ac0b" - +LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \ + file://iozone.c;beginline=260;endline=266;md5=77f9ee51e45b57a7e7519c4fa0b4f00b \ +" SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://copyright.txt \ " -SRC_URI[md5sum] = "3e8f4213581407225065b91774e970ed" -SRC_URI[sha256sum] = "2c388d9db393a5505b31eca38951883744c69745f687f3c7df5185b4681d462a" +SRC_URI[md5sum] = "c924e5e46fb1cf8145f420e8e57eb954" +SRC_URI[sha256sum] = "2e3d72916e7d7340a7c505fc0c3d28553fcc5ff2daf41d811368e55bd4e6a293" S = "${WORKDIR}/${BPN}_${PV}/src/current/"
Signature · 1 line
2.10.1
PATCH 2/3 libhugetlbfs: 1.19 -> 1.20
In reply to [email protected]From: Kai Kang <[email protected]>
Upgrade libhugetlbfs from 1.19 to 1.20.
* Remove libhugetlbfs-avoid-using-restrict-as-var-name.patch which is fixed in upstream.
Signed-off-by Kai Kang <[email protected]>
--- ...ugetlbfs-avoid-using-restrict-as-var-name.patch | 34 ---------------------- .../libhugetlbfs/libhugetlbfs_git.bb | 5 ++-- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch
meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-using-restrict-as-var-name.patch deleted +0 -34
@@ -1,34 +0,0 @@ -Avoid using keyword restrict as variable name which causes error with gcc 5.x: - -| hugeutils.c: In function '__lh_hugetlbfs_setup_env': -| hugeutils.c:304:40: error: expected identifier or '(' before 'restrict' -| char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE]; -| ^ - -Upstream-Status: Pending - -Signed-off-by: Kai Kang <[email protected]> ---- -diff --git a/hugeutils.c b/hugeutils.c -index 53a7fbd..b9d7001 100644 ---- a/hugeutils.c -+++ b/hugeutils.c -@@ -301,14 +301,14 @@ void hugetlbfs_setup_env() - - env = getenv("HUGETLB_RESTRICT_EXE"); - if (env) { -- char *p, *tok, *exe, buf[MAX_EXE+1], restrict[MAX_EXE]; -+ char *p, *tok, *exe, buf[MAX_EXE+1], restricted[MAX_EXE]; - int found = 0; - - exe = get_exe_name(buf, sizeof buf); - DEBUG("Found HUGETLB_RESTRICT_EXE, this exe is \"%s\"\n", exe); -- strncpy(restrict, env, sizeof restrict); -- restrict[sizeof(restrict)-1] = 0; -- for (p = restrict; (tok = strtok(p, ":")) != NULL; p = NULL) { -+ strncpy(restricted, env, sizeof restricted); -+ restricted[sizeof(restricted)-1] = 0; -+ for (p = restricted; (tok = strtok(p, ":")) != NULL; p = NULL) { - DEBUG(" ...check exe match for \"%s\"\n", tok); - if (strcmp(tok, exe) == 0) { - found = 1;
meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +2 -3
@@ -7,10 +7,10 @@ DEPENDS = "sysfsutils perl" RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl" RDEPENDS_${PN}-tests += "bash" -PV = "2.19" +PV = "2.20" PE = "1" -SRCREV = "426c22d65415fcb8927f68fbc5887e075a8dc40a" +SRCREV = "e44180072b796c0e28e53c4d01ef6279caaa2a99" SRC_URI = " \ git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \ file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
@@ -18,7 +18,6 @@ SRC_URI = " \ file://tests-Makefile-install-static-4G-edge-testcases.patch \ file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \ - file://libhugetlbfs-avoid-using-restrict-as-var-name.patch \ file://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \ "
Signature · 1 line
2.10.1
PATCH 3/3 phoronix-test-suite: 6.0.1 -> 6.6.1
In reply to [email protected]From: Kai Kang <[email protected]>
Signed-off-by Kai Kang <[email protected]>
---
.../{phoronix-test-suite_6.0.1.bb => phoronix-test-suite_6.6.1.bb} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
rename meta-oe/recipes-benchmark/phoronix-test-suite/{phoronix-test-suite_6.0.1.bb => phoronix-test-suite_6.6.1.bb} (89%)meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.6.1.bb renamed from meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb +3 -2
@@ -6,8 +6,9 @@ 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] = "c3b26fcc57a3a253e558f759fdc1089f" -SRC_URI[sha256sum] = "27add54f4ecb464549de580cece84b4a4945b99df3ef7ff7034eb7f23ffb3b39" +SRC_URI[md5sum] = "5bcac5896a4a34fc6ae4ae94991e1637" +SRC_URI[sha256sum] = "631ceb808d8bd6cebe69c8b711d55090d6880e906a65837f18fa8200fe7d2c4d" + S = "${WORKDIR}/phoronix-test-suite" inherit systemd allarch
Signature · 1 line
2.10.1