Merge pull request #224 from Livius90/master

Use scarthgap branch in CI build
DynamicDevices · Jun 4, 2024 · fd768ef · fd768ef
2 parents 6f94584 + 5980ea4
commit fd768ef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git 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

diff --git 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) |

diff --git 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"
@@ -41,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"
+FILES:${PN}:append = " /opt/${PN}/"
+FILES:${PN}:append:x86-64 = " /opt/${PN}/ /lib64"
diff --git 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,9 +32,6 @@ FILES:${PN}-dev = "\
   ${datadir}/* \
 "
 
-DIRFILES = "1"
-
 do_install:append() {
   find ${D} -name *.dll -exec chown -h root:root {} \;
 }
-