aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex J Lennon <ajlennon@dynamicdevices.co.uk>2017-06-18 15:52:54 +0100
committerAlex J Lennon <ajlennon@dynamicdevices.co.uk>2017-06-18 15:52:54 +0100
commit294ef5a8573296652e5c445b6c6e89ac40e3b9a8 (patch)
tree9987d651e0672d9d0ad0f41a2957c6fe1b04d3d1
parentf97ca1ca142a5dc7b672e13fd982c6cf58f8288e (diff)
parent86343d6b734efdbec82c0a81e752643ef1a59a48 (diff)
downloadmeta-mono-294ef5a8573296652e5c445b6c6e89ac40e3b9a8.tar.gz
meta-mono-294ef5a8573296652e5c445b6c6e89ac40e3b9a8.tar.bz2
meta-mono-294ef5a8573296652e5c445b6c6e89ac40e3b9a8.zip
Merge branch 'master' of git.yoctoproject.org:meta-mono
-rw-r--r--README.md7
-rw-r--r--conf/layer.conf1
-rw-r--r--recipes-mono/images/core-image-mono.inc2
-rw-r--r--recipes-mono/mono/mono-5.2.0.175.inc6
-rw-r--r--recipes-mono/mono/mono-native_5.2.0.175.bb4
-rw-r--r--recipes-mono/mono/mono_5.2.0.175.bb7
-rw-r--r--recipes-mono/nuget/nuget.inc41
-rw-r--r--recipes-mono/nuget/nuget/nuget.sh.in3
-rw-r--r--recipes-mono/nuget/nuget_3.5.0.bb4
-rw-r--r--recipes-mono/nuget/nuget_4.1.0.bb4
10 files changed, 75 insertions, 4 deletions
diff --git a/README.md b/README.md
index dae4fa9..182b55d 100644
--- a/README.md
+++ b/README.md
@@ -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 - 5.0.x
+This README pertains to meta-mono layer support for Mono 3.12.1 - 5.2.0
For Mono release notes please see:
@@ -24,6 +24,7 @@ For Mono release notes please see:
* [Mono 4.8.1 Release Notes](http://www.mono-project.com/docs/about-mono/releases/4.8.1/)
* [Mono 5.0.0 Release Notes](http://www.mono-project.com/docs/about-mono/releases/5.0.0/)
* [Mono 5.0.1 Release Notes](http://www.mono-project.com/docs/about-mono/releases/5.0.1/)
+* [Mono 5.2.0 Release Notes](http://www.mono-project.com/docs/about-mono/releases/5.2.0/)
NOTE: Mono TLS vulnerabilities. 3.12.1+ includes the fix in the release archive.
@@ -141,9 +142,9 @@ MIT/GPLv2 - following the lead of libgdiplus and mono
## Current State - x86 emulation: Works
-#### 04/06/2017
+#### 10/06/2017
-5.0.1.1
+5.2.0.175
* Maintainer has tested Poky (pyro) build on a qemux86 platform, with a simple console application, a simple Windows Forms application, and a simple GTK# application
diff --git a/conf/layer.conf b/conf/layer.conf
index fa7d146..36578be 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -12,3 +12,4 @@ BBFILE_PRIORITY_mono = "1"
PREFERRED_VERSION_mono ?= "5.0.1.1"
PREFERRED_VERSION_mono-native ?= "5.0.1.1"
+PREFERRED_VERSION_nuget ?= "3.5.0"
diff --git a/recipes-mono/images/core-image-mono.inc b/recipes-mono/images/core-image-mono.inc
index 8e38de3..83f630b 100644
--- a/recipes-mono/images/core-image-mono.inc
+++ b/recipes-mono/images/core-image-mono.inc
@@ -1,2 +1,2 @@
-IMAGE_INSTALL += "mono mono-helloworld tzdata"
+IMAGE_INSTALL += "mono mono-helloworld nuget tzdata"
diff --git a/recipes-mono/mono/mono-5.2.0.175.inc b/recipes-mono/mono/mono-5.2.0.175.inc
new file mode 100644
index 0000000..95bbe4a
--- /dev/null
+++ b/recipes-mono/mono/mono-5.2.0.175.inc
@@ -0,0 +1,6 @@
+SRC_URI[md5sum] = "825edd8e3154fc373900b360c156b85e"
+SRC_URI[sha256sum] = "cd00cc9d582449853b861419fa5647c0c2174e7fc07b2aeb03ba5ca847da4b18"
+
+S = "${WORKDIR}/mono-${PV}"
+
+EXTRA_OECONF = "--disable-btls"
diff --git a/recipes-mono/mono/mono-native_5.2.0.175.bb b/recipes-mono/mono/mono-native_5.2.0.175.bb
new file mode 100644
index 0000000..72fa593
--- /dev/null
+++ b/recipes-mono/mono/mono-native_5.2.0.175.bb
@@ -0,0 +1,4 @@
+require mono-5.xx.inc
+require mono-mit.inc
+require mono-native-5.xx-base.inc
+require mono-${PV}.inc
diff --git a/recipes-mono/mono/mono_5.2.0.175.bb b/recipes-mono/mono/mono_5.2.0.175.bb
new file mode 100644
index 0000000..82a7a78
--- /dev/null
+++ b/recipes-mono/mono/mono_5.2.0.175.bb
@@ -0,0 +1,7 @@
+require mono-5.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/*"
diff --git a/recipes-mono/nuget/nuget.inc b/recipes-mono/nuget/nuget.inc
new file mode 100644
index 0000000..cf3ed21
--- /dev/null
+++ b/recipes-mono/nuget/nuget.inc
@@ -0,0 +1,41 @@
+SUMMARY = "Package manager for .Net/Mono development platform"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://Apache-LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+HOMEPAGE = "http://nuget.org/"
+
+# This package ships Mono EXE and a shell script
+PACKAGE_ARCH="all"
+
+inherit mono
+
+SRC_URI = " \
+ http://dist.nuget.org/win-x86-commandline/v${PV}/nuget.exe;downloadfilename=NuGet-v${PV}.exe \
+ http://www.apache.org/licenses/LICENSE-2.0.txt;downloadfilename=Apache-LICENSE-2.0.txt;name=lic \
+ file://nuget.sh.in \
+ "
+
+SRC_URI[lic.md5sum] = "3b83ef96387f14655fc854ddc3c6bd57"
+SRC_URI[lic.sha256sum] = "cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30"
+
+S = "${WORKDIR}"
+
+do_install () {
+ install -d -m0755 ${D}${bindir}
+ install -m0755 ${WORKDIR}/nuget.sh.in ${D}${bindir}/nuget
+ sed -i -e 's:@bindir@:${bindir}:g' -e 's:@libdir@:${libdir}:g' ${D}${bindir}/nuget
+
+ install -d -m0755 ${D}${libdir}/mono/nuget
+ install -m0755 ${WORKDIR}/NuGet-v${PV}.exe ${D}${libdir}/mono/nuget/NuGet.exe
+}
+
+FILES_${PN} += "${libdir}/mono/nuget"
+
+SYSROOT_PREPROCESS_FUNCS += "nuget_sysroot_preprocess"
+
+nuget_sysroot_preprocess () {
+ install -d -m0755 ${SYSROOT_DESTDIR}${bindir_crossscripts}/
+ install -m0755 ${WORKDIR}/nuget.sh.in ${SYSROOT_DESTDIR}${bindir_crossscripts}/nuget
+ sed -i -e 's:@bindir@:${STAGING_BINDIR_NATIVE}:g' -e 's:@libdir@:${STAGING_LIBDIR}:g' ${SYSROOT_DESTDIR}${bindir_crossscripts}/nuget
+}
+
+DIRFILES = "1"
diff --git a/recipes-mono/nuget/nuget/nuget.sh.in b/recipes-mono/nuget/nuget/nuget.sh.in
new file mode 100644
index 0000000..4e4dc1e
--- /dev/null
+++ b/recipes-mono/nuget/nuget/nuget.sh.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @bindir@/mono @libdir@/mono/nuget/NuGet.exe "$@"
diff --git a/recipes-mono/nuget/nuget_3.5.0.bb b/recipes-mono/nuget/nuget_3.5.0.bb
new file mode 100644
index 0000000..4b743e9
--- /dev/null
+++ b/recipes-mono/nuget/nuget_3.5.0.bb
@@ -0,0 +1,4 @@
+require nuget.inc
+
+SRC_URI[md5sum] = "406324e1744923a530a3f45b8e4fe1eb"
+SRC_URI[sha256sum] = "399ec24c26ed54d6887cde61994bb3d1cada7956c1b19ff880f06f060c039918"
diff --git a/recipes-mono/nuget/nuget_4.1.0.bb b/recipes-mono/nuget/nuget_4.1.0.bb
new file mode 100644
index 0000000..2549ac4
--- /dev/null
+++ b/recipes-mono/nuget/nuget_4.1.0.bb
@@ -0,0 +1,4 @@
+require nuget.inc
+
+SRC_URI[md5sum] = "ab763e8583a7970381aa42bf4b55d71a"
+SRC_URI[sha256sum] = "4c1de9b026e0c4ab087302ff75240885742c0faa62bd2554f913bbe1f6cb63a0"