Merge branch 'dockcross:master' into update_openssh

Merge pull request #573 from bensuperpc/update-web-wasm
Update emscripten to 2.0.29
2025-06-17 16:39:25 +02:00 · 2021-09-01 01:58:25 +02:00 · 2021-09-01 01:57:22 +02:00 · 2021-08-31 22:19:41 +02:00 · 2021-08-31 22:00:48 +02:00 · 2021-08-31 08:17:39 +02:00
6 changed files with 23 additions and 13 deletions
--- a/imagefiles/build-and-install-openssh.sh
+++ b/imagefiles/build-and-install-openssh.sh
@ -2,7 +2,7 @@

 set -ex

-OPENSSH_ROOT=V_8_5_P1
+OPENSSH_ROOT=V_8_7_P1

 cd /usr/src
 curl --connect-timeout 20 \
--- a/linux-arm64-full/Dockerfile.in
+++ b/linux-arm64-full/Dockerfile.in
@ -3,8 +3,8 @@ FROM dockcross/base:latest
 # This is for 64-bit ARM Linux machine

 # Buildroot version
-# crosstool-ng master 2021-08-21
-ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
+# buildroot master 2021-08-30
+ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1

 #include "common.buildroot"

--- a/linux-arm64-full/buildroot.config
+++ b/linux-arm64-full/buildroot.config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
+# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_9=y
@ -186,6 +186,7 @@ BR2_SSP_NONE=y
 BR2_RELRO_NONE=y
 # BR2_RELRO_PARTIAL is not set
 # BR2_RELRO_FULL is not set
+BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
 BR2_FORTIFY_SOURCE_NONE=y
 # BR2_FORTIFY_SOURCE_1 is not set
 # BR2_FORTIFY_SOURCE_2 is not set
@ -961,6 +962,10 @@ BR2_PACKAGE_SDL2=y
 # KMS/DRM video driver needs libdrm
 #

+#
+# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
+#
+
 #
 # OpenGL support needs X11 and an OpenGL provider
 #
@ -2199,7 +2204,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
 BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LAPACK is not set
 BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
-# BR2_PACKAGE_LIBABSEIL_CPP is not set
+BR2_PACKAGE_LIBABSEIL_CPP=y
 # BR2_PACKAGE_LIBARGTABLE2 is not set
 BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBATOMIC_OPS is not set
@ -2306,7 +2311,7 @@ BR2_PACKAGE_PROTOBUF=y
 #
 # BR2_PACKAGE_AUGEAS is not set
 # BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_FMT is not set
+BR2_PACKAGE_FMT=y
 # BR2_PACKAGE_FSTRCMP is not set
 # BR2_PACKAGE_ICU is not set
 # BR2_PACKAGE_INIH is not set
--- a/linux-x86_64-full/Dockerfile.in
+++ b/linux-x86_64-full/Dockerfile.in
@ -3,8 +3,8 @@ FROM dockcross/base:latest
 # This is for 64-bit x86 Linux machine

 # Buildroot version
-# crosstool-ng master 2021-08-21
-ENV BR_VERSION 181a5e229b347c1996eeca7d7727ee66bc566f01
+# buildroot master 2021-08-30
+ENV BR_VERSION 2990d7dcb163a5618100a6985726b6820457a6d1

 #include "common.buildroot"

--- a/linux-x86_64-full/buildroot.config
+++ b/linux-x86_64-full/buildroot.config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Buildroot 2021.08-rc2-29-gdbe3af5532 Configuration
+# Buildroot 2021.08-rc2-75-g2990d7dcb1 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 BR2_HOST_GCC_AT_LEAST_4_9=y
@ -147,6 +147,7 @@ BR2_SSP_NONE=y
 BR2_RELRO_NONE=y
 # BR2_RELRO_PARTIAL is not set
 # BR2_RELRO_FULL is not set
+BR2_FORTIFY_SOURCE_ARCH_SUPPORTS=y
 BR2_FORTIFY_SOURCE_NONE=y
 # BR2_FORTIFY_SOURCE_1 is not set
 # BR2_FORTIFY_SOURCE_2 is not set
@ -931,6 +932,10 @@ BR2_PACKAGE_SDL2=y
 # KMS/DRM video driver needs libdrm
 #

+#
+# KMS/DRM video driver needs an OpenGL EGL backend provided by mesa3d
+#
+
 #
 # OpenGL support needs X11 and an OpenGL provider
 #
@ -2176,7 +2181,7 @@ BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS=y
 BR2_PACKAGE_LAPACK_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LAPACK is not set
 BR2_PACKAGE_LIBABSEIL_CPP_ARCH_SUPPORTS=y
-# BR2_PACKAGE_LIBABSEIL_CPP is not set
+BR2_PACKAGE_LIBABSEIL_CPP=y
 # BR2_PACKAGE_LIBARGTABLE2 is not set
 BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS=y
 # BR2_PACKAGE_LIBATOMIC_OPS is not set
@ -2284,7 +2289,7 @@ BR2_PACKAGE_PROTOBUF=y
 #
 # BR2_PACKAGE_AUGEAS is not set
 # BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_FMT is not set
+BR2_PACKAGE_FMT=y
 # BR2_PACKAGE_FSTRCMP is not set
 # BR2_PACKAGE_ICU is not set
 # BR2_PACKAGE_INIH is not set
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.27
+FROM emscripten/emsdk:2.0.29
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python

 #include "common.docker"

-ENV EMSCRIPTEN_VERSION 2.0.27
+ENV EMSCRIPTEN_VERSION 2.0.29

 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \
Author	SHA1	Message	Date
Bensuperpc	22aed58e56	Merge branch 'dockcross:master' into update_openssh	2021-09-01 01:58:25 +02:00
Bensuperpc	b456e8a0fa	Merge pull request #573 from bensuperpc/update-web-wasm Update emscripten to 2.0.29	2021-09-01 01:57:22 +02:00
Bensuperpc	71d4c783b1	Update openSSH to V_8_7_P1 Update openSSH to V_8_7_P1 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-31 22:19:41 +02:00
Bensuperpc	7764b101d4	Update emscripten to 2.0.29 Update emscripten to 2.0.29 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-31 22:00:48 +02:00
Bensuperpc	61ca500abd	Merge pull request #572 from bensuperpc/Update_buildroot Update buildroot and add LIBABSEIL	2021-08-31 08:17:39 +02:00
Bensuperpc	ec4c1de0ba	Re-add LIBQUADMATH Re-add LIBQUADMATH Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-30 23:09:27 +02:00
Bensuperpc	519a6c8736	Add FMT Add FMT Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-30 20:35:09 +02:00
Bensuperpc	332bf7ad98	Update buildroot and add LIBABSEIL Update buildroot and add LIBABSEIL Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-30 20:28:39 +02:00