From a6ad180ca9becdd1c68491ba93d9fec54a2de0f1 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Sun, 23 Jan 2022 09:16:17 +0000 Subject: [PATCH 1/9] Build 'honister' checkouts on this branch Signed-off-by: Alex J Lennon --- .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 5446889b..c067050b 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: mono_version: [6.12.0.154] - branch: [master] + branch: [honister] arch: [x86, arm] env: name: build-and-test From a2a79ad953121f02df315e0a2841aab70a99ba95 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Tue, 1 Feb 2022 00:17:06 +0000 Subject: [PATCH 2/9] Just build honister Signed-off-by: Alex J Lennon --- .github/workflows/CI_github.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index c067050b..ec0660a5 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -3,17 +3,8 @@ name: meta-mono on: push: branches: - - master - - master-next - - sumo - - thud - - warrior - - zeus - - dunfell - - gatesgarth - - hardknott - honister - - kirkstone + - honister-next pull_request: jobs: From 0d490e9c12ca9452d251381e5c41c3bb836dcabf Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Wed, 21 Dec 2022 12:52:09 +0000 Subject: [PATCH 3/9] Force build Signed-off-by: Alex J Lennon --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8dcae42a..35bae3c9 100644 --- a/README.md +++ b/README.md @@ -324,3 +324,4 @@ Fails to link building Poky (Jethro) with: ## HitCount [![HitCount](http://hits.dwyl.com/dynamicdevices/meta-mono.svg)](http://hits.dwyl.com/dynamicdevices/meta-mono) + From 7d1ffa9cdf829ba13082330e359d0c77b623fcb5 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Sat, 1 Apr 2023 13:02:25 +0100 Subject: [PATCH 4/9] CI_github: Update CI to Node 16 to remove warnings Signed-off-by: Alex J Lennon --- .github/workflows/CI_github.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index ec0660a5..e8110eb2 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -22,7 +22,7 @@ jobs: BRANCH: ${{ matrix.branch }} steps: - name: Checkout meta-mono - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: clean: false path: ${{ matrix.branch }}/meta-mono @@ -73,3 +73,8 @@ jobs: export BB_ENV_EXTRAWHITE="${BB_ENV_EXTRAWHITE} MACHINE DL_DIR" export TERM=linux env PREFERRED_VERSION_mono="${MONO_VERSION}" PREFERRED_VERSION_mono-native="${MONO_VERSION}" MACHINE="qemu${ARCH}" DL_DIR="$GITHUB_WORKSPACE/downloads" bitbake test-image-mono -c testimage + - name: Store artifacts + uses: actions/upload-artifact@v3 + with: + name: test-image-mono-${{ github.sha }} + path: ./${{ matrix.branch }}/build/tmp/deploy/images/qemu${{ matrix.arch }}/ From 9640728b30606a669774c34d337d05079130b829 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 23 May 2024 09:48:54 +0100 Subject: [PATCH 5/9] Layer should support honister Signed-off-by: Alex J Lennon --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index b3853de2..65512623 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -30,4 +30,4 @@ INSANE_SKIP:msbuild-dev += "buildpaths" INSANE_SKIP:python3-clr-loader += "buildpaths" INSANE_SKIP:python3-pythonnet += "buildpaths" -LAYERSERIES_COMPAT_mono = "kirkstone langdale mickledore nanbield scarthgap" +LAYERSERIES_COMPAT_mono = "kirkstone langdale mickledore nanbield scarthgap honister" From d640b04aaf5c56103e793a5bee91caa51f77d28b Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 23 May 2024 09:49:50 +0100 Subject: [PATCH 6/9] Remove python from merge as not building Signed-off-by: Alex J Lennon --- .../python3-clr-loader/python3-clr-loader.bb | 52 --------------- .../python3-pythonnet/python3-pythonnet.bb | 66 ------------------- 2 files changed, 118 deletions(-) delete mode 100644 recipes-python/python3-clr-loader/python3-clr-loader.bb delete mode 100644 recipes-python/python3-pythonnet/python3-pythonnet.bb diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb deleted file mode 100644 index 46dd4d55..00000000 --- a/recipes-python/python3-clr-loader/python3-clr-loader.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Loader for different .NET runtimes" -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 pypi python_flit_core - -PV = "0.2.6" -SRC_URI[sha256sum] = "019348ae6b6a83c7a406d14537c277cecf7a3a53b263ec342c81ded5845a67ee" -PYPI_PACKAGE = "clr_loader" - -DOTNET_MIN_REQ_VERSION ?= "6.0.0" - -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 \ -" - -# 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. -# 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}" - -do_configure:prepend() { - if ! grep -Fq __version__ ${S}/clr_loader/__init__.py - then - printf "\n__version__ = \"${PV}\"\n" >> ${S}/clr_loader/__init__.py - fi -} - -do_compile[network] = "1" - -BBCLASSEXTEND = "native" diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb deleted file mode 100644 index 77f545ab..00000000 --- a/recipes-python/python3-pythonnet/python3-pythonnet.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "Python for .NET" -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 pypi python_flit_core - -PV = "3.0.3" -SRC_URI[sha256sum] = "8d4b2e97158a023875f8647458a58f38817f4fe39af60abdd6b0d8adf1d77e75" -PYPI_PACKAGE = "pythonnet" - -DOTNET_MIN_REQ_VERSION ?= "6.0.0" - -# 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 \ -" - -# 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. -# 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}" - -do_configure:prepend() { - if ! grep -Fq __version__ ${S}/pythonnet/__init__.py - then - printf "\n__version__ = \"${PV}\"\n" >> ${S}/pythonnet/__init__.py - fi -} - -do_compile[network] = "1" - -do_install:prepend() { - printf "${PYTHONNET_ENV}" > ${WORKDIR}/dotnet-env.sh - - install -d ${D}${sysconfdir}/profile.d - install -m 644 ${WORKDIR}/dotnet-env.sh ${D}${sysconfdir}/profile.d -} From 900acb27a1752a75b034ebbc1dee4e2044843d40 Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 23 May 2024 09:57:58 +0100 Subject: [PATCH 7/9] Fix branch build in CI to honister Signed-off-by: Alex J Lennon --- .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 e719f89e..1019c777 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -18,7 +18,7 @@ jobs: matrix: dotnet_version: [8.0.201, 6.0.419] mono_version: [6.12.0.182] - branch: [nanbield] + branch: [honister] arch: [x86-64, arm, arm64] env: name: build-and-test From e0780a565c095efd536650e34ca382fd3bed0afe Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Thu, 23 May 2024 10:02:18 +0100 Subject: [PATCH 8/9] test-image-mono: Remove python3-pythonnet from test image Signed-off-by: Alex J Lennon --- recipes-mono/images/test-image-mono.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes-mono/images/test-image-mono.bb b/recipes-mono/images/test-image-mono.bb index 693c5309..aea1fee3 100644 --- a/recipes-mono/images/test-image-mono.bb +++ b/recipes-mono/images/test-image-mono.bb @@ -8,7 +8,6 @@ DEFAULT_TEST_SUITES:pn-${PN}:prepend = "dotnet " IMAGE_INSTALL += "msbuild \ dotnet \ dotnet-helloworld \ - python3-pythonnet \ " IMAGE_BASENAME = "${PN}" From b36774be15f3d70f1fca55e7a44cee869721679b Mon Sep 17 00:00:00 2001 From: Alex J Lennon Date: Fri, 24 May 2024 11:27:16 +0100 Subject: [PATCH 9/9] disable dotnet8 Signed-off-by: Alex J Lennon --- .../dotnet/{dotnet_8.0.201.bb => dotnet_8.0.201.bb.disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename recipes-mono/dotnet/{dotnet_8.0.201.bb => dotnet_8.0.201.bb.disabled} (100%) diff --git a/recipes-mono/dotnet/dotnet_8.0.201.bb b/recipes-mono/dotnet/dotnet_8.0.201.bb.disabled similarity index 100% rename from recipes-mono/dotnet/dotnet_8.0.201.bb rename to recipes-mono/dotnet/dotnet_8.0.201.bb.disabled