summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-oe/recipes-benchmark
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark')
-rw-r--r--meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch12
-rw-r--r--meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb3
-rw-r--r--meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb (renamed from meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb)4
3 files changed, 3 insertions, 16 deletions
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 82821ad63..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"
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb
index 646ff90ba..1a041101b 100644
--- a/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.4.0.bb
+++ b/meta-openembedded/meta-oe/recipes-benchmark/memtester/memtester_4.5.0.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
SRC_URI = "http://pyropus.ca/software/memtester/old-versions/${BP}.tar.gz \
file://Makefile.patch \
"
-SRC_URI[md5sum] = "e1883b69cd7c0bb74ef6a475c93a4fbf"
-SRC_URI[sha256sum] = "6ffe23e6e6449b42c577c7953778fb6f698050196797a94fc619d9badc59f8e8"
+SRC_URI[md5sum] = "674a8a88ff54bdb229ca4148218a41f1"
+SRC_URI[sha256sum] = "8ed52b0d06d4aeb61954994146e2a5b2d20448a8f3ce3ee995120e6dbde2ae37"
do_compile () {
echo '${CC} ${CFLAGS} -DPOSIX -c' > conf-cc