From b3d814a4941343765153197217ab2cdfe85c7b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 1 Jun 2024 17:07:24 +0200 Subject: [PATCH 01/11] ci: change to use scarthgap branch --- .github/workflows/CI_github.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index 371fb471..bdccc5bc 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -5,7 +5,7 @@ on: branches: - master - master-next - - nanbield + - scarthgap pull_request: jobs: @@ -19,7 +19,7 @@ jobs: matrix: dotnet_version: [8.0.301, 6.0.423] mono_version: [6.12.0.182] - branch: [nanbield] + branch: [scarthgap] arch: [x86-64, arm, arm64] env: name: build-and-test From 3b2debf767c6171cd88d583191ed3e7f66a3da9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sat, 1 Jun 2024 17:12:42 +0200 Subject: [PATCH 02/11] ci: update README for scarthgap branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0d5bda40..d0a979b7 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ meta-mono is an OpenEmbedded layer that builds dotNet, the mono runtime and mono | Branch | Support Status* | Status of Build & Tests | | ------ | --------------- | ----------------------- | +| scarthgap | Long Term Support (until Apr. 2028) | [![scarthgap](https://img.shields.io/github/actions/workflow/status/dynamicdevices/meta-mono/CI_github.yml?branch=scarthgap&label=build%20%26%20test)](https://github.com/DynamicDevices/meta-mono/actions/workflows/CI_github.yml) | | nanbield | May 2024 | [![nanbield](https://img.shields.io/github/actions/workflow/status/dynamicdevices/meta-mono/CI_github.yml?branch=nanbield&label=build%20%26%20test)](https://github.com/DynamicDevices/meta-mono/actions/workflows/CI_github.yml) | | kirkstone | Long Term Support (minimum Apr. 2024) | [![master](https://img.shields.io/github/actions/workflow/status/dynamicdevices/meta-mono/CI_github.yml?branch=kirkstone&label=build%20%26%20test)](https://github.com/DynamicDevices/meta-mono/actions/workflows/CI_github.yml) | | dunfell | Supported - Long Term Support (until Apr. 2024) | [![dunfell](https://img.shields.io/github/actions/workflow/status/dynamicdevices/meta-mono/CI_github.yml?branch=dunfell&label=build%20%26%20test)](https://github.com/DynamicDevices/meta-mono/actions/workflows/CI_github.yml) | From f362e68bca45eb8a9d039215274886f64b4e64d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 2 Jun 2024 19:15:39 +0200 Subject: [PATCH 03/11] gtk-sharp: use ALLOW_EMPTY --- recipes-mono/gtk-sharp/gtk-sharp.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-mono/gtk-sharp/gtk-sharp.inc b/recipes-mono/gtk-sharp/gtk-sharp.inc index 70bd3c45..879e4f79 100644 --- a/recipes-mono/gtk-sharp/gtk-sharp.inc +++ b/recipes-mono/gtk-sharp/gtk-sharp.inc @@ -38,3 +38,7 @@ do_install:append() { find ${D} -name *.dll -exec chown -h root:root {} \; } +ALLOW_EMPTY:${PN} = "1" +ALLOW_EMPTY:${PN}-dbg = "1" +ALLOW_EMPTY:${PN}-dev = "1" +ALLOW_EMPTY:${PN}-doc = "1" From 6ecfdde13fc2025b5bed1c20228bf20055029afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 2 Jun 2024 23:07:54 +0200 Subject: [PATCH 04/11] gtk-sharp: disable DIRFILES --- recipes-mono/gtk-sharp/gtk-sharp.inc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes-mono/gtk-sharp/gtk-sharp.inc b/recipes-mono/gtk-sharp/gtk-sharp.inc index 879e4f79..65e992b6 100644 --- a/recipes-mono/gtk-sharp/gtk-sharp.inc +++ b/recipes-mono/gtk-sharp/gtk-sharp.inc @@ -32,13 +32,8 @@ FILES:${PN}-dev = "\ ${datadir}/* \ " -DIRFILES = "1" +DIRFILES = "" do_install:append() { find ${D} -name *.dll -exec chown -h root:root {} \; } - -ALLOW_EMPTY:${PN} = "1" -ALLOW_EMPTY:${PN}-dbg = "1" -ALLOW_EMPTY:${PN}-dev = "1" -ALLOW_EMPTY:${PN}-doc = "1" From fa8e522df8b45ae00c198b27f82d0f5c056bce25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 2 Jun 2024 23:15:01 +0200 Subject: [PATCH 05/11] ci: change to use master poky --- .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 bdccc5bc..f35b7308 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -19,7 +19,7 @@ jobs: matrix: dotnet_version: [8.0.301, 6.0.423] mono_version: [6.12.0.182] - branch: [scarthgap] + branch: [master] arch: [x86-64, arm, arm64] env: name: build-and-test From ee0905db40681270e607c6be928486a8a014d26e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Sun, 2 Jun 2024 23:22:52 +0200 Subject: [PATCH 06/11] gtk-sharp: Fix license warning --- .github/workflows/CI_github.yml | 2 +- recipes-mono/gtk-sharp/gtk-sharp.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI_github.yml b/.github/workflows/CI_github.yml index f35b7308..bdccc5bc 100644 --- a/.github/workflows/CI_github.yml +++ b/.github/workflows/CI_github.yml @@ -19,7 +19,7 @@ jobs: matrix: dotnet_version: [8.0.301, 6.0.423] mono_version: [6.12.0.182] - branch: [master] + branch: [scarthgap] arch: [x86-64, arm, arm64] env: name: build-and-test diff --git a/recipes-mono/gtk-sharp/gtk-sharp.inc b/recipes-mono/gtk-sharp/gtk-sharp.inc index 65e992b6..9848c375 100644 --- a/recipes-mono/gtk-sharp/gtk-sharp.inc +++ b/recipes-mono/gtk-sharp/gtk-sharp.inc @@ -2,7 +2,7 @@ SUMMARY = "GUI toolkit for Mono" DESCRIPTION = "GTK+ bindings for Mono" SECTION = "devel/mono" BUGTRACKER = "http://bugzilla.xamarin.com" -LICENSE = "LGPL-2.1" +LICENSE = "LGPL-2.1-only" RDEPENDS:${PN}-dev += "perl" inherit autotools @@ -32,7 +32,7 @@ FILES:${PN}-dev = "\ ${datadir}/* \ " -DIRFILES = "" +DIRFILES = "1" do_install:append() { find ${D} -name *.dll -exec chown -h root:root {} \; From 45da931f30bd4c676a5d2224c9c05a4d50329282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Mon, 3 Jun 2024 22:49:03 +0200 Subject: [PATCH 07/11] gtk-sharp: drop DIRFILES --- recipes-mono/gtk-sharp/gtk-sharp.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-mono/gtk-sharp/gtk-sharp.inc b/recipes-mono/gtk-sharp/gtk-sharp.inc index 9848c375..f6d11823 100644 --- a/recipes-mono/gtk-sharp/gtk-sharp.inc +++ b/recipes-mono/gtk-sharp/gtk-sharp.inc @@ -32,8 +32,6 @@ FILES:${PN}-dev = "\ ${datadir}/* \ " -DIRFILES = "1" - do_install:append() { find ${D} -name *.dll -exec chown -h root:root {} \; } From 9943f3984012fe5da80248a9573d1b45837080c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Tue, 4 Jun 2024 09:50:24 +0200 Subject: [PATCH 08/11] dotnet-helloworld: Suppress TMPDIR [buildpaths] warning --- conf/layer.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/layer.conf b/conf/layer.conf index b3853de2..c3d01be7 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -29,5 +29,6 @@ INSANE_SKIP:msbuild += "buildpaths" INSANE_SKIP:msbuild-dev += "buildpaths" INSANE_SKIP:python3-clr-loader += "buildpaths" INSANE_SKIP:python3-pythonnet += "buildpaths" +INSANE_SKIP:dotnet-helloworld += "buildpaths" LAYERSERIES_COMPAT_mono = "kirkstone langdale mickledore nanbield scarthgap" From d813f9f50f4c5b5ef266b239bc4f933d2baafd8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Tue, 4 Jun 2024 09:53:31 +0200 Subject: [PATCH 09/11] dotnet-helloworld: INSANE_SKIP "buildpaths" move to .bb files --- conf/layer.conf | 1 - recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index c3d01be7..b3853de2 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -29,6 +29,5 @@ INSANE_SKIP:msbuild += "buildpaths" INSANE_SKIP:msbuild-dev += "buildpaths" INSANE_SKIP:python3-clr-loader += "buildpaths" INSANE_SKIP:python3-pythonnet += "buildpaths" -INSANE_SKIP:dotnet-helloworld += "buildpaths" LAYERSERIES_COMPAT_mono = "kirkstone langdale mickledore nanbield scarthgap" diff --git a/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb b/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb index d54f16b0..2f23e736 100644 --- a/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb +++ b/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb @@ -22,6 +22,7 @@ SRC_ARCH:x86-64 = "x64" INSANE_SKIP:${PN} += "\ already-stripped \ staticdev \ + buildpaths \ " S = "${WORKDIR}/src" From 066374637a5621ec6f8fcb51fcc8ee955bb14928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Tue, 4 Jun 2024 10:05:25 +0200 Subject: [PATCH 10/11] dotnet-helloworld: use do_install:append:x86-64 for x64 specific things --- recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb b/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb index 2f23e736..b32aff6e 100644 --- a/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb +++ b/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb @@ -42,10 +42,11 @@ do_compile () { do_install () { install -d ${D}/opt/ cp -r --no-preserve=ownership ${B}/${PN} ${D}/opt +} - if [ "${SRC_ARCH}" = "x64" ]; then - ln -s ${base_libdir} ${D}/lib64 - fi +do_install:append:x86-64 () { + ln -s ${base_libdir} ${D}/lib64 } -FILES:${PN}:append = " /opt/${PN}/ /lib64" \ No newline at end of file +FILES:${PN}:append = " /opt/${PN}/" +FILES:${PN}:append:x86-64 = " /lib64" From 5980ea44fdd261ec0f369443636c025d19699bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Tue, 4 Jun 2024 10:10:34 +0200 Subject: [PATCH 11/11] dotnet-helloworld: Fix FILES:${PN}:append:x86-64 --- recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb b/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb index b32aff6e..47ff28c6 100644 --- a/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb +++ b/recipes-mono/dotnet-helloworld/dotnet-helloworld_1.0.bb @@ -49,4 +49,4 @@ do_install:append:x86-64 () { } FILES:${PN}:append = " /opt/${PN}/" -FILES:${PN}:append:x86-64 = " /lib64" +FILES:${PN}:append:x86-64 = " /opt/${PN}/ /lib64"