rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buidlroot version to 2018.02.6

Browse Source
This commit is contained in:
jbnadal
2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bsp/buildroot/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch
View File

@@ -1,6 +1,6 @@
From 155f96953d1b898f04a4e708c9ebc1e450b2f63e 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, 24 Nov 2015 23:11:10 +0100
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.
@@ -11,19 +11,19 @@ Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mono/Makefile.am b/mono/Makefile.am
index ef41dfe..7129507 100644
index 8c9c2cb..7af36ec 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -30,7 +30,7 @@ monotouch-do-clean:
@@ -34,7 +34,7 @@ monotouch-do-clean:
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
else
-SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
+SUBDIRS = 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 = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
+DIST_SUBDIRS = 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
--
1.9.1
2.7.4

29
bsp/buildroot/package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch
View File

@@ -1,29 +0,0 @@
From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Date: Thu, 25 Feb 2016 22:19:31 +0100
Subject: [PATCH] mcs/class/monodoc/Makefile: Fixing wrong monodoc search path
mono_libdir actually leaks host compiler path, fixing
by hardcoding correct path for our usecase.
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
mcs/class/monodoc/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
index 3ebba80..ddc2098 100644
--- a/mcs/class/monodoc/Makefile
+++ b/mcs/class/monodoc/Makefile
@@ -135,7 +135,7 @@ test-local: setup-doc-sources
dist-local: Monodoc.Ecma/EcmaUrlParser.cs
$(the_lib).config: Makefile monodoc.dll.config.in
- sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
+ sed 's,@monodoc_refdir@,/usr/lib/monodoc,g' monodoc.dll.config.in > $@
Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs jay.sh
$(topdir)/$(thisdir)/jay.sh $(topdir) $< $@ $(JAY_FLAGS)
--
1.9.1

44
bsp/buildroot/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch
View File

@@ -1,44 +0,0 @@
From 63f0b0246b8125ae48b15bd182bb5831be02e6c9 Mon Sep 17 00:00:00 2001
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
Date: Mon, 27 Jun 2016 21:32:11 +0200
Subject: [PATCH] fix musl incorrect sigcontext include
On musl __GLIBC__ is not defined, so the conditional logic will
not produce correct result. Add a specific case to handle when
__GLIBC__ is not defined.
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
libgc/os_dep.c | 2 +-
mono/mini/exceptions-arm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgc/os_dep.c b/libgc/os_dep.c
index 8c8e098..34859c1 100644
--- a/libgc/os_dep.c
+++ b/libgc/os_dep.c
@@ -32,7 +32,7 @@
/* prototypes, so we have to include the top-level sigcontext.h to */
/* make sure the former gets defined to be the latter if appropriate. */
# include <features.h>
-# if 2 <= __GLIBC__
+# if 2 <= __GLIBC__ || !defined(__GLIBC__)
# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
/* glibc 2.1 no longer has sigcontext.h. But signal.h */
/* has the right declaration for glibc 2.1. */
diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c
index b036aa7..a3e2164 100644
--- a/mono/mini/exceptions-arm.c
+++ b/mono/mini/exceptions-arm.c
@@ -14,7 +14,7 @@
#include <string.h>
#ifndef MONO_CROSS_COMPILE
-#ifdef HAVE_ASM_SIGCONTEXT_H
+#if defined(HAVE_ASM_SIGCONTEXT_H) && defined(__GLIBC__)
#include <asm/sigcontext.h>
#endif /* def HAVE_ASM_SIGCONTEXT_H */
#endif
--
1.9.1

6
bsp/buildroot/package/mono/Config.in
View File

@@ -1,5 +1,11 @@
config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
bool
default y if BR2_HOSTARCH = "x86_64"
default y if BR2_HOSTARCH = "x86"
config BR2_PACKAGE_MONO_ARCH_SUPPORTS
bool
depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
BR2_mipsel || BR2_powerpc || BR2_x86_64)

2
bsp/buildroot/package/mono/mono.hash
View File

@@ -1,2 +1,2 @@
# sha256 locally computed
sha256 8965d107f4ebf4583ba1b50e0dcad39f0dc6adac8df7a083e9c5879ad93c0ea4 mono-4.6.2.16.tar.bz2
sha256 2a2f5c2a214a9980c086ac7561a5dd106f13d823a630de218eabafe1d995c5b4 mono-5.4.0.201.tar.bz2

18
bsp/buildroot/package/mono/mono.mk
View File

@@ -4,10 +4,10 @@
#
################################################################################
MONO_VERSION = 4.6.2.16
MONO_VERSION = 5.4.0.201
MONO_SITE = http://download.mono-project.com/sources/mono
MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
MONO_LICENSE = GPLv2 or MIT (compiler, tools), MIT (libs) or commercial
MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial
MONO_LICENSE_FILES = LICENSE mcs/COPYING eglib/COPYING \
external/Newtonsoft.Json/Tools/7-zip/copying.txt
MONO_INSTALL_STAGING = YES
@@ -20,15 +20,16 @@ MONO_AUTORECONF = YES
# Disable managed code (mcs folder) from building
MONO_CONF_OPTS = --with-mcs-docs=no \
--with-ikvm-native=no \
--enable-minimal=profiler,debug \
--enable-minimal=profiler,debug,aot \
--disable-mcs-build \
--enable-static
--enable-static \
--disable-btls
# The libraries have been built by the host-mono build. Since they are
# architecture-independent, we simply copy them to the target.
define MONO_INSTALL_LIBS
rsync -av --exclude=*.so --exclude=*.mdb \
$(HOST_DIR)/usr/lib/mono $(TARGET_DIR)/usr/lib/
$(HOST_DIR)/lib/mono $(TARGET_DIR)/usr/lib/
endef
MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS
@@ -44,8 +45,9 @@ MONO_DEPENDENCIES += host-mono
HOST_MONO_CONF_OPTS = --with-mcs-docs=no \
--disable-libraries \
--with-ikvm-native=no \
--enable-minimal=profiler,debug \
--enable-static
--enable-minimal=profiler,debug,aot \
--enable-static \
--disable-btls
# ensure monolite is used
HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false
@@ -54,7 +56,7 @@ HOST_MONO_DEPENDENCIES = host-monolite host-gettext
define HOST_MONO_SETUP_MONOLITE
rm -rf $(@D)/mcs/class/lib/monolite
(cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/usr/lib/monolite monolite)
(cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/lib/monolite monolite)
endef
HOST_MONO_POST_CONFIGURE_HOOKS += HOST_MONO_SETUP_MONOLITE