[PATCH 1/2] python3-pytest-forked: update for move from picobuild to build

[PATCH 1/2] python3-pytest-forked: update for move from picobuild to build

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-devtools/python/python3-pytest-forked_1.4.0.bb       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb b/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb
index 34dd9c407e..e6ef84d05c 100644
--- a/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb
+++ b/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb
@@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422
 inherit pypi python_setuptools_build_meta
 
 PEP517_PICOBUILD_OPTS = "--loose-depends"
+PEP517_BUILD_OPTS = "--skip-dependency-check"
 
 DEPENDS += "python3-setuptools-scm-native"
 
-- 
2.34.1

[PATCH 2/2] khronos-cts: fix build when python3-build-native is present

[Ross Burton]

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.burton@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.burton@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

Re: [oe] [PATCH 1/2] python3-pytest-forked: update for move from picobuild to build

[Khem Raj]

On Fri, Jan 13, 2023 at 4:26 AM Ross Burton <ross.burton@arm.com> wrote:
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  .../recipes-devtools/python/python3-pytest-forked_1.4.0.bb       | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb b/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb
> index 34dd9c407e..e6ef84d05c 100644
> --- a/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb
> +++ b/meta-python/recipes-devtools/python/python3-pytest-forked_1.4.0.bb
> @@ -8,6 +8,7 @@ SRC_URI[sha256sum] = "8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422
>  inherit pypi python_setuptools_build_meta
>
>  PEP517_PICOBUILD_OPTS = "--loose-depends"

Do we need this option after picobuild is dropped. ?

> +PEP517_BUILD_OPTS = "--skip-dependency-check"
>
>  DEPENDS += "python3-setuptools-scm-native"
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#100562): https://lists.openembedded.org/g/openembedded-devel/message/100562
> Mute This Topic: https://lists.openembedded.org/mt/96244596/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [oe] [PATCH 1/2] python3-pytest-forked: update for move from picobuild to build

[Ross Burton]

> On 13 Jan 2023, at 17:01, Khem Raj <raj.khem@gmail.com> wrote:
>> PEP517_PICOBUILD_OPTS = "--loose-depends"
> 
> Do we need this option after picobuild is dropped. ?


No. That would be the merge going wrong and I failed to notice, thanks.  V2 on the list.

Ross