aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/CI_github.yml53
-rw-r--r--conf/layer.conf8
-rw-r--r--recipes-mono/dotnet/dotnet_6.0.419.bb (renamed from recipes-mono/dotnet/dotnet_6.0.407.bb)15
-rw-r--r--recipes-mono/dotnet/dotnet_8.0.201.bb (renamed from recipes-mono/dotnet/dotnet_8.0.101.bb)14
-rw-r--r--recipes-python/python3-clr-loader/python3-clr-loader.bb4
-rw-r--r--recipes-python/python3-pythonnet/python3-pythonnet.bb4
6 files changed, 59 insertions, 39 deletions
diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml
index 320aea9..ed44548 100644
--- a/.github/workflows/CI_github.yml
+++ b/.github/workflows/CI_github.yml
@@ -17,17 +17,19 @@ jobs:
options: --privileged --platform linux/amd64 -v /dev/net/tun:/dev/net/tun -v /dev/kvm:/dev/kvm
strategy:
matrix:
+ dotnet_version: [8.0.201, 6.0.419]
mono_version: [6.12.0.161]
branch: [kirkstone]
arch: [x86-64, arm, arm64]
env:
name: build-and-test
MONO_VERSION: ${{ matrix.mono_version }}
+ DOTNET_VERSION: ${{ matrix.dotnet_version }}
ARCH: ${{ matrix.arch }}
BRANCH: ${{ matrix.branch }}
steps:
- name: Checkout meta-mono
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
clean: false
path: ${{ matrix.branch }}/meta-mono
@@ -51,35 +53,44 @@ jobs:
fi
- name: Configuring
run: |
+ rm -f ${BRANCH}/build/conf/local.conf
+ rm -f ${BRANCH}/build/conf/bblayers.conf
. ./${BRANCH}/poky/oe-init-build-env ${BRANCH}/build
- if [[ ! $(grep meta-mono/meta-mono/${BRANCH}/meta-mono conf/bblayers.conf) ]]; then
- echo "BBLAYERS += '$GITHUB_WORKSPACE/${BRANCH}/meta-mono'" >> conf/bblayers.conf
- fi
- if [[ ! $(grep meta-openembedded conf/bblayers.conf) ]]; then
- echo "BBLAYERS += '$GITHUB_WORKSPACE/${BRANCH}/meta-openembedded/meta-oe'" >> conf/bblayers.conf
- fi
- if [[ ! $(grep rm_work conf/local.conf) ]]; then
- echo "INHERIT += ' rm_work '" >> conf/local.conf
- fi
+
+ # Append custom variables for regenerated local.conf and bblayers.conf samples
+ echo "### Starting to configure local.conf and bblayers.conf ###"
+ echo "mono version: $MONO_VERSION"
+ echo "dotnet version: $DOTNET_VERSION"
+
+ echo "BBLAYERS += '$GITHUB_WORKSPACE/${BRANCH}/meta-mono'" >> conf/bblayers.conf
+ echo "BBLAYERS += '$GITHUB_WORKSPACE/${BRANCH}/meta-openembedded/meta-oe'" >> conf/bblayers.conf
+
+ echo "MACHINE=\"qemu${ARCH}\"" >> conf/local.conf
+ echo "DL_DIR=\"$GITHUB_WORKSPACE/downloads\"" >> conf/local.conf
+
+ echo "PREFERRED_VERSION_mono=\"${MONO_VERSION}\"" >> conf/local.conf
+ echo "PREFERRED_VERSION_mono-native=\"${MONO_VERSION}\"" >> conf/local.conf
+
+ echo "PREFERRED_VERSION_dotnet=\"${DOTNET_VERSION}\"" >> conf/local.conf
+ echo "PREFERRED_VERSION_dotnet-native=\"${DOTNET_VERSION}\"" >> conf/local.conf
+
+ echo "INHERIT += \" rm_work \"" >> conf/local.conf
sed -i 's/#IMAGE_CLASSES += "testimage testsdk"/IMAGE_CLASSES += "testimage "/' conf/local.conf
+ - name: Cleaning
+ run: |
+ . ./${BRANCH}/poky/oe-init-build-env ${BRANCH}/build
+ bitbake -c cleanall test-image-mono dotnet dotnet-native
- name: Building
run: |
. ./${BRANCH}/poky/oe-init-build-env ${BRANCH}/build
-
- export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} PREFERRED_VERSION_mono PREFERRED_VERSION_mono-native"
- export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} MACHINE DL_DIR"
-
- env PREFERRED_VERSION_mono="${MONO_VERSION}" PREFERRED_VERSION_mono-native="${MONO_VERSION}" MACHINE="qemu${ARCH}" DL_DIR="$GITHUB_WORKSPACE/downloads" bitbake -k test-image-mono
+ bitbake -k test-image-mono
- name: Testing
run: |
. ./${BRANCH}/poky/oe-init-build-env ${BRANCH}/build
-
- export BB_ENV_PASSTHROUGH_ADDITIONS="BB_ENV_PASSTHROUGH_ADDITIONS PREFERRED_VERSION_mono PREFERRED_VERSION_mono-native"
- export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS} 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
+ bitbake test-image-mono -c testimage
- name: Store artifacts
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
- name: test-image-mono-${{ github.sha }}
+ name: test-image-mono-${{ matrix.branch }}-${{ matrix.mono_version }}-${{ matrix.dotnet_version }}-${{ github.sha }}-${{ matrix.arch }}
path: ./${{ matrix.branch }}/build/tmp/deploy/images/qemu${{ matrix.arch }}/
diff --git a/conf/layer.conf b/conf/layer.conf
index 7407c2b..df3ba2e 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -22,4 +22,12 @@ PREFERRED_VERSION_nuget-native ?= "5.2.0"
PREFERRED_VERSION_msbuild ?= "16.6"
PREFERRED_VERSION_msbuild-native ?= "16.6"
+# Suppress TMPDIR [buildpaths] warning
+INSANE_SKIP:mono-dbg += "buildpaths"
+INSANE_SKIP:mono-libs-4.5 += "buildpaths"
+INSANE_SKIP:msbuild += "buildpaths"
+INSANE_SKIP:msbuild-dev += "buildpaths"
+INSANE_SKIP:python3-clr-loader += "buildpaths"
+INSANE_SKIP:python3-pythonnet += "buildpaths"
+
LAYERSERIES_COMPAT_mono = "dunfell gatesgarth hardknott honister kirkstone"
diff --git a/recipes-mono/dotnet/dotnet_6.0.407.bb b/recipes-mono/dotnet/dotnet_6.0.419.bb
index 36aa56e..e2f1010 100644
--- a/recipes-mono/dotnet/dotnet_6.0.407.bb
+++ b/recipes-mono/dotnet/dotnet_6.0.419.bb
@@ -19,16 +19,16 @@ RDEPENDS:${PN}:remove:class-native = "libgssapi-krb5"
PR = "r0"
SRC_ARCH:aarch64 = "arm64"
-SRC_FETCH_ID:aarch64 = "72d1f83c-ad2c-4c9b-88b1-15196f411b9d/a0b863cabea9ac0fe7b92dc70c8d4ef0"
-SRC_SHA512SUM:aarch64 = "7d48d8a3814694a978b09a7c4b61c8e0dae9b5efe8195c15339d2f777fa4b85084d386117ee03b05f543d3d64b9484942e1e212001382b2e67277b30f5254b9f"
+SRC_FETCH_ID:aarch64 = "3b18aefa-0e14-4193-a167-35e1de4cfe46/acf2b230ae3ecfbc4d5f4c20cbf97b2d"
+SRC_SHA512SUM:aarch64 = "c249e5c1d15f040e2e4ce444328ec30dd1097984b1b0c4d48d1beb61c7e35d06f133509500ee63ded86a420e569920809b587ff2abe073da3d8f10d4a03a9d15"
SRC_ARCH:arm = "arm"
-SRC_FETCH_ID:arm = "7325ec17-70e8-479d-b8b6-fcbab8d6a053/8abb075436b62424378cbee076c895f5"
-SRC_SHA512SUM:arm = "3f9ba3b05e4c1ef61a6afbdf97a61c42b3eff06ef9189f0f11934fa399674440602e51823190cdf1c43deba3fef7a3ebe7d1ea92933d1d07f59516aefd399aae"
+SRC_FETCH_ID:arm = "badd7c97-634f-410d-9397-995524372595/3d773584b9017d27433c1fe793d9696f"
+SRC_SHA512SUM:arm = "ebd3795b6b9e828fb6735156d9121c2858fd225559f2ecf93f0c65280e8bc18197249f3244d8d6a6f0cb84d14f9c3718acd01cd5457441c2836aca4101335392"
SRC_ARCH:x86-64 = "x64"
-SRC_FETCH_ID:x86-64 = "868b2f38-62ca-4fd8-93ea-e640cf4d2c5b/1e615b6044c0cf99806b8f6e19c97e03"
-SRC_SHA512SUM:x86-64 = "3cc230f21c0d60ffa4955c01d79cbb41887a41f4e97d0708170e4be8e4dc5bc261269c788c738416c28bbc7e8c6940a89cf3d010f16d1dc4cf25bbb0e2c033c1"
+SRC_FETCH_ID:x86-64 = "8828b97b-7bfd-4b1b-a646-e55bddc0d7ad/e2f7d168ad273e78fbae72ffb6d215d3"
+SRC_SHA512SUM:x86-64 = "155a9ab33dc11a76502c24b94dbcd188b06e51f56814082f6570fd923cd74b0266baefbcb6becdd34e41c3979f5b21ca333a7fa57f0e41e5435d28e8815d1641"
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.15"
+DOTNET_RUNTIME = "6.0.27"
do_install[vardeps] += "DOTNET_RUNTIME"
do_install() {
@@ -96,5 +96,6 @@ FILES:${PN}-dbg = "\
RRECOMMENDS:dotnet-dev[nodeprrecs] = "1"
INSANE_SKIP:${PN} = "already-stripped libdir staticdev textrel dev-so"
+INSANE_SKIP:${PN}-dbg = "libdir"
BBCLASSEXTEND = "native"
diff --git a/recipes-mono/dotnet/dotnet_8.0.101.bb b/recipes-mono/dotnet/dotnet_8.0.201.bb
index 5501531..3728e36 100644
--- a/recipes-mono/dotnet/dotnet_8.0.101.bb
+++ b/recipes-mono/dotnet/dotnet_8.0.201.bb
@@ -19,16 +19,16 @@ RDEPENDS:${PN}:remove:class-native = "libgssapi-krb5"
PR = "r0"
SRC_ARCH:aarch64 = "arm64"
-SRC_FETCH_ID:aarch64 = "092bec24-9cad-421d-9b43-458b3a7549aa/84280dbd1eef750f9ed1625339235c22"
-SRC_SHA512SUM:aarch64 = "56beedb8181b63efd319b028190a8a98842efd96da27c5e48e18c4d15ba1a5805610e8838f1904a19263abd51ff68df369973ed59dab879edc52f6e7f93517c6"
+SRC_FETCH_ID:aarch64 = "3bebb4ec-8bb7-4854-b0a2-064bf50805eb/38e6972473f83f11963245ffd940b396"
+SRC_SHA512SUM:aarch64 = "37e230970cfeffdc3873e42595b79ecdf6bfe266a01ace6953725e69a2b64313ce144bf4d4f861130f61f680ead9b4d8a819dd5543c5470c37bbc13d88a78c80"
SRC_ARCH:arm = "arm"
-SRC_FETCH_ID:arm = "28bc9d47-631c-4e28-9e8c-3e8d025cc999/c4302b73c98da0dc26bcb36ed1e148d2"
-SRC_SHA512SUM:arm = "59e0902fa190dee8da1644135e0477ced70fa02ecc12f79c8947743a77a160861ed5e44f8a4228815f853141856d4e3a1db1bd057759d3bff980a79b7d849689"
+SRC_FETCH_ID:arm = "2344ad1d-ce80-4d98-bf9c-f935576deb39/591ea75057045e2284a7d70d5dd01bc5"
+SRC_SHA512SUM:arm = "92760c4a4f3bf559daa41b8b87d7f10995aa5ae11783af053d854e8b9e8b042cf6e984bda40490aff051e4463f7cc8ed25d905090e5cee029c81afdb7f8b32c2"
SRC_ARCH:x86-64 = "x64"
-SRC_FETCH_ID:x86-64 = "9454f7dc-b98e-4a64-a96d-4eb08c7b6e66/da76f9c6bc4276332b587b771243ae34"
-SRC_SHA512SUM:x86-64 = "26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a"
+SRC_FETCH_ID:x86-64 = "85bcc525-4e9c-471e-9c1d-96259aa1a315/930833ef34f66fe9ee2643b0ba21621a"
+SRC_SHA512SUM:x86-64 = "310cf54f595698435b533931b12f86d49f89d27243cf7c87a5b926e0c676b80e869aa58aaff17b5095536c432f377c67d92bf0ca8941b9d891d4b3879637d488"
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 = "8.0.1"
+DOTNET_RUNTIME = "8.0.2"
do_install[vardeps] += "DOTNET_RUNTIME"
do_install() {
diff --git a/recipes-python/python3-clr-loader/python3-clr-loader.bb b/recipes-python/python3-clr-loader/python3-clr-loader.bb
index cff115f..55f81fd 100644
--- a/recipes-python/python3-clr-loader/python3-clr-loader.bb
+++ b/recipes-python/python3-clr-loader/python3-clr-loader.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \
inherit pypi python_flit_core
-PV = "0.2.5"
-SRC_URI[sha256sum] = "82ed5fb654729d14fd88296e74bb6b84eb2cfb976ff4b7d49d4e449fd78a226b"
+PV = "0.2.6"
+SRC_URI[sha256sum] = "019348ae6b6a83c7a406d14537c277cecf7a3a53b263ec342c81ded5845a67ee"
PYPI_PACKAGE = "clr_loader"
DOTNET_MIN_REQ_VERSION ?= "6.0.0"
diff --git a/recipes-python/python3-pythonnet/python3-pythonnet.bb b/recipes-python/python3-pythonnet/python3-pythonnet.bb
index b731659..9912ba1 100644
--- a/recipes-python/python3-pythonnet/python3-pythonnet.bb
+++ b/recipes-python/python3-pythonnet/python3-pythonnet.bb
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \
inherit pypi python_flit_core
-PV = "3.0.1"
-SRC_URI[sha256sum] = "ed4f7f7f95515404112ddb3da1638e1a1013cb56e64c48c4fa60303f02b0a3dd"
+PV = "3.0.3"
+SRC_URI[sha256sum] = "8d4b2e97158a023875f8647458a58f38817f4fe39af60abdd6b0d8adf1d77e75"
PYPI_PACKAGE = "pythonnet"
DOTNET_MIN_REQ_VERSION ?= "6.0.0"
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-06-07 04:56:16 +0000