From 4ba8f6cb21fbe2ebfae06a543c7c3c6e0f89cb82 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 8 Oct 2020 17:25:25 +0100 Subject: [PATCH] glmark2: no need to patch waf Now that waf.bbclass in oe-core uses Python 3 explictly we don't need to patch glmark. Signed-off-by: Ross Burton Signed-off-by: Khem Raj --- .../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 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 df208cf878..0000000000 --- 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 - -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 82821ad63d..2e727a01c8 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"