diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index 8eda9b70..1019c777 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -3,9 +3,8 @@ name: meta-mono on: push: branches: - - master - - master-next - - nanbield + - honister + - honister-next pull_request: jobs: @@ -19,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 diff --git a/README.md b/README.md index 0d5bda40..5414d1de 100644 --- a/README.md +++ b/README.md @@ -169,3 +169,4 @@ MIT/GPLv2 - following the lead of libgdiplus and mono ## Hit Count [![HitCount](http://hits.dwyl.com/dynamicdevices/meta-mono.svg)](http://hits.dwyl.com/dynamicdevices/meta-mono) + 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" 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 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}" 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 -}