Skip to contentSkip to conversation

Updates to meta-mono layer

PATCH In review Barry Grussling 2 participants 9 messages Nov 6, 2016 – Nov 30, 2016

lore
Share & tools
lore
#0 lore raw

cover Updates to meta-mono layer

I have a need to run Mono 4.6.1 on an ARM system. The last commit to the yocto meta-mono tree is over six months old so I figured I would take a crack at it myself. Hopefully these patches help somebody else.

I would appreciate other people testing them. I have only ran non-gui apps on the console, which is my primary use-case. The 4.6.1 port seems to handle that fine, but getting wider feedback and testing would be helpful.

Over the last year Mono has migrated from GPLv2 to MIT for the license. This required a little restructuring. I introduced mono-mit.inc and mono-gplv2.inc to support this.

I also included a previously submitted patch from
http://yocto.yoctoproject.narkive.com/yo6DAY92/meta-mono-patch-mono-4-xx-remove-disable-static-from-extra-oeconf
as I needed it to get Mono compiling on my platform.

I enhanced libgdiplus to allow it to be lighter weight and not necessarily depend on meta-openembedded/meta-oe. It now understands PACKAGECONFIG flags for many common libraries.

Lastly, I have been having issues with Mono 4.6.1 as described at:
https://bugzilla.xamarin.com/show_bug.cgi?id=44918 regarding the error I get: "No fast tls on device. Using fallbacks....". I included the upstream patch which attempts to fix the issue. I am still getting console output about TLS, but everything functions.

These commits start from commit bec66698046eb112df0be281e9d3e080e1c61cdb:

README: add notes on testing mono 4.4.0.148

I am using meta-mono with poky krogoth.

Thanks,

Barry
--

Barry Grussling (7):
Add a base .gitignore
Separate license from mono-4.xx.inc mono-4.xx: Remove --disable-static from EXTRA_OECONF Add the MIT license inc
mono: add support for mono 4.6.1.5
Allow PACKAGECONFIG to configure libgdiplus Add ARM patch for fast-tls

 .gitignore                                         |  7 +++++
 README.md                                          | 21 ++++++++++++---
 recipes-mono/libgdiplus/libgdiplus_2.10.8.bb       |  8 +++++-
 recipes-mono/mono/mono-4.6.1.5.inc                 |  2 ++
 .../ARM-Disable-fast-tls-on-embedded-mono.patch    | 30 ++++++++++++++++++++++
 .../mono/mono-4.6.1.5/dllmap-config.in.diff        | 29 +++++++++++++++++++++
 recipes-mono/mono/mono-4.xx.inc                    |  8 +++---
 recipes-mono/mono/mono-gplv2.inc                   |  3 +++
 recipes-mono/mono/mono-mit.inc                     |  3 +++
 recipes-mono/mono/mono-native_4.0.1.28.bb          |  1 +
 recipes-mono/mono/mono-native_4.0.1.34.bb          |  1 +
 recipes-mono/mono/mono-native_4.0.1.bb             |  1 +
 recipes-mono/mono/mono-native_4.0.2.4.bb           |  1 +
 recipes-mono/mono/mono-native_4.0.2.5.bb           |  1 +
 recipes-mono/mono/mono-native_4.0.3.13.bb          |  1 +
 recipes-mono/mono/mono-native_4.0.3.19.bb          |  1 +
 recipes-mono/mono/mono-native_4.0.3.20.bb          |  1 +
 recipes-mono/mono/mono-native_4.0.4.1.bb           |  1 +
 recipes-mono/mono/mono-native_4.2.0.179.bb         |  1 +
 recipes-mono/mono/mono-native_4.2.0.207.bb         |  1 +
 recipes-mono/mono/mono-native_4.2.1.102.bb         |  1 +
 recipes-mono/mono/mono-native_4.2.1.36.bb          |  1 +
 recipes-mono/mono/mono-native_4.2.1.60.bb          |  1 +
 recipes-mono/mono/mono-native_4.2.2.10.bb          |  1 +
 recipes-mono/mono/mono-native_4.2.2.29.bb          |  1 +
 recipes-mono/mono/mono-native_4.2.2.30.bb          |  1 +
 recipes-mono/mono/mono-native_4.3.2.467.bb         |  1 +
 recipes-mono/mono/mono-native_4.4.0.122.bb         |  1 +
 recipes-mono/mono/mono-native_4.4.0.148.bb         |  1 +
 recipes-mono/mono/mono-native_4.6.1.5.bb           |  4 +++
 recipes-mono/mono/mono_4.0.1.28.bb                 |  1 +
 recipes-mono/mono/mono_4.0.1.34.bb                 |  1 +
 recipes-mono/mono/mono_4.0.1.bb                    |  1 +
 recipes-mono/mono/mono_4.0.2.4.bb                  |  1 +
 recipes-mono/mono/mono_4.0.2.5.bb                  |  1 +
 recipes-mono/mono/mono_4.0.3.13.bb                 |  1 +
 recipes-mono/mono/mono_4.0.3.19.bb                 |  1 +
 recipes-mono/mono/mono_4.0.3.20.bb                 |  1 +
 recipes-mono/mono/mono_4.0.4.1.bb                  |  1 +
 recipes-mono/mono/mono_4.2.0.179.bb                |  1 +
 recipes-mono/mono/mono_4.2.0.207.bb                |  1 +
 recipes-mono/mono/mono_4.2.1.102.bb                |  1 +
 recipes-mono/mono/mono_4.2.1.36.bb                 |  1 +
 recipes-mono/mono/mono_4.2.1.60.bb                 |  1 +
 recipes-mono/mono/mono_4.2.2.10.bb                 |  1 +
 recipes-mono/mono/mono_4.2.2.29.bb                 |  1 +
 recipes-mono/mono/mono_4.2.2.30.bb                 |  1 +
 recipes-mono/mono/mono_4.3.2.467.bb                |  1 +
 recipes-mono/mono/mono_4.4.0.122.bb                |  1 +
 recipes-mono/mono/mono_4.4.0.148.bb                |  1 +
 recipes-mono/mono/mono_4.6.1.5.bb                  | 11 ++++++++
 51 files changed, 158 insertions(+), 8 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 recipes-mono/mono/mono-4.6.1.5.inc
 create mode 100644 recipes-mono/mono/mono-4.6.1.5/ARM-Disable-fast-tls-on-embedded-mono.patch
 create mode 100644 recipes-mono/mono/mono-4.6.1.5/dllmap-config.in.diff
 create mode 100644 recipes-mono/mono/mono-gplv2.inc
 create mode 100644 recipes-mono/mono/mono-mit.inc
 create mode 100644 recipes-mono/mono/mono-native_4.6.1.5.bb
 create mode 100644 recipes-mono/mono/mono_4.6.1.5.bb
Signature · 1 line
2.10.2
#1 lore raw

PATCH 1/7 Add a base .gitignore

Setup a base .gitignore file

---
 .gitignore | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .gitignore
.gitignore new file +7 -0
new file mode 100644
index 0000000..c01df45
@@ -0,0 +1,7 @@
+*.pyc
+*.pyo
+/*.patch
+*.swp
+*.orig
+*.rej
+*~
Signature · 1 line
2.10.2
#2 lore raw

PATCH 2/7 Separate license from mono-4.xx.inc

In reply to Barry Grussling

During the last year Mono changed licenses from GPLv2 to MIT:
http://www.mono-project.com/news/2016/03/31/mono-relicensed-mit/

As such, we need to split the license out from mono-4.xx.inc so that future consumers of that include can change the license as needed.

This changeset introduces mono-gplv2.inc to encode the GPLv2 license. There is no functionality difference in this commit.

---
 recipes-mono/mono/mono-4.xx.inc            | 3 ---
 recipes-mono/mono/mono-gplv2.inc           | 3 +++
 recipes-mono/mono/mono-native_4.0.1.28.bb  | 1 +
 recipes-mono/mono/mono-native_4.0.1.34.bb  | 1 +
 recipes-mono/mono/mono-native_4.0.1.bb     | 1 +
 recipes-mono/mono/mono-native_4.0.2.4.bb   | 1 +
 recipes-mono/mono/mono-native_4.0.2.5.bb   | 1 +
 recipes-mono/mono/mono-native_4.0.3.13.bb  | 1 +
 recipes-mono/mono/mono-native_4.0.3.19.bb  | 1 +
 recipes-mono/mono/mono-native_4.0.3.20.bb  | 1 +
 recipes-mono/mono/mono-native_4.0.4.1.bb   | 1 +
 recipes-mono/mono/mono-native_4.2.0.179.bb | 1 +
 recipes-mono/mono/mono-native_4.2.0.207.bb | 1 +
 recipes-mono/mono/mono-native_4.2.1.102.bb | 1 +
 recipes-mono/mono/mono-native_4.2.1.36.bb  | 1 +
 recipes-mono/mono/mono-native_4.2.1.60.bb  | 1 +
 recipes-mono/mono/mono-native_4.2.2.10.bb  | 1 +
 recipes-mono/mono/mono-native_4.2.2.29.bb  | 1 +
 recipes-mono/mono/mono-native_4.2.2.30.bb  | 1 +
 recipes-mono/mono/mono-native_4.3.2.467.bb | 1 +
 recipes-mono/mono/mono-native_4.4.0.122.bb | 1 +
 recipes-mono/mono/mono-native_4.4.0.148.bb | 1 +
 recipes-mono/mono/mono_4.0.1.28.bb         | 1 +
 recipes-mono/mono/mono_4.0.1.34.bb         | 1 +
 recipes-mono/mono/mono_4.0.1.bb            | 1 +
 recipes-mono/mono/mono_4.0.2.4.bb          | 1 +
 recipes-mono/mono/mono_4.0.2.5.bb          | 1 +
 recipes-mono/mono/mono_4.0.3.13.bb         | 1 +
 recipes-mono/mono/mono_4.0.3.19.bb         | 1 +
 recipes-mono/mono/mono_4.0.3.20.bb         | 1 +
 recipes-mono/mono/mono_4.0.4.1.bb          | 1 +
 recipes-mono/mono/mono_4.2.0.179.bb        | 1 +
 recipes-mono/mono/mono_4.2.0.207.bb        | 1 +
 recipes-mono/mono/mono_4.2.1.102.bb        | 1 +
 recipes-mono/mono/mono_4.2.1.36.bb         | 1 +
 recipes-mono/mono/mono_4.2.1.60.bb         | 1 +
 recipes-mono/mono/mono_4.2.2.10.bb         | 1 +
 recipes-mono/mono/mono_4.2.2.29.bb         | 1 +
 recipes-mono/mono/mono_4.2.2.30.bb         | 1 +
 recipes-mono/mono/mono_4.3.2.467.bb        | 1 +
 recipes-mono/mono/mono_4.4.0.122.bb        | 1 +
 recipes-mono/mono/mono_4.4.0.148.bb        | 1 +
 42 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 recipes-mono/mono/mono-gplv2.inc
recipes-mono/mono/mono-4.xx.inc +0 -3
index 855c857..3ce5871 100644
@@ -3,12 +3,9 @@ DESCRIPTION = "This is part of the Mono project - http://mono-project.com"
 HOMEPAGE = "http://mono-project.com"
 BUGTRACKER = "http://bugzilla.xamarin.com/"
 SECTION = "devel"
-LICENSE = "GPLv2"
 
 DEPENDS = "zlib"
 
-LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=80862f3fd0e11a5fa0318070c54461ce"
-
 SRC_URI = "http://download.mono-project.com/sources/mono/mono-${PV}.tar.bz2 \
            file://dllmap-config.in.diff \
 	   file://0002-prevent-threadpool-exception5-test-hanging.patch \
recipes-mono/mono/mono-gplv2.inc new file +3 -0
new file mode 100644
index 0000000..6996514
@@ -0,0 +1,3 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=80862f3fd0e11a5fa0318070c54461ce"
+
recipes-mono/mono/mono-native_4.0.1.28.bb +1 -0
index a39aa68..4673573 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 
 EXTRA_OECONF += "mono_cv_uscore=no --with-sigaltstack=no --with-mcs-docs=no "
 
recipes-mono/mono/mono-native_4.0.1.34.bb +1 -0
index 208968f..3dbb1d9 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 
 EXTRA_OECONF += "mono_cv_uscore=no --with-sigaltstack=no --with-mcs-docs=no "
 
recipes-mono/mono/mono-native_4.0.1.bb +1 -0
index cbcebe4..4f2cf03 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 
 EXTRA_OECONF += "mono_cv_uscore=no --with-sigaltstack=no --with-mcs-docs=no "
 
recipes-mono/mono/mono-native_4.0.2.4.bb +1 -0
index fbbec72..afdca44 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono-native_4.0.2.5.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.0.3.13.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.0.3.19.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.0.3.20.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.0.4.1.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.0.179.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.0.207.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.1.102.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.1.36.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.1.60.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.2.10.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.2.29.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.2.2.30.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.3.2.467.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.4.0.122.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono-native_4.4.0.148.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono_4.0.1.28.bb +1 -0
index 694215e..4a0ccee 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 
 DEPENDS = "mono-native"
 
recipes-mono/mono/mono_4.0.1.34.bb +1 -0
index 74b3a31..4d15501 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 
 DEPENDS = "mono-native"
 
recipes-mono/mono/mono_4.0.1.bb +1 -0
index ff55fc7..da42224 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 
 DEPENDS = "mono-native"
 
recipes-mono/mono/mono_4.0.2.4.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono_4.0.2.5.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono_4.0.3.13.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono_4.0.3.19.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono_4.0.3.20.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono_4.0.4.1.bb +1 -0
index 9aa04a5..52f7f5c 100644
@@ -1,3 +1,4 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
recipes-mono/mono/mono_4.2.0.179.bb +1 -0
index 67b2ba5..1fa5f30 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.2.0.207.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.2.1.102.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.2.1.36.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.2.1.60.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.2.2.10.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.2.2.29.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.2.2.30.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.3.2.467.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.4.0.122.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
recipes-mono/mono/mono_4.4.0.148.bb +1 -0
index 0e770c7..dc2bf9b 100644
@@ -1,4 +1,5 @@
 require mono-4.xx.inc
+require mono-gplv2.inc
 require ${PN}-base.inc
 require mono-${PV}.inc
 
Signature · 1 line
2.10.2
#3 lore raw

PATCH 3/7 mono-4.xx: Remove --disable-static from EXTRA_OECONF

In reply to Barry Grussling

This is an inclusion of Fabio Berton's patch from:
http://yocto.yoctoproject.narkive.com/yo6DAY92/meta-mono-patch-mono-4-xx-remove-disable-static-from-extra-oeconf

I am not able to build Mono on Krogoth without it.

See https://bugzilla.xamarin.com/show_bug.cgi?id=33081 for more details.

---
 recipes-mono/mono/mono-4.xx.inc | 3 +++
 1 file changed, 3 insertions(+)
recipes-mono/mono/mono-4.xx.inc +3 -0
index 3ce5871..f1dc536 100644
@@ -31,6 +31,9 @@ inherit autotools-brokensep
 inherit pkgconfig
 inherit gettext
 
+# avoids build breaks when using no-static-libs.inc
+DISABLE_STATIC = ""
+
 EXTRA_OECONF += " mono_cv_uscore=no --with-sigaltstack=no --with-mcs-docs=no "
 
 do_configure_prepend() {
Signature · 1 line
2.10.2
#4 lore raw

PATCH 4/7 Add the MIT license inc

In reply to Barry Grussling

With the change to MIT license in Mono, the license information is tracked in the LICENSE file.

---
 recipes-mono/mono/mono-mit.inc | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 recipes-mono/mono/mono-mit.inc
recipes-mono/mono/mono-mit.inc new file +3 -0
new file mode 100644
index 0000000..dcadae7
@@ -0,0 +1,3 @@
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=0499d923dcb460addd12ee9b32ef4f5e"
+
Signature · 1 line
2.10.2
#5 lore raw

PATCH 5/7 mono: add support for mono 4.6.1.5

In reply to Barry Grussling

Upgrade the mono framework to 4.6.1.5. Only real issue was
problems with the .NETPortable directory:
ERROR: mono-4.6.1.5-r0 do_package: QA Issue: mono: Files/directories were installed but not shipped in any package:
/usr/lib/mono/xbuild-frameworks/.NETPortable
/usr/lib/mono/xbuild-frameworks/.NETPortable/v5.0 /usr/lib/mono/xbuild-frameworks/.NETPortable/v5.0/RedistList /usr/lib/mono/xbuild-frameworks/.NETPortable/v5.0/SupportedFrameworks /usr/lib/mono/xbuild-frameworks/.NETPortable/v5.0/RedistList/FrameworkList.xml /usr/lib/mono/xbuild-frameworks/.NETPortable/v5.0/SupportedFrameworks/.NET Framework 4.6.xml /usr/lib/mono/xbuild-frameworks/.NETPortable/v5.0/SupportedFrameworks/ASP.NET Core 1.0.xml /usr/lib/mono/xbuild-frameworks/.NETPortable/v5.0/SupportedFrameworks/Windows Universal 10.0.xml

I fixed this by expanding the FILES directive for xbuild in the mono-4.xx.inc.

---
 README.md                                          |  7 +++++-
 recipes-mono/mono/mono-4.6.1.5.inc                 |  2 ++
 .../mono/mono-4.6.1.5/dllmap-config.in.diff        | 29 ++++++++++++++++++++++
 recipes-mono/mono/mono-4.xx.inc                    |  2 +-
 recipes-mono/mono/mono-native_4.6.1.5.bb           |  4 +++
 recipes-mono/mono/mono_4.6.1.5.bb                  |  8 ++++++
 6 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 recipes-mono/mono/mono-4.6.1.5.inc
 create mode 100644 recipes-mono/mono/mono-4.6.1.5/dllmap-config.in.diff
 create mode 100644 recipes-mono/mono/mono-native_4.6.1.5.bb
 create mode 100644 recipes-mono/mono/mono_4.6.1.5.bb
README.md +6 -1
index 3333aad..2adac04 100644
@@ -6,7 +6,7 @@ libraries to allow users to run .NET applications under linux built
 using OE. For more info about mono, see mono project's website. For
 more info on OpenEmbedded, see OE's website.
 
-This README pertains to meta-mono layer support for Mono 3.12.1 - 4.4.x
+This README pertains to meta-mono layer support for Mono 3.12.1 - 4.6.x
 
 For Mono release notes please see:
 
@@ -19,6 +19,7 @@ For Mono release notes please see:
 * [Mono 4.2.0 Release Notes](http://www.mono-project.com/docs/about-mono/releases/4.2.0/)
 * [Mono 4.2.1 Release Notes](http://www.mono-project.com/docs/about-mono/releases/4.2.1/)
 * [Mono 4.4.0 Release Notes](http://www.mono-project.com/docs/about-mono/releases/4.4.0/)
+* [Mono 4.6.1 Release Notes](http://www.mono-project.com/docs/about-mono/releases/4.6.1/)
 
 NOTE: Mono TLS vulnerabilities. 3.12.1+ includes the fix in the release archive.
 
@@ -151,6 +152,10 @@ MIT/GPLv2 - following the lead of libgdiplus and mono
 
 ## Current State - ARM vfp: Works
 
+4.6.1
+
+* Has been tested on Cortex-A9
+
 #### 27/04/2014
 
 4.0.1
recipes-mono/mono/mono-4.6.1.5.inc new file +2 -0
new file mode 100644
index 0000000..cf960ff
@@ -0,0 +1,2 @@
+SRC_URI[md5sum] = "601a96baa96a2e7acde1fb7e622322c4"
+SRC_URI[sha256sum] = "3871ee72bdfc2ea5d636ffff22cf49ae6bac7c4a4f3d687214dd8ac236bbf7c3"
recipes-mono/mono/mono-4.6.1.5/dllmap-config.in.diff new file +29 -0
new file mode 100644
index 0000000..52ca1a7
@@ -0,0 +1,29 @@
+diff -Naur mono-4.6.1.orig/data/config.in mono-4.6.1/data/config.in
+--- mono-4.6.1.orig/data/config.in	2016-10-11 05:53:43.000000000 -0700
++++ mono-4.6.1/data/config.in	2016-11-04 10:15:32.018107576 -0700
+@@ -10,12 +10,12 @@
+ 	<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
+ 	<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
+ 	<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
+-	<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
++	<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper.so" os="!windows" />
+ 	<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
+ 	<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
+ 	<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
+ 	<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
+-	<dllmap dll="libX11" target="@X11@" os="!windows" />
++	<dllmap dll="libX11" target="libX11.so.6" os="!windows" />
+ 	<dllmap dll="libgdk-x11-2.0" target="@GDKX11@" os="!windows"/>
+ 	<dllmap dll="libgtk-x11-2.0" target="@GTKX11@" os="!windows"/>
+ 	<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
+@@ -29,8 +29,8 @@
+ 		<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
+ 		<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
+ 	</dllmap>
+-	<dllmap dll="gdiplus" target="@libgdiplus_install_loc@" os="!windows"/>
+-	<dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@"  os="!windows"/>
++	<dllmap dll="gdiplus" target="libgdiplus.so.0" os="!windows"/>
++	<dllmap dll="gdiplus.dll" target="libgdiplus.so.0"  os="!windows"/>
+ 	<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
+ 	<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
+ </configuration>
recipes-mono/mono/mono-4.xx.inc +1 -1
index f1dc536..c1df4f0 100644
@@ -81,7 +81,7 @@ FILES_${PN}-libs-compat-2.0 		= "${libdir}/mono/compat-2.0/*"
 FILES_${PN}-gac				= "${libdir}/mono/gac/*"
 FILES_${PN}-configuration-crypto 	= "${libdir}/mono/mono-configuration-crypto/*/*"
 FILES_${PN}-libs-monodoc 		= "${libdir}/mono/monodoc/*"
-FILES_${PN}-xbuild 			= "${libdir}/mono/xbuild/* ${libdir}/mono/xbuild-frameworks/* ${libdir}/mono/xbuild-frameworks/.NETFramework/*/*/*"
+FILES_${PN}-xbuild 			= "${libdir}/mono/xbuild/* ${libdir}/mono/xbuild-frameworks/* ${libdir}/mono/xbuild-frameworks/.NETFramework/*/*/* ${libdir}/mono/xbuild-frameworks/.NETPortable/*/*/* ${libdir}/mono/xbuild-frameworks/.NETPortable/*/*/.NET*"
 FILES_${PN}-doc 			+= " ${datadir}/libgc-mono/*"
 FILES_${PN}-dbg 			+= " ${datadir}/mono-2.0/mono/cil/cil-opcodes.xml ${libdir}/mono/*/*.mdb ${libdir}/mono/gac/*/*/*.mdb"
 FILES_${PN}-staticdev 			+= " ${libdir}/*.a"
recipes-mono/mono/mono-native_4.6.1.5.bb new file +4 -0
new file mode 100644
index 0000000..81bc5af
@@ -0,0 +1,4 @@
+require mono-4.xx.inc
+require mono-mit.inc
+require ${PN}-base.inc
+require mono-${PV}.inc
recipes-mono/mono/mono_4.6.1.5.bb new file +8 -0
new file mode 100644
index 0000000..ae8a7eb
@@ -0,0 +1,8 @@
+require mono-4.xx.inc
+require mono-mit.inc
+require ${PN}-base.inc
+require mono-${PV}.inc
+
+PACKAGES += "${PN}-profiler "
+FILES_${PN}-profiler += " ${datadir}/mono-2.0/mono/profiler/*"
+
Signature · 1 line
2.10.2
#6 lore raw

PATCH 6/7 Allow PACKAGECONFIG to configure libgdiplus

In reply to Barry Grussling

This changeset allows PACKAGECONFIG to determine the configuration of libgdiplus as it applies to jpeg, gif, exif, and tiff.

---
 README.md                                    | 14 ++++++++++++--
 recipes-mono/libgdiplus/libgdiplus_2.10.8.bb |  8 +++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)
README.md +12 -2
index 2adac04..0e25669 100644
@@ -40,9 +40,19 @@ Feedback on testing with armhf would be appreciated and incorporated into this R
 
 ## Layer Dependencies
 
-The libgdiplus recipe has a dependency on the giflib recipe which is provided by the meta-oe layer.
+The libgdiplus recipe has a soft dependency on the giflib recipe which is provided by the meta-oe layer.
+These dependencies can be controlled using the PACKAGECONFIG feature of yocto.  libgdiplus
+recognizes the following options:
 
-Thus if this recipe is included in an image, for example when building core-image-mono, then
+"jpeg exif gif tiff"
+
+These can be controlled via the .bbappend mechanism or by adding:
+PACKAGECONFIG_pn-mono = ""
+PACKAGECONFIG_pn-mono-native = ""
+
+directives to the local.conf
+
+If this recipe is included in an image with gif enabled, for example when building core-image-mono, then
 conf/bblayers needs to be modified to include meta-oe, e.g.
 
 BBLAYERS = " \
recipes-mono/libgdiplus/libgdiplus_2.10.8.bb +7 -1
index fecf7dc..75adfbf 100644
@@ -6,6 +6,12 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fe7364dfce9f3689eb6995e7cdd56879"
 
+PACKAGECONFIG ??= "jpeg tiff gif exif"
+PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg"
+PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff"
+PACKAGECONFIG[gif] = "--with-libgif,--without-libgif,libgif"
+PACKAGECONFIG[exif] = "--with-libexif,--without-libexif,libexif"
+
 SRC_URI = "https://github.com/mono/libgdiplus/archive/${PV}.tar.gz \
            file://libgdiplus-2.10/cairo/configure.in.diff \
            file://libgdiplus-2.10/libgdiplus-2.10.1-libpng15.patch \
@@ -14,7 +20,7 @@ SRC_URI = "https://github.com/mono/libgdiplus/archive/${PV}.tar.gz \
 
 inherit autotools pkgconfig
 
-DEPENDS =+ "cairo freetype fontconfig libxft libpng jpeg tiff giflib libexif"
+DEPENDS =+ "cairo freetype fontconfig libxft libpng"
 
 SRC_URI[md5sum] = "6fd45bbb9843f5a8851b5f44e2a5dd04"
 SRC_URI[sha256sum] = "45c533dc72af0a24d1d3a8097873f5fe1670107fe7e6d08fb71ae586c87a0f1d"
Signature · 1 line
2.10.2
#7 lore raw

PATCH 7/7 Add ARM patch for fast-tls

In reply to Barry Grussling

Attempting to fix upstream bug from:
https://bugzilla.xamarin.com/show_bug.cgi?id=44918

---
 .../ARM-Disable-fast-tls-on-embedded-mono.patch    | 30 ++++++++++++++++++++++
 recipes-mono/mono/mono_4.6.1.5.bb                  |  3 +++
 2 files changed, 33 insertions(+)
 create mode 100644 recipes-mono/mono/mono-4.6.1.5/ARM-Disable-fast-tls-on-embedded-mono.patch
recipes-mono/mono/mono-4.6.1.5/ARM-Disable-fast-tls-on-embedded-mono.patch new file +30 -0
new file mode 100644
index 0000000..416abad
@@ -0,0 +1,30 @@
+Temporary patch from https://github.com/BrzVlad/mono/commit/831e66655e7465023109333fca31d036c7b9a514
+for https://bugzilla.xamarin.com/show_bug.cgi?id=44918.  Should make it
+into upstream soon:
+
+From 831e66655e7465023109333fca31d036c7b9a514 Mon Sep 17 00:00:00 2001
+From: Vlad Brezae <[email protected]>
+Date: Thu, 13 Oct 2016 00:18:46 +0300
+Subject: [PATCH] [arm] Disable fast tls on embedded mono with __thread
+
+We don't have MONO_THREAD_VAR_OFFSET on embedded mono.
+---
+ mono/mini/mini-arm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mono/mini/mini-arm.c b/mono/mini/mini-arm.c
+index 2eac369..86757ac 100644
+--- a/mono/mini/mini-arm.c
++++ b/mono/mini/mini-arm.c
+@@ -31,7 +31,7 @@
+ #include "mini-gc.h"
+ #include "mono/arch/arm/arm-vfp-codegen.h"
+ 
+-#if (defined(HAVE_KW_THREAD) && defined(__linux__) && defined(__ARM_EABI__)) \
++#if (defined(HAVE_KW_THREAD) && defined(__linux__) && defined(__ARM_EABI__) && !defined(__PIC__)) \
+ 	|| defined(TARGET_ANDROID) \
+ 	|| (defined(TARGET_IOS) && !defined(TARGET_WATCHOS))
+ #define HAVE_FAST_TLS
+-- 
+2.10.2
+
recipes-mono/mono/mono_4.6.1.5.bb +3 -0
index ae8a7eb..7abe82c 100644
@@ -6,3 +6,6 @@ require mono-${PV}.inc
 PACKAGES += "${PN}-profiler "
 FILES_${PN}-profiler += " ${datadir}/mono-2.0/mono/profiler/*"
 
+SRC_URI += "file://ARM-Disable-fast-tls-on-embedded-mono.patch \
+"
+
Signature · 1 line
2.10.2
#8 lore raw
In reply to Barry Grussling
Quoted 3 lines · Barry Grussling

I have a need to run Mono 4.6.1 on an ARM system. The last commit to the yocto meta-mono tree is over six months old so I figured I would take a crack at it myself. Hopefully these patches help somebody else.

Merged and tested on qemux86. Many thanks Barry