Message ID | 1502439245-18039-2-git-send-email-angelo.compagnucci@gmail.com |
---|---|
State | Accepted |
Headers | show |
On 11-08-17 10:14, Angelo Compagnucci wrote: > This patch bumps to mono 5.0.1.1 and updates the unit tests patch > accordingly. > > Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> > --- > .../0006-Remove-unit-tests-from-mono-compilation.patch | 14 +++++++------- What is the upstream status of all the patches? Most of the other patches look like they could be applicable for upstream, can you send them? Also, patch 4 says: Patch is upstream: https://github.com/mono/mono/commit/40c171799b671718969ee28a02f92884d7fd181e so why is this one not removed? Could you mention that explicitly in the commit log? It would also be nice to rewrite patch 6 and 8 so they are upstreamable, but I can imagine that that's more complicated. Regards, Arnout [snip]
Dear Arnout Vandecappelle, 2017-08-11 12:00 GMT+02:00 Arnout Vandecappelle <arnout@mind.be>: > > > On 11-08-17 10:14, Angelo Compagnucci wrote: >> This patch bumps to mono 5.0.1.1 and updates the unit tests patch >> accordingly. >> >> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> >> --- >> .../0006-Remove-unit-tests-from-mono-compilation.patch | 14 +++++++------- > > What is the upstream status of all the patches? Most of the other patches look > like they could be applicable for upstream, can you send them? All upstremeable patches are already be sent. Mono has a really long release cycle and the patches, also if applied, are not released in stable branches immediately. > Also, patch 4 says: > > Patch is upstream: > > https://github.com/mono/mono/commit/40c171799b671718969ee28a02f92884d7fd181e > > so why is this one not removed? Could you mention that explicitly in the commit log? Cause the patch is present from the tag mono-5.4.0.135 (future release) the stable release is now at 5.0.1.1 . I usually do care to remove patches upstreamed. > It would also be nice to rewrite patch 6 and 8 so they are upstreamable, but I > can imagine that that's more complicated. Patch 8 is not upstremeable cause the way buildroot handles paths. Buildroot sets $(mono_libdir) to the full host path, instead mono here expects something related to the / of the target. For patch 6 I've not tried cause it's a bit of a corner case: running mono unit-tests during compilation is not advisable cause it takes time but also cause they expects a certain environment that buildroot screws up. To make the unit-tests running in buildroot mono should be patched, but I originally though it was not necessary. > > Regards, > Arnout > > > [snip] > > -- > Arnout Vandecappelle arnout at mind be > Senior Embedded Software Architect +32-16-286500 > Essensium/Mind http://www.mind.be > G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven > LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle > GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
On 11-08-17 12:57, Angelo Compagnucci wrote: > Dear Arnout Vandecappelle, > > 2017-08-11 12:00 GMT+02:00 Arnout Vandecappelle <arnout@mind.be>: >> >> >> On 11-08-17 10:14, Angelo Compagnucci wrote: >>> This patch bumps to mono 5.0.1.1 and updates the unit tests patch >>> accordingly. >>> >>> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> >>> --- >>> .../0006-Remove-unit-tests-from-mono-compilation.patch | 14 +++++++------- >> >> What is the upstream status of all the patches? Most of the other patches look >> like they could be applicable for upstream, can you send them? > > All upstremeable patches are already be sent. Mono has a really long > release cycle and the patches, also if applied, are not released in > stable branches immediately. OK, thanks for the info. > >> Also, patch 4 says: >> >> Patch is upstream: >> >> https://github.com/mono/mono/commit/40c171799b671718969ee28a02f92884d7fd181e >> >> so why is this one not removed? Could you mention that explicitly in the commit log? > > Cause the patch is present from the tag mono-5.4.0.135 (future > release) the stable release is now at 5.0.1.1 . Wow, they look far into the future apparently... > I usually do care to remove patches upstreamed. > >> It would also be nice to rewrite patch 6 and 8 so they are upstreamable, but I >> can imagine that that's more complicated. > > Patch 8 is not upstremeable cause the way buildroot handles paths. > Buildroot sets $(mono_libdir) to the full host path, instead mono here > expects something related to the / of the target. > > For patch 6 I've not tried cause it's a bit of a corner case: running > mono unit-tests during compilation is not advisable cause it takes > time but also cause they expects a certain environment that buildroot > screws up. To make the unit-tests running in buildroot mono should be > patched, but I originally though it was not necessary. Understood! By the way, I took a look now in more detail at how we build mono, and you really solved that complicated build system very elegantly. Thanks for keeping mono up to date! Regards, Arnout
diff --git a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch index 6adbd81..a3e88e7 100644 --- a/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch +++ b/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch @@ -1,6 +1,6 @@ -From 357bea890354acda52aa6dfaec7fa232fa0b8208 Mon Sep 17 00:00:00 2001 +From 26e31fc54af591bdd88d6a4a79b7fa91c57f4b0c Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci <angelo.compagnucci@gmail.com> -Date: Tue, 23 May 2017 11:19:58 +0200 +Date: Thu, 10 Aug 2017 23:30:05 +0200 Subject: [PATCH] Remove unit-tests from mono compilation This patch fixes compiling errors with unit-tests under linux. @@ -15,15 +15,15 @@ index 8c9c2cb..7af36ec 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am @@ -34,7 +34,7 @@ monotouch-do-clean: - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ done; else --SUBDIRS = $(btls_dirs) arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+SUBDIRS = $(btls_dirs) arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler +-SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler endif endif --DIST_SUBDIRS = btls arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+DIST_SUBDIRS = btls arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler +-DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler ++DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler -- 2.7.4 diff --git a/package/mono/mono.hash b/package/mono/mono.hash index 89b8ed0..5d14a52 100644 --- a/package/mono/mono.hash +++ b/package/mono/mono.hash @@ -1,2 +1,2 @@ # sha256 locally computed -sha256 18cb38a670e51609c36c687ed90ad42cfedabeffd0a2dc5f7f0c46249eb8dbef mono-4.8.1.0.tar.bz2 +sha256 48d6ae71d593cd01bf0f499de569359d45856cda325575e1bacb5fabaa7e9718 mono-5.0.1.1.tar.bz2 diff --git a/package/mono/mono.mk b/package/mono/mono.mk index 0fafc97..e1f16b4 100644 --- a/package/mono/mono.mk +++ b/package/mono/mono.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONO_VERSION = 4.8.1.0 +MONO_VERSION = 5.0.1.1 MONO_SITE = http://download.mono-project.com/sources/mono MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial
This patch bumps to mono 5.0.1.1 and updates the unit tests patch accordingly. Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com> --- .../0006-Remove-unit-tests-from-mono-compilation.patch | 14 +++++++------- package/mono/mono.hash | 2 +- package/mono/mono.mk | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)