This recipe has a python script which *appends* a local directory to
sys.path and then tries to include a local module called build. However
if python3-build-native is present that is included instead.
Fix by prepending the local directory to sys.path instead.
Signed-off-by: Ross Burton <ross.bur...@arm.com>
---
.../vk-gl-cts/files/gen-framework-path.patch | 20 +++++++++++++++++++
.../vk-gl-cts/khronos-cts.inc | 1 +
2 files changed, 21 insertions(+)
create mode 100644
meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch
b/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch
new file mode 100644
index 0000000000..8a8d8d2c32
--- /dev/null
+++ b/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch
@@ -0,0 +1,20 @@
+Prepend instead of append to the module search path, as this script needs to
use
+the local module build, not the host module build.
+
+Upstream-Status: Submitted
+Signed-off-by: Ross Burton <ross.bur...@arm.com>
+
+diff --git a/external/vulkancts/scripts/gen_framework.py
b/external/vulkancts/scripts/gen_framework.py
+index 83c5329ce..10e720910 100755
+--- a/external/vulkancts/scripts/gen_framework.py
++++ b/external/vulkancts/scripts/gen_framework.py
+@@ -33 +33 @@ from collections import OrderedDict
+-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..",
"scripts"))
++sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..",
"scripts"))
+diff --git a/external/vulkancts/scripts/gen_framework_c.py
b/external/vulkancts/scripts/gen_framework_c.py
+index 95587e642..84b878cb2 100644
+--- a/external/vulkancts/scripts/gen_framework_c.py
++++ b/external/vulkancts/scripts/gen_framework_c.py
+@@ -28 +28 @@ import re
+-sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..",
"scripts"))
++sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..",
"scripts"))
diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
index f9074556f1..c7535405b0 100644
--- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
+++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc
@@ -10,6 +10,7 @@ SRC_URI = "\
git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master
\
git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main
\
https://raw.githubusercontent.com/baldurk/renderdoc/fcdea67879fa1991e56cf7734ce0ce27866b665f/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc
\
+ file://gen-framework-path.patch \
"
S = "${WORKDIR}/git"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#100563):
https://lists.openembedded.org/g/openembedded-devel/message/100563
Mute This Topic: https://lists.openembedded.org/mt/96244597/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
