From a30e76d5cb5aa92c456b8c0f8a32d2118e7e6b2a Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Sun, 27 Jun 2021 17:31:24 +0200 Subject: [PATCH] Remove linux-mipsel and add linux-mips to CI Removed the linux-mipsel image, as it no longer works and is no longer supported: https://wiki.debian.org/EmdebianToolchain Add linux-mips image in the github workflow Signed-off-by: Bensuperpc --- .github/workflows/main.yml | 2 +- Makefile | 4 ++-- README.rst | 7 ------- linux-mipsel/Dockerfile.in | 40 ------------------------------------ linux-mipsel/Toolchain.cmake | 16 --------------- 5 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 linux-mipsel/Dockerfile.in delete mode 100644 linux-mipsel/Toolchain.cmake diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a7a9c5a..53c8806 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: strategy: fail-fast: false matrix: - arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-s390x, linux-x64, linux-x86, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86] + arch_name: [android-arm, android-arm64, android-x86, android-x86_64, web-wasm, linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, windows-static-x64, windows-static-x64-posix, windows-static-x86, windows-shared-x64, windows-shared-x64-posix, windows-shared-x86] steps: - uses: actions/checkout@v2 - uses: actions/download-artifact@v2 diff --git a/Makefile b/Makefile index 744c249..75e80d3 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,10 @@ ORG = dockcross BIN = ./bin # These images are built using the "build implicit rule" -STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix +STANDARD_IMAGES = linux-s390x android-arm android-arm64 android-x86 android-x86_64 linux-x86 linux-x64 linux-arm64 linux-arm64-musl linux-armv5 linux-armv5-musl linux-armv6 linux-armv6-musl linux-armv7 linux-armv7a linux-armv7l-musl linux-mips linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix # Generated Dockerfiles. -GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips linux-mipsel manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le +GEN_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-mips manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-x86 manylinux2014-aarch64 web-wasm linux-arm64 linux-arm64-musl windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix linux-armv7 linux-armv7a linux-armv7l-musl linux-armv6 linux-armv6-musl linux-armv5 linux-armv5-musl linux-ppc64le GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES)) # These images are expected to have explicit rules for *both* build and testing diff --git a/README.rst b/README.rst index 4c2c6fc..d81ee8e 100644 --- a/README.rst +++ b/README.rst @@ -187,13 +187,6 @@ dockcross/linux-armv7l-musl |linux-armv7l-musl-images| Toolchain configured for ARMv7-L, using `musl `_ as base "libc". -.. |linux-mipsel-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-mipsel.svg - :target: https://microbadger.com/images/dockcross/linux-mipsel - -dockcross/linux-mipsel - |linux-mipsel-images| Linux mipsel cross compiler toolchain for little endian MIPS GNU systems. - - .. |linux-mips-images| image:: https://images.microbadger.com/badges/image/dockcross/linux-mips.svg :target: https://microbadger.com/images/dockcross/linux-mips diff --git a/linux-mipsel/Dockerfile.in b/linux-mipsel/Dockerfile.in deleted file mode 100644 index b9a9ab3..0000000 --- a/linux-mipsel/Dockerfile.in +++ /dev/null @@ -1,40 +0,0 @@ -FROM dockcross/base:latest -MAINTAINER Sergi Alvarez "pancake@nopcode.org" - -# This is for ARMv5 "legacy" (mipsel) devices which do NOT support hard float -# VFP instructions (mipshf). - -# From https://wiki.debian.org/CrossToolchains, installing for jessie -RUN echo "deb http://emdebian.org/tools/debian/ jessie main" > /etc/apt/sources.list.d/emdebian.list \ -&& curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - \ -&& sed -i 's/httpredir.debian.org/http.debian.net/' /etc/apt/sources.list \ -&& dpkg --add-architecture mipsel \ -&& apt-get update && apt-get install -y crossbuild-essential-mipsel - -# The cross-compiling emulator -RUN apt-get update && apt-get install -y \ - qemu-user \ - qemu-user-static - -ENV CROSS_TRIPLE mipsel-linux-gnu -ENV CROSS_ROOT /usr/bin -ENV AS=${CROSS_ROOT}/${CROSS_TRIPLE}-as \ - AR=${CROSS_ROOT}/${CROSS_TRIPLE}-ar \ - CC=${CROSS_ROOT}/${CROSS_TRIPLE}-gcc \ - CPP=${CROSS_ROOT}/${CROSS_TRIPLE}-cpp-4.9 \ - CXX=${CROSS_ROOT}/${CROSS_TRIPLE}-g++ \ - LD=${CROSS_ROOT}/${CROSS_TRIPLE}-ld \ - FC=${CROSS_ROOT}/${CROSS_TRIPLE}-gfortran - -ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc -ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/" - -COPY Toolchain.cmake ${CROSS_ROOT}/ -ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake - -# Linux kernel cross compilation variables -ENV PATH ${PATH}:${CROSS_ROOT}/bin -ENV CROSS_COMPILE ${CROSS_TRIPLE}- -ENV ARCH mips - -#include "common.label-and-env" diff --git a/linux-mipsel/Toolchain.cmake b/linux-mipsel/Toolchain.cmake deleted file mode 100644 index 93f8129..0000000 --- a/linux-mipsel/Toolchain.cmake +++ /dev/null @@ -1,16 +0,0 @@ -set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR mipsel) - -set(cross_triple "mipsel-linux-gnu") - -set(CMAKE_C_COMPILER $ENV{CC}) -set(CMAKE_CXX_COMPILER $ENV{CXX}) -set(CMAKE_Fortran_COMPILER $ENV{FC}) - -set(CMAKE_FIND_ROOT_PATH $ENV{CROSS_ROOT} $ENV{CROSS_ROOT}/libc/usr) -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH) - -set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-mipsel)