Merge pull request #199 from zboszor/fix-yocto-4.3

Some fixes to get Yocto 4.3 going
DynamicDevices · Nov 2, 2023 · 75a1a02 · 75a1a02
2 parents 27584e0 + cffdef2
commit 75a1a02
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -22,4 +22,4 @@ PREFERRED_VERSION_nuget-native ?= "5.2.0"
 PREFERRED_VERSION_msbuild ?= "16.10.1"
 PREFERRED_VERSION_msbuild-native ?= "16.10.1"
 
-LAYERSERIES_COMPAT_mono = "kirkstone langdale mickledore"
+LAYERSERIES_COMPAT_mono = "kirkstone langdale mickledore nanbield"
diff --git a/recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb b/recipes-mono/gtk-sharp/gtk-sharp3_2.99.4.bb
@@ -8,7 +8,7 @@ RDEPENDS:${PN} += " perl gtk+3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8754deb904d22254188cb67189b87f19"
 
 SRCREV = "9a72bb67fff7e4845b7bb430a608282668c3e4da"
-SRC_URI = "git://github.com/mono/gtk-sharp.git;branch=master \
+SRC_URI = "git://github.com/mono/gtk-sharp.git;protocol=https;branch=master \
            file://0001-fixup-gmcs-to-mcs.patch"
 
 S = "${WORKDIR}/git"

diff --git a/recipes-mono/libgdiplus/libgdiplus-common.inc b/recipes-mono/libgdiplus/libgdiplus-common.inc
@@ -7,12 +7,8 @@ LICENSE = "MIT"
 
 BRANCH ?= "main"
 
-BRANCH_googletest ?= "v1.8.x"
-SRCREV_googletest = "dea0216d0c6bc5e63cf5f6c8651cd268668032ec"
-
 SRC_URI = " \
-	git://github.com/mono/libgdiplus.git;protocol=https;branch=${BRANCH} \
-	gitsm://github.com/google/googletest.git;protocol=https;name=googletest;branch=${BRANCH_googletest};destsuffix=git/external/googletest \
+	gitsm://github.com/mono/libgdiplus.git;protocol=https;branch=${BRANCH} \
 "
 
 S = "${WORKDIR}/git"

diff --git a/recipes-mono/mono-addins/mono-addins-xbuild.inc b/recipes-mono/mono-addins/mono-addins-xbuild.inc
@@ -11,7 +11,7 @@ DEPENDS = "mono"
 SRCREV = "64a45d96f39d4714ec85adf0fe04b68ec7273ae1"
 SRCBRANCH = "master"
 
-SRC_URI = "git://github.com/mono/mono-addins.git;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/mono/mono-addins.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 

diff --git a/recipes-mono/mono-addins/mono-addins.inc b/recipes-mono/mono-addins/mono-addins.inc
@@ -11,7 +11,7 @@ DEPENDS = "gtk-sharp"
 SRCREV = "64a45d96f39d4714ec85adf0fe04b68ec7273ae1"
 SRCBRANCH = "master"
 
-SRC_URI = "git://github.com/mono/mono-addins.git;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/mono/mono-addins.git;protocol=https;branch=${SRCBRANCH} \
 	   file://0001-configure-mcs.patch"
 
 S = "${WORKDIR}/git"

diff --git a/recipes-mono/mono-upnp/mono-upnp.inc b/recipes-mono/mono-upnp/mono-upnp.inc
@@ -13,7 +13,7 @@ SRCBRANCH = "master"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
 
-SRC_URI = "git://github.com/mono/mono-upnp.git;branch=${SRCBRANCH} \
+SRC_URI = "git://github.com/mono/mono-upnp.git;protocol=https;branch=${SRCBRANCH} \
 "
 
 S = "${WORKDIR}/git"

diff --git a/recipes-mono/taglib-sharp/taglib-sharp.inc b/recipes-mono/taglib-sharp/taglib-sharp.inc
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 DEPENDS = "mono"
 
-SRC_URI = "git://github.com/mono/taglib-sharp.git;branch=${SRCBRANCH}"
+SRC_URI = "git://github.com/mono/taglib-sharp.git;protocol=https;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"