Merge remote-tracking branch 'origin/master' into uptate_cmake

Merge pull request #546 from bensuperpc/fix_manylinux2014
Fix manylinux2014x86 and manylinux2014x64, update to devtoolset-10
2025-06-20 09:54:28 +02:00 · 2021-08-07 00:59:45 +02:00 · 2021-08-07 00:58:43 +02:00 · 2021-08-06 22:54:32 +02:00 · 2021-08-06 20:26:56 +02:00 · 2021-08-06 20:23:31 +02:00
2 changed files with 8 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -149,7 +149,13 @@ Linux armv5 cross compiler toolchain using
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6)
-Linux ARMv6 cross compiler toolchain for the Raspberry Pi, etc.
+Linux ARMv6 cross compiler toolchain for the Raspberry Pi
 ### dockcross/linux-armv6-lts
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6-lts/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6-lts/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6-lts)
 Linux ARMv6 cross compiler toolchain for the Raspberry Pi (Debian buster...)
 ### dockcross/linux-armv6-musl
--- a/common/common.docker
+++ b/common/common.docker
@ -1,7 +1,7 @@
 WORKDIR /usr/src
 ARG GIT_VERSION=2.32.0
-ARG CMAKE_VERSION=3.20.5
+ARG CMAKE_VERSION=3.21.1
 # Image build scripts
 COPY \
Author	SHA1	Message	Date
Bensuperpc	e5ed0f45e6	Merge remote-tracking branch 'origin/master' into uptate_cmake	2021-08-07 00:59:45 +02:00
Bensuperpc	d2fb4755f0	Merge pull request #546 from bensuperpc/fix_manylinux2014 Fix manylinux2014x86 and manylinux2014x64, update to devtoolset-10	2021-08-07 00:58:43 +02:00
Bensuperpc	ea2c1635ff	Update CMake to 3.21.1 Update CMake to 3.21.1 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 22:54:32 +02:00
Bensuperpc	aa4bcf4a34	Merge pull request #545 from bensuperpc/update_readme-armv6 Add linux-armv6-lts in Readme	2021-08-06 20:26:56 +02:00
Bensuperpc	7ec0eaa3c9	Add linux-armv6-lts in Readme Add linux-armv6-lts in Readme Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 20:23:31 +02:00