Change 4 jobs build to automatic jobs build on linux-armv7a

Change 4 jobs build to automatic jobs build on linux-armv7a Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
FIx build fail on linux-armv7a image
2025-06-18 00:49:25 +02:00 · 2021-06-25 13:10:01 +02:00 · 2021-06-25 13:06:22 +02:00 · 2021-06-25 02:13:57 +02:00 · 2021-06-25 02:13:09 +02:00 · 2021-06-25 01:42:58 +02:00
8 changed files with 304 additions and 624 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -32,7 +32,7 @@ jobs:
        if: github.ref == 'refs/heads/master'
        run: |
            docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/base --all-tags
+            docker image push dockcross/base

  image:
    name: ${{ matrix.arch_name }}
@ -58,4 +58,4 @@ jobs:
        if: github.ref == 'refs/heads/master'
        run: |
            docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASS }}
-            docker image push dockcross/${{ matrix.arch_name }} --all-tags
+            docker image push dockcross/${{ matrix.arch_name }}
--- a/84
+++ b/84
@ -79,12 +79,18 @@ web-wasm: web-wasm/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	cp -r test web-wasm/
 	$(DOCKER) build -t $(ORG)/web-wasm:latest \
-		-t $(ORG)/web-wasm:$(TAG) \
 		--build-arg IMAGE=$(ORG)/web-wasm \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		web-wasm
+	$(DOCKER) build -t $(ORG)/web-wasm:$(TAG) \
+		--build-arg IMAGE=$(ORG)/web-wasm \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		web-wasm
 	rm -rf web-wasm/test
 	rm -rf $@/imagefiles

@ -100,12 +106,18 @@ web-wasm.test: web-wasm
 manylinux2014-aarch64: manylinux2014-aarch64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:latest \
-		-t $(ORG)/manylinux2014-aarch64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2014-aarch64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2014-aarch64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2014-aarch64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2014-aarch64/Dockerfile .
 	rm -rf $@/imagefiles

 manylinux2014-aarch64.test: manylinux2014-aarch64
@ -118,12 +130,18 @@ manylinux2014-aarch64.test: manylinux2014-aarch64
 manylinux2014-x64: manylinux2014-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-x64:latest \
-		-t $(ORG)/manylinux2014-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2014-x64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2014-x64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2014-x64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2014-x64/Dockerfile .
 	rm -rf $@/imagefiles

 manylinux2014-x64.test: manylinux2014-x64
@ -136,12 +154,18 @@ manylinux2014-x64.test: manylinux2014-x64
 manylinux2014-x86: manylinux2014-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2014-x86:latest \
-		-t $(ORG)/manylinux2014-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2014-x86/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2014-x86:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2014-x86 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2014-x86/Dockerfile .
 	rm -rf $@/imagefiles

 manylinux2014-x86.test: manylinux2014-x86
@ -155,12 +179,18 @@ manylinux2014-x86.test: manylinux2014-x86
 manylinux2010-x64: manylinux2010-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2010-x64:latest \
-		-t $(ORG)/manylinux2010-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2010-x64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2010-x64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2010-x64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2010-x64/Dockerfile .
 	rm -rf $@/imagefiles

 manylinux2010-x64.test: manylinux2010-x64
@ -174,12 +204,18 @@ manylinux2010-x64.test: manylinux2010-x64
 manylinux2010-x86: manylinux2010-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux2010-x86:latest \
-		-t $(ORG)/manylinux2010-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux2010-x86/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux2010-x86:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux2010-x86 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux2010-x86/Dockerfile .
 	rm -rf $@/imagefiles

 manylinux2010-x86.test: manylinux2010-x86
@ -193,12 +229,18 @@ manylinux2010-x86.test: manylinux2010-x86
 manylinux1-x64: manylinux1-x64/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux1-x64:latest \
-		-t $(ORG)/manylinux1-x64:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux1-x64 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux1-x64/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux1-x64:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux1-x64 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux1-x64/Dockerfile .
 	rm -rf $@/imagefiles

 manylinux1-x64.test: manylinux1-x64
@ -212,12 +254,18 @@ manylinux1-x64.test: manylinux1-x64
 manylinux1-x86: manylinux1-x86/Dockerfile
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/manylinux1-x86:latest \
-		-t $(ORG)/manylinux1-x86:$(TAG) \
 		--build-arg IMAGE=$(ORG)/manylinux1-x86 \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		-f manylinux1-x86/Dockerfile .
+	$(DOCKER) build -t $(ORG)/manylinux1-x86:$(TAG) \
+		--build-arg IMAGE=$(ORG)/manylinux1-x86 \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		-f manylinux1-x86/Dockerfile .
 	rm -rf $@/imagefiles

 manylinux1-x86.test: manylinux1-x86
@ -230,10 +278,14 @@ manylinux1-x86.test: manylinux1-x86

 base: Dockerfile imagefiles/
 	$(DOCKER) build -t $(ORG)/base:latest \
-		-t $(ORG)/base:$(TAG) \
 		--build-arg IMAGE=$(ORG)/base \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		.
+	$(DOCKER) build -t $(ORG)/base:$(TAG) \
+		--build-arg IMAGE=$(ORG)/base \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		.

 base.test: base
 	$(DOCKER) run $(RM) $(ORG)/base > $(BIN)/dockcross-base && chmod +x $(BIN)/dockcross-base
@ -253,12 +305,18 @@ $(VERBOSE).SILENT: display_images
 $(STANDARD_IMAGES): %: %/Dockerfile base
 	mkdir -p $@/imagefiles && cp -r imagefiles $@/
 	$(DOCKER) build -t $(ORG)/$@:latest \
-		-t $(ORG)/$@:$(TAG) \
 		--build-arg IMAGE=$(ORG)/$@ \
 		--build-arg VCS_REF=`git rev-parse --short HEAD` \
 		--build-arg VCS_URL=`git config --get remote.origin.url` \
 		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
 		$@
+	$(DOCKER) build -t $(ORG)/$@:$(TAG) \
+		--build-arg IMAGE=$(ORG)/$@ \
+		--build-arg VERSION=$(TAG) \
+		--build-arg VCS_REF=`git rev-parse --short HEAD` \
+		--build-arg VCS_URL=`git config --get remote.origin.url` \
+		--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
+		$@
 	rm -rf $@/imagefiles

 clean:
@ -266,12 +324,6 @@ clean:
 	for d in $(GEN_IMAGE_DOCKERFILES) ; do rm -f $$d/Dockerfile ; done
 	rm -f Dockerfile

-purge: clean
-# Remove all untagged images
-	$(DOCKER) container ls -aq | xargs --no-run-if-empty $(DOCKER) container rm -f
-# Remove all images with organization (ex dockcross/*)
-	$(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
-
 #
 # testing implicit rule
 #
--- a/common.crosstool
+++ b/common.crosstool
@ -21,10 +21,6 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
    help2man \
    python3-dev \
    texinfo \
-# Packages needed for crosstool-ng 1.24 or higher 
-    unzip \
-    libtool \
-    libtool-bin \
    && apt-get clean autoclean --yes \
    && apt-get autoremove --yes \
    && rm -rf /var/lib/{apt,dpkg,cache,log}/
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/Dockerfile.in
@ -2,24 +2,21 @@ FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Crosstool-ng version
-# We use a git commit while waiting for 1.25 to release (1.24 is several years old)
-ENV CT_VERSION 9e10cb6fbaab6d83e1305b2d53ab585d14989667
-
-ENV QEMU_VERSION 6.0.0
+ENV CT_VERSION crosstool-ng-1.23.0

 #include "common.crosstool"

-ENV CROSS_TRIPLE powerpc64le-unknown-linux-gnu
+ENV CROSS_TRIPLE powerpc64le-linux-gnu

 WORKDIR /usr/src

 RUN apt-get install -y libglib2.0-dev zlib1g-dev libpixman-1-dev && \
-  curl -L http://wiki.qemu-project.org/download/qemu-${QEMU_VERSION}.tar.bz2 | tar xj && \
-  cd qemu-${QEMU_VERSION} && \
+  curl -L http://wiki.qemu-project.org/download/qemu-3.1.0.tar.bz2 | tar xj && \
+  cd qemu-3.1.0 && \
  ./configure --target-list=ppc64le-linux-user --prefix=/usr && \
  make -j$(nproc) && \
  make install && \
-  cd .. && rm -rf qemu-${QEMU_VERSION}
+  cd .. && rm -rf qemu-3.1.0

 ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
@ -38,7 +35,7 @@ WORKDIR /work
 COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
 ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake

-ENV PKG_CONFIG_PATH /usr/lib/powerpc64le-unknown-linux-gnu/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/powerpc64le-linux-gnu/pkgconfig

 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
--- a/linux-ppc64le/Toolchain.cmake
+++ b/linux-ppc64le/Toolchain.cmake
@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR ppc64le)

-set(cross_triple "powerpc64le-unknown-linux-gnu")
+set(cross_triple "powerpc64le-linux-gnu")
 set(cross_root /usr/xcc/${cross_triple})

 set(CMAKE_C_COMPILER $ENV{CC})
--- a/linux-ppc64le/crosstool-ng.config
+++ b/linux-ppc64le/crosstool-ng.config
--- a/linux-ppc64le/sources.list
+++ b/linux-ppc64le/sources.list
@ -0,0 +1,10 @@
+#------------------------------------------------------------------------------#
+#                   OFFICIAL DEBIAN REPOS
+#------------------------------------------------------------------------------#
+
+###### Debian Main Repos
+deb http://deb.debian.org/debian/ oldstable main contrib non-free
+
+deb http://deb.debian.org/debian/ oldstable-updates main contrib non-free
+
+deb http://deb.debian.org/debian-security oldstable/updates main
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.24
+FROM emscripten/emsdk:2.0.22
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Revert back to "/bin/sh" as default shell
Author	SHA1	Message	Date
Bensuperpc	4e8f241f8b	Change 4 jobs build to automatic jobs build on linux-armv7a Change 4 jobs build to automatic jobs build on linux-armv7a Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-25 13:10:01 +02:00
Bensuperpc	fd1fa825b7	FIx build fail on linux-armv7a image Switch to GCC 7.3.0 non-linaro, update GLIBC to 2.27 ect... Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-25 13:06:22 +02:00
Bensuperpc	969dfa3b76	Remove manual workflow Remove manual workflow Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-25 02:13:57 +02:00
Bensuperpc	e774b93fdd	Fix build fail on manylinux2014-aarch64 Add patch with bash 5 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-25 02:13:09 +02:00
Bensuperpc	3e25903355	Fix build fail with ppc64le and s390x Upgrade to GCC 7.3.0, issues with GCC 6.3.0: https://github.com/crosstool-ng/crosstool-ng/issues/992 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-25 01:42:58 +02:00
Bensuperpc	c3e7c21317	Fix build fail with android ndk images Fix build fail with android ndk images Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-25 01:40:43 +02:00
Bensuperpc	202e4808b9	Upgrade to debian Buster and disable python builder script Upgrade to debian Buster slim (later to debian bullseye, crosstool-ng must be updated first, version 1.23 is not compatible with debian bullseye) Disable python script (build-and-install-python.sh), the version of python in the repositories is recent enough for crosstool-ng 1.24 and above. Changed from python to python3 for compatibility Adding the manual launch of a github workflow Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-06-24 22:57:41 +02:00