All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177
@ 2018-08-09 12:31 Angelo Compagnucci
  2018-08-09 12:31 ` [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture" Angelo Compagnucci
  2018-08-09 20:13 ` [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Thomas Petazzoni
  0 siblings, 2 replies; 7+ messages in thread
From: Angelo Compagnucci @ 2018-08-09 12:31 UTC (permalink / raw)
  To: buildroot

This patch bumps mono to version 5.14.0.177

Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
---
 package/mono/mono.hash         | 2 +-
 package/mono/mono.mk           | 2 +-
 package/monolite/monolite.hash | 2 +-
 package/monolite/monolite.mk   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/mono/mono.hash b/package/mono/mono.hash
index b4911a6..db7ce52 100644
--- a/package/mono/mono.hash
+++ b/package/mono/mono.hash
@@ -1,5 +1,5 @@
 # sha256 locally computed
-sha256 100d4ea7ac3e4a26740e0f284344272d6c5dcfef5c6e21e500d59b64814dcfbf  mono-5.12.0.301.tar.bz2
+sha256 d4f5fa2e8188d66fbc8054f4145711e45c1faa6d070e63600efab93d1d189498  mono-5.14.0.177.tar.bz2
 sha256 3b40a54878b5ac2767a764bd082f8772ab27c03b9da9c7328c4c4935725556f7  LICENSE
 sha256 fc488f3ec9f36856bea8cce5cdde1449176341ef93a3962b691970f8981799f4  mcs/COPYING
 sha256 2c3c3ef532828bcd42bb3127349625a25291ff5ae7e6f8d42e0fe9b5be836a99  external/Newtonsoft.Json/Tools/7-zip/copying.txt
diff --git a/package/mono/mono.mk b/package/mono/mono.mk
index bb851d5..62eaeaf 100644
--- a/package/mono/mono.mk
+++ b/package/mono/mono.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MONO_VERSION = 5.12.0.301
+MONO_VERSION = 5.14.0.177
 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
diff --git a/package/monolite/monolite.hash b/package/monolite/monolite.hash
index 77810a9..cf72916 100644
--- a/package/monolite/monolite.hash
+++ b/package/monolite/monolite.hash
@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256 fece21adc06118fa5d79d3621a5fc702ec354abf83be29a36f8718645a2dc058  monolite-linux-1051200002-latest.tar.gz
+sha256 bb4b3b12b9ff04b219ad00dcea78145475d756a1c22ad84e0db978a8eee8c654  monolite-linux-1051400005-latest.tar.gz
diff --git a/package/monolite/monolite.mk b/package/monolite/monolite.mk
index 4e1d548..2e1e54a 100644
--- a/package/monolite/monolite.mk
+++ b/package/monolite/monolite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MONOLITE_VERSION = 1051200002
+MONOLITE_VERSION = 1051400005
 MONOLITE_SITE = http://download.mono-project.com/monolite
 MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz
 MONOLITE_LICENSE = LGPL-2.0 or commercial
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture"
  2018-08-09 12:31 [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Angelo Compagnucci
@ 2018-08-09 12:31 ` Angelo Compagnucci
  2018-08-09 20:15   ` Thomas Petazzoni
  2018-08-10 13:48   ` Thomas Petazzoni
  2018-08-09 20:13 ` [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Thomas Petazzoni
  1 sibling, 2 replies; 7+ messages in thread
From: Angelo Compagnucci @ 2018-08-09 12:31 UTC (permalink / raw)
  To: buildroot

This reverts commit 0f96073561badde3c7abdf338abca7d00dba56dd cause the
newly released mono version (5.14.0.177) fixed the bug upstream.

Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
---
 package/mono/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/mono/Config.in b/package/mono/Config.in
index a375a98..63208fe 100644
--- a/package/mono/Config.in
+++ b/package/mono/Config.in
@@ -5,8 +5,8 @@ config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 
 config BR2_PACKAGE_MONO_ARCH_SUPPORTS
 	bool
-	default y if (BR2_arm || BR2_armeb || BR2_i386 || \
-		      BR2_powerpc || BR2_x86_64)
+	default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
+		      BR2_mipsel || BR2_powerpc || BR2_x86_64)
 	depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 
 config BR2_PACKAGE_MONO
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177
  2018-08-09 12:31 [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Angelo Compagnucci
  2018-08-09 12:31 ` [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture" Angelo Compagnucci
@ 2018-08-09 20:13 ` Thomas Petazzoni
  1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2018-08-09 20:13 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu,  9 Aug 2018 14:31:26 +0200, Angelo Compagnucci wrote:
> This patch bumps mono to version 5.14.0.177
> 
> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
> ---
>  package/mono/mono.hash         | 2 +-
>  package/mono/mono.mk           | 2 +-
>  package/monolite/monolite.hash | 2 +-
>  package/monolite/monolite.mk   | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture"
  2018-08-09 12:31 ` [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture" Angelo Compagnucci
@ 2018-08-09 20:15   ` Thomas Petazzoni
  2018-08-09 21:18     ` Peter Korsgaard
  2018-08-10 13:48   ` Thomas Petazzoni
  1 sibling, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2018-08-09 20:15 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu,  9 Aug 2018 14:31:27 +0200, Angelo Compagnucci wrote:
> This reverts commit 0f96073561badde3c7abdf338abca7d00dba56dd cause the
> newly released mono version (5.14.0.177) fixed the bug upstream.
> 
> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>

I can't apply this one right now, because disabling Mono on MIPS was
done on master after 2018.08-rc1 was tagged, and the next branch is
based on 2018.08-rc1.

I'm not sure if Peter prefers:

 - that we wait until 2018.08 is released to merge back next into
   master before applying this patch

 - that we cherry-pick just
   0f96073561badde3c7abdf338abca7d00dba56dd from master to next and
   then apply your patch to next

 - that we merge master into next right now and apply your patch

Peter ?

I don't like option (1) because it leaves a patch waiting in patchwork.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture"
  2018-08-09 20:15   ` Thomas Petazzoni
@ 2018-08-09 21:18     ` Peter Korsgaard
  2018-08-09 21:38       ` Thomas Petazzoni
  0 siblings, 1 reply; 7+ messages in thread
From: Peter Korsgaard @ 2018-08-09 21:18 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > Hello,
 > On Thu,  9 Aug 2018 14:31:27 +0200, Angelo Compagnucci wrote:
 >> This reverts commit 0f96073561badde3c7abdf338abca7d00dba56dd cause the
 >> newly released mono version (5.14.0.177) fixed the bug upstream.
 >> 
 >> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>

 > I can't apply this one right now, because disabling Mono on MIPS was
 > done on master after 2018.08-rc1 was tagged, and the next branch is
 > based on 2018.08-rc1.

 > I'm not sure if Peter prefers:

 >  - that we wait until 2018.08 is released to merge back next into
 >    master before applying this patch

 >  - that we cherry-pick just
 >    0f96073561badde3c7abdf338abca7d00dba56dd from master to next and
 >    then apply your patch to next

 >  - that we merge master into next right now and apply your patch

 > Peter ?

 > I don't like option (1) because it leaves a patch waiting in patchwork.

I guess option 2 should be fine and not really cause any issues when
merging next into master, right?

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture"
  2018-08-09 21:18     ` Peter Korsgaard
@ 2018-08-09 21:38       ` Thomas Petazzoni
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2018-08-09 21:38 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu, 09 Aug 2018 23:18:51 +0200, Peter Korsgaard wrote:

>  > I'm not sure if Peter prefers:  
> 
>  >  - that we wait until 2018.08 is released to merge back next into
>  >    master before applying this patch  
> 
>  >  - that we cherry-pick just
>  >    0f96073561badde3c7abdf338abca7d00dba56dd from master to next and
>  >    then apply your patch to next  
> 
>  >  - that we merge master into next right now and apply your patch  
> 
>  > Peter ?  
> 
>  > I don't like option (1) because it leaves a patch waiting in patchwork.  
> 
> I guess option 2 should be fine and not really cause any issues when
> merging next into master, right?

I guess during the merge, Git will notice that the commit has already
been cherry-picked, and will simply skip it.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture"
  2018-08-09 12:31 ` [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture" Angelo Compagnucci
  2018-08-09 20:15   ` Thomas Petazzoni
@ 2018-08-10 13:48   ` Thomas Petazzoni
  1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2018-08-10 13:48 UTC (permalink / raw)
  To: buildroot

Hello,

On Thu,  9 Aug 2018 14:31:27 +0200, Angelo Compagnucci wrote:
> This reverts commit 0f96073561badde3c7abdf338abca7d00dba56dd cause the
> newly released mono version (5.14.0.177) fixed the bug upstream.
> 
> Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
> ---
>  package/mono/Config.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2018-08-10 13:48 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-09 12:31 [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Angelo Compagnucci
2018-08-09 12:31 ` [Buildroot] [PATCH 2/2] Revert "package/mono: remove target mips architecture" Angelo Compagnucci
2018-08-09 20:15   ` Thomas Petazzoni
2018-08-09 21:18     ` Peter Korsgaard
2018-08-09 21:38       ` Thomas Petazzoni
2018-08-10 13:48   ` Thomas Petazzoni
2018-08-09 20:13 ` [Buildroot] [PATCH 1/2] package/mono: bump to version 5.14.0.177 Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.