diff options
author | Ross Burton <ross@burtonini.com> | 2020-10-08 17:25:25 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-10-18 12:45:33 -0700 |
commit | 4ba8f6cb21fbe2ebfae06a543c7c3c6e0f89cb82 (patch) | |
tree | aff650c728e6f9e93d81f4fd4bcb21ae8af688eb /meta-oe/recipes-benchmark | |
parent | 5af46f89fcef5c436786ed81978de60f26abe054 (diff) | |
download | meta-openembedded-4ba8f6cb21fbe2ebfae06a543c7c3c6e0f89cb82.tar.gz |
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 <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-benchmark')
-rw-r--r-- | meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 3 |
2 files changed, 1 insertions, 14 deletions
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 @@ | |||
1 | Use Python 3 instead of Python 2. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
5 | |||
6 | diff --git a/waf b/waf | ||
7 | index 6ce2a24..de3c898 100755 | ||
8 | --- a/waf | ||
9 | +++ b/waf | ||
10 | @@ -1 +1 @@ | ||
11 | -#!/usr/bin/env python | ||
12 | +#!/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}" | |||
14 | 14 | ||
15 | COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" | 15 | COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" |
16 | 16 | ||
17 | SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ | 17 | SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" |
18 | file://python3.patch" | ||
19 | SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" | 18 | SRCREV = "72dabc5d72b49c6d45badeb8a941ba4d829b0bd6" |
20 | 19 | ||
21 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |