glmark2: no need to patch waf

Submitted by Ross Burton on Oct. 8, 2020, 4:25 p.m. | Patch ID: 177062

Details

Message ID 20201008162525.3098928-1-ross.burton@arm.com
State Master Next
Commit 4ba8f6cb21fbe2ebfae06a543c7c3c6e0f89cb82
Headers show

Commit Message

Ross Burton Oct. 8, 2020, 4:25 p.m.
Now that waf.bbclass in oe-core uses Python 3 explictly we don't need to
patch glmark.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-benchmark/glmark2/glmark2/python3.patch  | 12 ------------
 meta-oe/recipes-benchmark/glmark2/glmark2_git.bb     |  3 +--
 2 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch b/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch
deleted file mode 100644
index df208cf87..000000000
--- a/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-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
index 82821ad63..2e727a01c 100644
--- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+++ b/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"