From c77a1afc39a139216b127b988be3e8a4198a0c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Wed, 9 Nov 2022 11:17:04 +0100 Subject: [PATCH 01/24] dotnet: update to v6.0.11 --- .../{dotnet_6.0.302.bb => dotnet_6.0.403.bb} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename recipes-mono/dotnet/{dotnet_6.0.302.bb => dotnet_6.0.403.bb} (78%) diff --git a/recipes-mono/dotnet/dotnet_6.0.302.bb b/recipes-mono/dotnet/dotnet_6.0.403.bb similarity index 78% rename from recipes-mono/dotnet/dotnet_6.0.302.bb rename to recipes-mono/dotnet/dotnet_6.0.403.bb index 16b8085..a9f7924 100644 --- a/recipes-mono/dotnet/dotnet_6.0.302.bb +++ b/recipes-mono/dotnet/dotnet_6.0.403.bb @@ -19,16 +19,16 @@ RDEPENDS:${PN}:remove:class-native = "libgssapi-krb5" PR = "r0" SRC_ARCH:aarch64 = "arm64" -SRC_FETCH_ID:aarch64 = "33389348-a7d7-41ae-850f-ec46d3ca9612/36bad11f948b05a4fa9faac93c35e574" -SRC_SHA512SUM:aarch64 = "26e98a63665d707b1a7729f1794077316f9927edd88d12d82d0357fe597096b0d89b64a085fcdf0cf49807a443bbfebb48e10ea91cea890846cf4308e67c4ea5" +SRC_FETCH_ID:aarch64 = "67ca3f83-3769-4cd8-882a-27ab0c191784/bf631a0229827de92f5c026055218cc0" +SRC_SHA512SUM:aarch64 = "fe62f6eca80acb6774f0a80c472dd02851d88f7ec09cc7f1cadd9981ec0ee1ceb87224911fc0c544cb932c7f5a91c66471a0458b50f85c899154bc8c3605a88e" SRC_ARCH:arm = "arm" -SRC_FETCH_ID:arm = "f35557f7-d5e1-43be-93b6-e59ee8bd823c/9dd2c25a4d7351412ff5902c355732ca" -SRC_SHA512SUM:arm = "0d31c7e8ccf02c8dea92d7b60bcb15e15912d74e7ee2ab8fd88ee03c4fbd8f292c356357d08ec23c2aedc5e3e0803d42ce16f3fff36245739d0cac6634bc3387" +SRC_FETCH_ID:arm = "10cadabb-4cb4-4cca-94db-67cb31cb6f3a/5b3d102b4198da0a25ed12d83ae5633d" +SRC_SHA512SUM:arm = "b07423700a92e3cc79f4e9e02c40e923352c09958e3307fd2ce7fc882509460c65a4404e8080f1b3852af98458512699ba43b37683916756666b4e2532cc8f46" SRC_ARCH:x86-64 = "x64" -SRC_FETCH_ID:x86-64 = "0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c" -SRC_SHA512SUM:x86-64 = "ac1d124802ca035aa00806312460b371af8e3a55d85383ddd8bb66f427c4fabae75b8be23c45888344e13b283a4f9c7df228447c06d796a57ffa5bb21992e6a4" +SRC_FETCH_ID:x86-64 = "1d2007d3-da35-48ad-80cc-a39cbc726908/1f3555baa8b14c3327bb4eaa570d7d07" +SRC_SHA512SUM:x86-64 = "779b3e24a889dbb517e5ff5359dab45dd3296160e4cb5592e6e41ea15cbf87279f08405febf07517aa02351f953b603e59648550a096eefcb0a20fdaf03fadde" SRC_URI[vardeps] += "SRC_FETCH_ID SRC_ARCH" SRC_URI[sha512sum] = "${SRC_SHA512SUM}" @@ -38,7 +38,7 @@ SRC_URI = "https://download.visualstudio.microsoft.com/download/pr/${SRC_FETCH_I do_configure[noexec] = "1" do_compile[noexec] = "1" -DOTNET_RUNTIME = "6.0.7" +DOTNET_RUNTIME = "6.0.11" do_install[vardeps] += "DOTNET_RUNTIME" do_install() { From 313b3ddf0e2fef7e8ed74af4e3796b3452745d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 12 Nov 2022 02:57:20 +0100 Subject: [PATCH 02/24] python: Add Python.NET v3.0.1 --- conf/layer.conf | 2 +- recipes-mono/images/test-image-mono.bb | 2 +- .../python3-clr-loader/python3-clr-loader.bb | 47 +++++++++++++ .../python3-pythonnet/python3-pythonnet.bb | 69 +++++++++++++++++++ 4 files changed, 118 insertions(+), 2 deletions(-) create mode 100644 recipes-python/python3-clr-loader/python3-clr-loader.bb create mode 100644 recipes-python/python3-pythonnet/python3-pythonnet.bb diff --git a/conf/layer.conf b/conf/layer.conf index b83b597..5a66acd 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -22,4 +22,4 @@ PREFERRED_VERSION_nuget-native ?= "5.2.0" PREFERRED_VERSION_msbuild ?= "16.6" PREFERRED_VERSION_msbuild-native ?= "16.6" -LAYERSERIES_COMPAT_mono = "dunfell gatesgarth hardknott honister kirkstone langdale" +LAYERSERIES_COMPAT_mono = "kirkstone langdale" diff --git a/recipes-mono/images/test-image-mono.bb b/recipes-mono/images/test-image-mono.bb index aea1fee..b41038a 100644 --- a/recipes-mono/images/test-image-mono.bb +++ b/recipes-mono/images/test-image-mono.bb @@ -8,7 +8,7 @@ DEFAULT_TEST_SUITES:pn-${PN}:prepend = "dotnet " IMAGE_INSTALL += "msbuild \ dotnet \ dotnet-helloworld \ + python3-pythonnet \ " IMAGE_BASENAME = "${PN}" - diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb new file mode 100644 index 0000000..be238da --- /dev/null +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Implements a generic interface for loading one of the CLR (.NET) runtime implementations and calling simple functions on them." +HOMEPAGE = "http://pythonnet.github.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=cdef1cb9133877183afac105849a771e" + +inherit python_flit_core + +CLR_LOADER_VERSION = "0.2.4" +PV = "${CLR_LOADER_VERSION}+git${SRCPV}" +SRC_URI = "git://github.com/pythonnet/clr-loader.git;protocol=https;branch=master;tag=v${CLR_LOADER_VERSION}" + +DOTNET_MIN_REQ_VERSION ?= "6.0.0" +DOTNET_HTTP_PROXY ?= "" +DOTNET_HTTPS_PROXY ?= "" + +DEPENDS += " \ + dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ + ${PYTHON_PN}-setuptools-scm-native \ + ${PYTHON_PN}-toml-native \ +" + +RDEPENDS:${PN} += " \ + dotnet (>= ${DOTNET_MIN_REQ_VERSION}) \ + ${PYTHON_PN}-cffi \ +" + +S = "${WORKDIR}/git" + +# Use a separated folder for nuget downloads. +export NUGET_PACKAGES="${WORKDIR}/nuget" + +# Workaround for dotnet restore issue, define custom proxy +# in layer.conf or local.conf if dotnet restore was failed. +export http_proxy="${DOTNET_HTTP_PROXY}" +export https_proxy="${DOTNET_HTTPS_PROXY}" + +do_configure:prepend() { + echo '\n__version__ = "${CLR_LOADER_VERSION}"\n' >> ${S}/clr_loader/__init__.py +} + +do_compile:prepend() { + python3 setup.py build_dotnet + cp -R ${S}/build/lib/clr_loader/ffi/dlls ${S}/clr_loader/ffi/ +} + +BBCLASSEXTEND = "native" diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb new file mode 100644 index 0000000..f148aff --- /dev/null +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -0,0 +1,69 @@ +DESCRIPTION = "Python.NET is a package that gives Python programmers nearly seamless integration with .NET Framework, .NET Core and Mono runtime on Windows, Linux and macOS." +HOMEPAGE = "http://pythonnet.github.io" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8e800b2b69ab79d37187ed4eb522060d" + +inherit python_flit_core + +PYTHONNET_VERSION = "3.0.1" +PV = "${PYTHONNET_VERSION}+git${SRCPV}" +SRC_URI = "git://github.com/pythonnet/pythonnet.git;protocol=https;branch=master;tag=v${PYTHONNET_VERSION}" + +DOTNET_MIN_REQ_VERSION ?= "6.0.0" +DOTNET_HTTP_PROXY ?= "" +DOTNET_HTTPS_PROXY ?= "" + +# Python.NET’s documentation - Loading a Runtime +# https://pythonnet.github.io/pythonnet/python.html#loading-a-runtime +# Default runtime is .NET Core (coreclr). +PYTHONNET_DEFAULT_RUNTIME ?= "coreclr" +PYTHONNET_ENV = "#!/bin/bash\n\nexport PYTHONNET_RUNTIME=${PYTHONNET_DEFAULT_RUNTIME}\n" + +DEPENDS += " \ + dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ + ${PYTHON_PN}-clr-loader-native \ + ${PYTHON_PN}-setuptools-scm-native \ + ${PYTHON_PN}-toml-native \ +" + +RDEPENDS:${PN} += " \ + bash \ + dotnet (>= ${DOTNET_MIN_REQ_VERSION}) \ + ${PYTHON_PN}-pycparser \ + ${PYTHON_PN}-clr-loader \ +" + +S = "${WORKDIR}/git" + +# Use a separated folder for nuget downloads. +export NUGET_PACKAGES="${WORKDIR}/nuget" + +# Workaround for dotnet restore issue, define custom proxy +# in layer.conf or local.conf if dotnet restore was failed. +export http_proxy="${DOTNET_HTTP_PROXY}" +export https_proxy="${DOTNET_HTTPS_PROXY}" + +do_configure:prepend() { + echo '\n__version__ = "${PYTHONNET_VERSION}"\n' >> ${S}/pythonnet/__init__.py +} + +do_compile:prepend() { + python3 setup.py build_dotnet + cp -r ${S}/build/lib/pythonnet/runtime/Python.Runtime.* ${S}/pythonnet/runtime/ +} + +do_install:prepend() { + cwd=$(pwd) + printf "${PYTHONNET_ENV}" > ${WORKDIR}/dotnet-env.sh + + install -d ${D}${sysconfdir}/profile.d + install -d ${D}${PYTHON_SITEPACKAGES_DIR} + + install -m 644 ${S}/clr.py ${D}${PYTHON_SITEPACKAGES_DIR} + install -m 644 ${WORKDIR}/dotnet-env.sh ${D}${sysconfdir}/profile.d + + cd ${D}${PYTHON_SITEPACKAGES_DIR} + python3 -m py_compile clr.py + cd ${cwd} +} From 5872fdbd051890aa3d9f6491396717696d6ad417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 12 Nov 2022 03:16:50 +0100 Subject: [PATCH 03/24] python3-clr-loader: fix typo --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index be238da..0dbb753 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -22,7 +22,7 @@ DEPENDS += " \ RDEPENDS:${PN} += " \ dotnet (>= ${DOTNET_MIN_REQ_VERSION}) \ - ${PYTHON_PN}-cffi \ + ${PYTHON_PN}-cffi \ " S = "${WORKDIR}/git" From 57389e38e48ffcb67101aa61e4d876138cdca3b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 12 Nov 2022 03:36:04 +0100 Subject: [PATCH 04/24] pythonnet: fix proxy config --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 8 ++++---- recipes-python/python3-pythonnet/python3-pythonnet.bb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 0dbb753..94e1a6c 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -30,10 +30,10 @@ S = "${WORKDIR}/git" # Use a separated folder for nuget downloads. export NUGET_PACKAGES="${WORKDIR}/nuget" -# Workaround for dotnet restore issue, define custom proxy -# in layer.conf or local.conf if dotnet restore was failed. -export http_proxy="${DOTNET_HTTP_PROXY}" -export https_proxy="${DOTNET_HTTPS_PROXY}" +# Workaround for dotnet restore issue, define custom proxy in a .bbappend +# and/or in layer.conf or local.conf if dotnet restore was failed. +#export http_proxy="${DOTNET_HTTP_PROXY}" +#export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { echo '\n__version__ = "${CLR_LOADER_VERSION}"\n' >> ${S}/clr_loader/__init__.py diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index f148aff..72977d9 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -39,10 +39,10 @@ S = "${WORKDIR}/git" # Use a separated folder for nuget downloads. export NUGET_PACKAGES="${WORKDIR}/nuget" -# Workaround for dotnet restore issue, define custom proxy -# in layer.conf or local.conf if dotnet restore was failed. -export http_proxy="${DOTNET_HTTP_PROXY}" -export https_proxy="${DOTNET_HTTPS_PROXY}" +# Workaround for dotnet restore issue, define custom proxy in a .bbappend +# and/or in layer.conf or local.conf if dotnet restore was failed. +#export http_proxy="${DOTNET_HTTP_PROXY}" +#export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { echo '\n__version__ = "${PYTHONNET_VERSION}"\n' >> ${S}/pythonnet/__init__.py From fa624099719832c1987817375ae09e72a8bfa2a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 14 Nov 2022 00:36:56 +0100 Subject: [PATCH 05/24] pythonnet: separated folder for nuget downloads and cache --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 7 +++++-- recipes-python/python3-pythonnet/python3-pythonnet.bb | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 94e1a6c..37bcb68 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -27,8 +27,11 @@ RDEPENDS:${PN} += " \ S = "${WORKDIR}/git" -# Use a separated folder for nuget downloads. -export NUGET_PACKAGES="${WORKDIR}/nuget" +# NuGet uses $HOME/.nuget/packages to store packages by default +# but we should not use anything outside the build root of packages. +# Use a separated folder for nuget downloads and cache in WORKDIR. +export NUGET_PACKAGES="${WORKDIR}/nuget-packages" +export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 72977d9..81a36e7 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -36,8 +36,11 @@ RDEPENDS:${PN} += " \ S = "${WORKDIR}/git" -# Use a separated folder for nuget downloads. -export NUGET_PACKAGES="${WORKDIR}/nuget" +# NuGet uses $HOME/.nuget/packages to store packages by default +# but we should not use anything outside the build root of packages. +# Use a separated folder for nuget downloads and cache in WORKDIR. +export NUGET_PACKAGES="${WORKDIR}/nuget-packages" +export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. From 76a6a45838352869c5fb3626cb187a8c32d1cdaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Thu, 17 Nov 2022 23:10:45 +0100 Subject: [PATCH 06/24] python3-clr-loader: test proxy --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 37bcb68..404a72a 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -43,6 +43,8 @@ do_configure:prepend() { } do_compile:prepend() { + bbnote "http_proxy: $http_proxy" + bbnote "https_proxy: $https_proxy" python3 setup.py build_dotnet cp -R ${S}/build/lib/clr_loader/ffi/dlls ${S}/clr_loader/ffi/ } From 11954691ea4dc3d8dbb25a88860b89a507e018f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 20 Nov 2022 22:38:07 +0100 Subject: [PATCH 07/24] dotnet restore try to fix #1 --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 404a72a..0a71da8 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -37,6 +37,7 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # and/or in layer.conf or local.conf if dotnet restore was failed. #export http_proxy="${DOTNET_HTTP_PROXY}" #export https_proxy="${DOTNET_HTTPS_PROXY}" +export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 do_configure:prepend() { echo '\n__version__ = "${CLR_LOADER_VERSION}"\n' >> ${S}/clr_loader/__init__.py From fed7aad2c5c257e49d74932f63fd1d9f6fec83e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 20 Nov 2022 22:40:43 +0100 Subject: [PATCH 08/24] dotnet restore next try --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 0a71da8..f2cfbd0 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -37,7 +37,7 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # and/or in layer.conf or local.conf if dotnet restore was failed. #export http_proxy="${DOTNET_HTTP_PROXY}" #export https_proxy="${DOTNET_HTTPS_PROXY}" -export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 +export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER="0" do_configure:prepend() { echo '\n__version__ = "${CLR_LOADER_VERSION}"\n' >> ${S}/clr_loader/__init__.py From 6624e00c53dfb813d2be7ab04cd67c8f7ed0e331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 21 Nov 2022 01:32:46 +0100 Subject: [PATCH 09/24] dotnet restore try some http env settings --- .../python3-clr-loader/python3-clr-loader.bb | 13 +++++++------ .../python3-pythonnet/python3-pythonnet.bb | 12 ++++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index f2cfbd0..0e50414 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -11,10 +11,9 @@ PV = "${CLR_LOADER_VERSION}+git${SRCPV}" SRC_URI = "git://github.com/pythonnet/clr-loader.git;protocol=https;branch=master;tag=v${CLR_LOADER_VERSION}" DOTNET_MIN_REQ_VERSION ?= "6.0.0" -DOTNET_HTTP_PROXY ?= "" -DOTNET_HTTPS_PROXY ?= "" DEPENDS += " \ + libcurl-native dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-setuptools-scm-native \ ${PYTHON_PN}-toml-native \ @@ -35,17 +34,19 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. -#export http_proxy="${DOTNET_HTTP_PROXY}" -#export https_proxy="${DOTNET_HTTPS_PROXY}" +# Override DOTNET_HTTP_PROXY and DOTNET_HTTPS_PROXY in layer.conf or local.conf if needed +DOTNET_HTTP_PROXY ?= "" +DOTNET_HTTPS_PROXY ?= "" +export http_proxy="${DOTNET_HTTP_PROXY}" +export https_proxy="${DOTNET_HTTPS_PROXY}" export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER="0" +export DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP2SUPPORT="0" do_configure:prepend() { echo '\n__version__ = "${CLR_LOADER_VERSION}"\n' >> ${S}/clr_loader/__init__.py } do_compile:prepend() { - bbnote "http_proxy: $http_proxy" - bbnote "https_proxy: $https_proxy" python3 setup.py build_dotnet cp -R ${S}/build/lib/clr_loader/ffi/dlls ${S}/clr_loader/ffi/ } diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 81a36e7..a7ebe44 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -11,8 +11,6 @@ PV = "${PYTHONNET_VERSION}+git${SRCPV}" SRC_URI = "git://github.com/pythonnet/pythonnet.git;protocol=https;branch=master;tag=v${PYTHONNET_VERSION}" DOTNET_MIN_REQ_VERSION ?= "6.0.0" -DOTNET_HTTP_PROXY ?= "" -DOTNET_HTTPS_PROXY ?= "" # Python.NET’s documentation - Loading a Runtime # https://pythonnet.github.io/pythonnet/python.html#loading-a-runtime @@ -21,6 +19,7 @@ PYTHONNET_DEFAULT_RUNTIME ?= "coreclr" PYTHONNET_ENV = "#!/bin/bash\n\nexport PYTHONNET_RUNTIME=${PYTHONNET_DEFAULT_RUNTIME}\n" DEPENDS += " \ + libcurl-native dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-clr-loader-native \ ${PYTHON_PN}-setuptools-scm-native \ @@ -44,8 +43,13 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. -#export http_proxy="${DOTNET_HTTP_PROXY}" -#export https_proxy="${DOTNET_HTTPS_PROXY}" +# Override DOTNET_HTTP_PROXY and DOTNET_HTTPS_PROXY in layer.conf or local.conf if needed +DOTNET_HTTP_PROXY ?= "" +DOTNET_HTTPS_PROXY ?= "" +export http_proxy="${DOTNET_HTTP_PROXY}" +export https_proxy="${DOTNET_HTTPS_PROXY}" +export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER="0" +export DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP2SUPPORT="0" do_configure:prepend() { echo '\n__version__ = "${PYTHONNET_VERSION}"\n' >> ${S}/pythonnet/__init__.py From 099ebb02aaf67a9efa1379d562e16808c65de978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 21 Nov 2022 01:51:54 +0100 Subject: [PATCH 10/24] dotnet restore fix libcurl-native syntax --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 2 +- recipes-python/python3-pythonnet/python3-pythonnet.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 0e50414..d2558da 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/pythonnet/clr-loader.git;protocol=https;branch=maste DOTNET_MIN_REQ_VERSION ?= "6.0.0" DEPENDS += " \ - libcurl-native + libcurl-native \ dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-setuptools-scm-native \ ${PYTHON_PN}-toml-native \ diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index a7ebe44..43fddde 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -19,7 +19,7 @@ PYTHONNET_DEFAULT_RUNTIME ?= "coreclr" PYTHONNET_ENV = "#!/bin/bash\n\nexport PYTHONNET_RUNTIME=${PYTHONNET_DEFAULT_RUNTIME}\n" DEPENDS += " \ - libcurl-native + libcurl-native \ dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-clr-loader-native \ ${PYTHON_PN}-setuptools-scm-native \ From 8f4994763064c8326db8aac0949a1950d3eb61d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 21 Nov 2022 01:55:06 +0100 Subject: [PATCH 11/24] dotnet restore curl fix --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 2 +- recipes-python/python3-pythonnet/python3-pythonnet.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index d2558da..340a759 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -13,7 +13,7 @@ SRC_URI = "git://github.com/pythonnet/clr-loader.git;protocol=https;branch=maste DOTNET_MIN_REQ_VERSION ?= "6.0.0" DEPENDS += " \ - libcurl-native \ + curl-native \ dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-setuptools-scm-native \ ${PYTHON_PN}-toml-native \ diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 43fddde..6ba2e59 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -19,7 +19,7 @@ PYTHONNET_DEFAULT_RUNTIME ?= "coreclr" PYTHONNET_ENV = "#!/bin/bash\n\nexport PYTHONNET_RUNTIME=${PYTHONNET_DEFAULT_RUNTIME}\n" DEPENDS += " \ - libcurl-native \ + curl-native \ dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-clr-loader-native \ ${PYTHON_PN}-setuptools-scm-native \ From 0c251a9019e950d28243f9adb65f9008dcba080e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 26 Nov 2022 20:41:03 +0100 Subject: [PATCH 12/24] dotnet restore test http download --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 340a759..072fc10 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -31,6 +31,7 @@ S = "${WORKDIR}/git" # Use a separated folder for nuget downloads and cache in WORKDIR. export NUGET_PACKAGES="${WORKDIR}/nuget-packages" export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" +export NUGET_INDEX="${WORKDIR}/nuget-index.json" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. @@ -47,6 +48,8 @@ do_configure:prepend() { } do_compile:prepend() { + curl https://api.nuget.org/v3/index.json -o "$NUGET_INDEX" + cat "$NUGET_INDEX" python3 setup.py build_dotnet cp -R ${S}/build/lib/clr_loader/ffi/dlls ${S}/clr_loader/ffi/ } From d650837336ef7d47dd8779a3958fc47805d18164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 26 Nov 2022 20:51:41 +0100 Subject: [PATCH 13/24] dotnet restore http next try --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 072fc10..a21ec14 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -48,8 +48,8 @@ do_configure:prepend() { } do_compile:prepend() { - curl https://api.nuget.org/v3/index.json -o "$NUGET_INDEX" - cat "$NUGET_INDEX" + curl https://api.nuget.org/v3/index.json -o ${WORKDIR}/nuget-index.json + cat ${WORKDIR}/nuget-index.json python3 setup.py build_dotnet cp -R ${S}/build/lib/clr_loader/ffi/dlls ${S}/clr_loader/ffi/ } From b92326e5d097ff5fd418a6e8b37cca7cd63caabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 04:17:02 +0100 Subject: [PATCH 14/24] dotnet restore test DNS --- .github/workflows/CI_github.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index 3ffe86e..889d165 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 600 container: image: dynamicdevices/yocto-ci-build:latest - options: --privileged --platform linux/amd64 -v /dev/net/tun:/dev/net/tun -v /dev/kvm:/dev/kvm + options: --privileged --platform linux/amd64 --dns=8.8.8.8 -v /dev/net/tun:/dev/net/tun -v /dev/kvm:/dev/kvm strategy: matrix: mono_version: [6.12.0.161] From 0d89725280a25be1c06eb0ad044801db3476affd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 04:27:37 +0100 Subject: [PATCH 15/24] dotnet restore, dns fix not works, revert some parts --- .github/workflows/CI_github.yml | 2 +- recipes-python/python3-clr-loader/python3-clr-loader.bb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index 889d165..178848a 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 600 container: image: dynamicdevices/yocto-ci-build:latest - options: --privileged --platform linux/amd64 --dns=8.8.8.8 -v /dev/net/tun:/dev/net/tun -v /dev/kvm:/dev/kvm + options: --privileged --platform linux/amd64 -v /dev/net/tun:/dev/net/tun -v /dev/kvm:/dev/kvm strategy: matrix: mono_version: [6.12.0.161] diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index a21ec14..340a759 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -31,7 +31,6 @@ S = "${WORKDIR}/git" # Use a separated folder for nuget downloads and cache in WORKDIR. export NUGET_PACKAGES="${WORKDIR}/nuget-packages" export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" -export NUGET_INDEX="${WORKDIR}/nuget-index.json" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. @@ -48,8 +47,6 @@ do_configure:prepend() { } do_compile:prepend() { - curl https://api.nuget.org/v3/index.json -o ${WORKDIR}/nuget-index.json - cat ${WORKDIR}/nuget-index.json python3 setup.py build_dotnet cp -R ${S}/build/lib/clr_loader/ffi/dlls ${S}/clr_loader/ffi/ } From 85ed2630aac28c0d8ea069346639d3542a19571d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 17:12:29 +0100 Subject: [PATCH 16/24] dotnet restore fix, version appending fix in __init__.py --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 7 +++---- recipes-python/python3-pythonnet/python3-pythonnet.bb | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 340a759..a17d8c9 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -13,7 +13,6 @@ SRC_URI = "git://github.com/pythonnet/clr-loader.git;protocol=https;branch=maste DOTNET_MIN_REQ_VERSION ?= "6.0.0" DEPENDS += " \ - curl-native \ dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-setuptools-scm-native \ ${PYTHON_PN}-toml-native \ @@ -39,13 +38,13 @@ DOTNET_HTTP_PROXY ?= "" DOTNET_HTTPS_PROXY ?= "" export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" -export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER="0" -export DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP2SUPPORT="0" do_configure:prepend() { - echo '\n__version__ = "${CLR_LOADER_VERSION}"\n' >> ${S}/clr_loader/__init__.py + printf "\n__version__ = \"%s\"\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py } +do_compile[network] = "1" + do_compile:prepend() { python3 setup.py build_dotnet cp -R ${S}/build/lib/clr_loader/ffi/dlls ${S}/clr_loader/ffi/ diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 6ba2e59..7c159ac 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -19,7 +19,6 @@ PYTHONNET_DEFAULT_RUNTIME ?= "coreclr" PYTHONNET_ENV = "#!/bin/bash\n\nexport PYTHONNET_RUNTIME=${PYTHONNET_DEFAULT_RUNTIME}\n" DEPENDS += " \ - curl-native \ dotnet-native (>= ${DOTNET_MIN_REQ_VERSION}) \ ${PYTHON_PN}-clr-loader-native \ ${PYTHON_PN}-setuptools-scm-native \ @@ -48,13 +47,13 @@ DOTNET_HTTP_PROXY ?= "" DOTNET_HTTPS_PROXY ?= "" export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" -export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER="0" -export DOTNET_SYSTEM_NET_HTTP_SOCKETSHTTPHANDLER_HTTP2SUPPORT="0" do_configure:prepend() { - echo '\n__version__ = "${PYTHONNET_VERSION}"\n' >> ${S}/pythonnet/__init__.py + printf "\n__version__ = \"%s\"\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py } +do_compile[network] = "1" + do_compile:prepend() { python3 setup.py build_dotnet cp -r ${S}/build/lib/pythonnet/runtime/Python.Runtime.* ${S}/pythonnet/runtime/ From a571e81317ea50c91eda9e4f43553a02d6bcb08f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 17:31:08 +0100 Subject: [PATCH 17/24] fix endline, restore original yml --- .github/workflows/CI_github.yml | 2 +- recipes-python/python3-clr-loader/python3-clr-loader.bb | 2 +- recipes-python/python3-pythonnet/python3-pythonnet.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index 178848a..3ffe86e 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 600 container: image: dynamicdevices/yocto-ci-build:latest - options: --privileged --platform linux/amd64 -v /dev/net/tun:/dev/net/tun -v /dev/kvm:/dev/kvm + options: --privileged --platform linux/amd64 -v /dev/net/tun:/dev/net/tun -v /dev/kvm:/dev/kvm strategy: matrix: mono_version: [6.12.0.161] diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index a17d8c9..717aafa 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -40,7 +40,7 @@ export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf "\n__version__ = \"%s\"\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py + printf "\\n__version__ = \"%s\"\\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py } do_compile[network] = "1" diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 7c159ac..6ae620c 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -49,7 +49,7 @@ export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf "\n__version__ = \"%s\"\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py + printf "\\n__version__ = \"%s\"\\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py } do_compile[network] = "1" From 7424f94c2a167797d810f4e7bf5934072f2b1210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 17:42:25 +0100 Subject: [PATCH 18/24] fix again endline --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 3 ++- recipes-python/python3-pythonnet/python3-pythonnet.bb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 717aafa..aa574c8 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -40,7 +40,8 @@ export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf "\\n__version__ = \"%s\"\\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py + printf '\n' >> ${S}/clr_loader/__init__.py + printf "__version__ = \"%s\"" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py } do_compile[network] = "1" diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 6ae620c..eb9005a 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -49,7 +49,8 @@ export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf "\\n__version__ = \"%s\"\\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py + printf '\n' >> ${S}/pythonnet/__init__.py + printf "__version__ = \"%s\"" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py } do_compile[network] = "1" From 6ffbb6c892d5800ef2508e8419ba3b9af93a74c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 17:48:31 +0100 Subject: [PATCH 19/24] fix again endline and trigger a new fetch --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 5 ++--- recipes-python/python3-pythonnet/python3-pythonnet.bb | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index aa574c8..3b59d19 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cdef1cb9133877183afac105849a771e" inherit python_flit_core -CLR_LOADER_VERSION = "0.2.4" +CLR_LOADER_VERSION = "0.2.3" PV = "${CLR_LOADER_VERSION}+git${SRCPV}" SRC_URI = "git://github.com/pythonnet/clr-loader.git;protocol=https;branch=master;tag=v${CLR_LOADER_VERSION}" @@ -40,8 +40,7 @@ export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf '\n' >> ${S}/clr_loader/__init__.py - printf "__version__ = \"%s\"" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py + printf "\n__version__ = \"%s\"\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py } do_compile[network] = "1" diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index eb9005a..9cd060c 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8e800b2b69ab79d37187ed4eb522060d" inherit python_flit_core -PYTHONNET_VERSION = "3.0.1" +PYTHONNET_VERSION = "3.0.0" PV = "${PYTHONNET_VERSION}+git${SRCPV}" SRC_URI = "git://github.com/pythonnet/pythonnet.git;protocol=https;branch=master;tag=v${PYTHONNET_VERSION}" @@ -49,8 +49,7 @@ export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf '\n' >> ${S}/pythonnet/__init__.py - printf "__version__ = \"%s\"" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py + printf "\n__version__ = \"%s\"\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py } do_compile[network] = "1" From 4383f75c294751ae9593806a44184ffd01615021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 18:01:04 +0100 Subject: [PATCH 20/24] append endline in do_patch, restore latest package versions --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 4 ++-- recipes-python/python3-pythonnet/python3-pythonnet.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 3b59d19..71a028d 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cdef1cb9133877183afac105849a771e" inherit python_flit_core -CLR_LOADER_VERSION = "0.2.3" +CLR_LOADER_VERSION = "0.2.4" PV = "${CLR_LOADER_VERSION}+git${SRCPV}" SRC_URI = "git://github.com/pythonnet/clr-loader.git;protocol=https;branch=master;tag=v${CLR_LOADER_VERSION}" @@ -39,7 +39,7 @@ DOTNET_HTTPS_PROXY ?= "" export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" -do_configure:prepend() { +do_patch:append() { printf "\n__version__ = \"%s\"\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py } diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 9cd060c..eafdd54 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8e800b2b69ab79d37187ed4eb522060d" inherit python_flit_core -PYTHONNET_VERSION = "3.0.0" +PYTHONNET_VERSION = "3.0.1" PV = "${PYTHONNET_VERSION}+git${SRCPV}" SRC_URI = "git://github.com/pythonnet/pythonnet.git;protocol=https;branch=master;tag=v${PYTHONNET_VERSION}" @@ -48,7 +48,7 @@ DOTNET_HTTPS_PROXY ?= "" export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" -do_configure:prepend() { +do_patch:append() { printf "\n__version__ = \"%s\"\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py } From 38c93c7bed397a4566abaaa9893dc9c51c667150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 27 Nov 2022 18:32:30 +0100 Subject: [PATCH 21/24] do_configure:prepend() must be used for version append --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 2 +- recipes-python/python3-pythonnet/python3-pythonnet.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index 71a028d..a17d8c9 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -39,7 +39,7 @@ DOTNET_HTTPS_PROXY ?= "" export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" -do_patch:append() { +do_configure:prepend() { printf "\n__version__ = \"%s\"\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py } diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index eafdd54..7c159ac 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -48,7 +48,7 @@ DOTNET_HTTPS_PROXY ?= "" export http_proxy="${DOTNET_HTTP_PROXY}" export https_proxy="${DOTNET_HTTPS_PROXY}" -do_patch:append() { +do_configure:prepend() { printf "\n__version__ = \"%s\"\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py } From c3bb690b0876aaf3a951ee913864bf4a369e98a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 28 Nov 2022 00:29:24 +0100 Subject: [PATCH 22/24] append __version__ only if it is does not exist --- .../python3-clr-loader/python3-clr-loader.bb | 13 ++++++++----- .../python3-pythonnet/python3-pythonnet.bb | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index a17d8c9..de12dc7 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -34,13 +34,16 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. # Override DOTNET_HTTP_PROXY and DOTNET_HTTPS_PROXY in layer.conf or local.conf if needed -DOTNET_HTTP_PROXY ?= "" -DOTNET_HTTPS_PROXY ?= "" -export http_proxy="${DOTNET_HTTP_PROXY}" -export https_proxy="${DOTNET_HTTPS_PROXY}" +#DOTNET_HTTP_PROXY ?= "" +#DOTNET_HTTPS_PROXY ?= "" +#export http_proxy="${DOTNET_HTTP_PROXY}" +#export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf "\n__version__ = \"%s\"\n" "${CLR_LOADER_VERSION}" >> ${S}/clr_loader/__init__.py + if ! grep -Fq __version__ ${S}/clr_loader/__init__.py + then + printf "\n__version__ = \"${CLR_LOADER_VERSION}\"\n" >> ${S}/clr_loader/__init__.py + fi } do_compile[network] = "1" diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 7c159ac..9399222 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -43,13 +43,16 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. # Override DOTNET_HTTP_PROXY and DOTNET_HTTPS_PROXY in layer.conf or local.conf if needed -DOTNET_HTTP_PROXY ?= "" -DOTNET_HTTPS_PROXY ?= "" -export http_proxy="${DOTNET_HTTP_PROXY}" -export https_proxy="${DOTNET_HTTPS_PROXY}" +#DOTNET_HTTP_PROXY ?= "" +#DOTNET_HTTPS_PROXY ?= "" +#export http_proxy="${DOTNET_HTTP_PROXY}" +#export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { - printf "\n__version__ = \"%s\"\n" "${PYTHONNET_VERSION}" >> ${S}/pythonnet/__init__.py + if ! grep -Fq __version__ ${S}/pythonnet/__init__.py + then + printf "\n__version__ = \"${PYTHONNET_VERSION}\"\n" >> ${S}/pythonnet/__init__.py + fi } do_compile[network] = "1" From 7f96e547cdb49cac76765b41d2bf2eb0fae57450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 28 Nov 2022 00:32:11 +0100 Subject: [PATCH 23/24] fix typo --- recipes-mono/images/test-image-mono.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-mono/images/test-image-mono.bb b/recipes-mono/images/test-image-mono.bb index b41038a..693c530 100644 --- a/recipes-mono/images/test-image-mono.bb +++ b/recipes-mono/images/test-image-mono.bb @@ -12,3 +12,4 @@ IMAGE_INSTALL += "msbuild \ " IMAGE_BASENAME = "${PN}" + From a99642d1b77f7b611e945057211005fca373341b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 28 Nov 2022 18:10:43 +0100 Subject: [PATCH 24/24] if proxy used, it must be defined in task environment --- recipes-python/python3-clr-loader/python3-clr-loader.bb | 8 ++++---- recipes-python/python3-pythonnet/python3-pythonnet.bb | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb index de12dc7..7073e19 100644 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb @@ -34,10 +34,10 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. # Override DOTNET_HTTP_PROXY and DOTNET_HTTPS_PROXY in layer.conf or local.conf if needed -#DOTNET_HTTP_PROXY ?= "" -#DOTNET_HTTPS_PROXY ?= "" -#export http_proxy="${DOTNET_HTTP_PROXY}" -#export https_proxy="${DOTNET_HTTPS_PROXY}" +DOTNET_HTTP_PROXY ?= "" +DOTNET_HTTPS_PROXY ?= "" +export http_proxy="${DOTNET_HTTP_PROXY}" +export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { if ! grep -Fq __version__ ${S}/clr_loader/__init__.py diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb index 9399222..06efa59 100644 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb @@ -43,10 +43,10 @@ export NUGET_HTTP_CACHE_PATH="${WORKDIR}/nuget-http-cache" # Workaround for dotnet restore issue, define custom proxy in a .bbappend # and/or in layer.conf or local.conf if dotnet restore was failed. # Override DOTNET_HTTP_PROXY and DOTNET_HTTPS_PROXY in layer.conf or local.conf if needed -#DOTNET_HTTP_PROXY ?= "" -#DOTNET_HTTPS_PROXY ?= "" -#export http_proxy="${DOTNET_HTTP_PROXY}" -#export https_proxy="${DOTNET_HTTPS_PROXY}" +DOTNET_HTTP_PROXY ?= "" +DOTNET_HTTPS_PROXY ?= "" +export http_proxy="${DOTNET_HTTP_PROXY}" +export https_proxy="${DOTNET_HTTPS_PROXY}" do_configure:prepend() { if ! grep -Fq __version__ ${S}/pythonnet/__init__.py