Removed arm32v7 support,

too much hassle to maintain

.gitlab-ci.yml

@@ -56,10 +56,6 @@ build:images:arm64v8:
   extends: '.build:images:cross'
   variables: {ARCH: 'arm64v8'}
 
-build:images:arm32v7:
-  extends: '.build:images:cross'
-  variables: {ARCH: 'arm32v7'}
-
 .push:images:cross:
   stage: 'push:images'
   only: [*regex_version]
@@ -79,14 +75,9 @@ push:images:arm64v8:
   dependencies: ['build:images:arm64v8']
   variables: {ARCH: 'arm64v8'}
 
-push:images:arm32v7:
-  extends: '.push:images:cross'
-  dependencies: ['build:images:arm32v7']
-  variables: {ARCH: 'arm32v7'}
-
 push:manifests:cross:
   stage: 'push:manifests'
-  dependencies: ['push:images:amd64', 'push:images:arm64v8', 'push:images:arm32v7']
+  dependencies: ['push:images:amd64', 'push:images:arm64v8']
   only: [*regex_version]
   variables:
     DOCKER_CLI_EXPERIMENTAL: 'enabled'

Dockerfile.m4

@@ -24,6 +24,7 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 		devscripts \
 		dpkg-dev \
 		flex \
+		cmake \
 		git \
 		intltool \
 		libegl1-mesa-dev \
@@ -70,19 +71,6 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
 ]])m4_dnl
 	&& apt-get clean
 
-# Build CMake with "_FILE_OFFSET_BITS=64"
-# (as a workaround for: https://gitlab.kitware.com/cmake/cmake/-/issues/20568)
-WORKDIR /tmp/
-RUN DEBIAN_FRONTEND=noninteractive apt-get build-dep -y cmake
-RUN apt-get source cmake && mv ./cmake-*/ ./cmake/
-WORKDIR /tmp/cmake/
-RUN DEB_BUILD_PROFILES='stage1' \
-	DEB_BUILD_OPTIONS='parallel=auto nocheck' \
-	DEB_CFLAGS_SET='-D _FILE_OFFSET_BITS=64' \
-	DEB_CXXFLAGS_SET='-D _FILE_OFFSET_BITS=64' \
-	debuild -b -uc -us
-RUN dpkg -i /tmp/cmake_*.deb /tmp/cmake-data_*.deb
-
 # Build libjpeg-turbo
 ARG LIBJPEG_TURBO_TREEISH=2.0.5
 ARG LIBJPEG_TURBO_REMOTE=https://github.com/libjpeg-turbo/libjpeg-turbo.git

Makefile

@@ -32,9 +32,6 @@ IMAGE_AMD64_TARBALL := $(DISTDIR)/$(IMAGE_PROJECT).amd64.tzst
 IMAGE_ARM64V8_DOCKERFILE := $(DISTDIR)/Dockerfile.arm64v8
 IMAGE_ARM64V8_TARBALL := $(DISTDIR)/$(IMAGE_PROJECT).arm64v8.tzst
 
-IMAGE_ARM32V7_DOCKERFILE := $(DISTDIR)/Dockerfile.arm32v7
-IMAGE_ARM32V7_TARBALL := $(DISTDIR)/$(IMAGE_PROJECT).arm32v7.tzst
-
 ##################################################
 ## "all" target
 ##################################################
@@ -61,7 +58,7 @@ $(IMAGE_NATIVE_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
 		--file '$@' ./
 
 .PHONY: build-cross-images
-build-cross-images: build-amd64-image build-arm64v8-image build-arm32v7-image
+build-cross-images: build-amd64-image build-arm64v8-image
 
 .PHONY: build-amd64-image
 build-amd64-image: $(IMAGE_AMD64_DOCKERFILE)
@@ -94,21 +91,6 @@ $(IMAGE_ARM64V8_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
 		--tag '$(IMAGE_NAME):latest-arm64v8' \
 		--file '$@' ./
 
-.PHONY: build-arm32v7-image
-build-arm32v7-image: $(IMAGE_ARM32V7_DOCKERFILE)
-
-$(IMAGE_ARM32V7_DOCKERFILE): $(DOCKERFILE_TEMPLATE)
-	mkdir -p '$(DISTDIR)'
-	'$(M4)' \
-		--prefix-builtins \
-		-D CROSS_ARCH=arm32v7 \
-		-D CROSS_QEMU=/usr/bin/qemu-arm-static \
-		'$(DOCKERFILE_TEMPLATE)' | cat --squeeze-blank > '$@'
-	'$(DOCKER)' build $(IMAGE_BUILD_OPTS) \
-		--tag '$(IMAGE_NAME):$(IMAGE_VERSION)-arm32v7' \
-		--tag '$(IMAGE_NAME):latest-arm32v7' \
-		--file '$@' ./
-
 ##################################################
 ## "save-*" targets
 ##################################################
@@ -124,7 +106,7 @@ $(IMAGE_NATIVE_TARBALL): $(IMAGE_NATIVE_DOCKERFILE)
 	$(call save_image,$(IMAGE_NAME):$(IMAGE_VERSION),$@)
 
 .PHONY: save-cross-images
-save-cross-images: save-amd64-image save-arm64v8-image save-arm32v7-image
+save-cross-images: save-amd64-image save-arm64v8-image
 
 .PHONY: save-amd64-image
 save-amd64-image: $(IMAGE_AMD64_TARBALL)
@@ -138,12 +120,6 @@ save-arm64v8-image: $(IMAGE_ARM64V8_TARBALL)
 $(IMAGE_ARM64V8_TARBALL): $(IMAGE_ARM64V8_DOCKERFILE)
 	$(call save_image,$(IMAGE_NAME):$(IMAGE_VERSION)-arm64v8,$@)
 
-.PHONY: save-arm32v7-image
-save-arm32v7-image: $(IMAGE_ARM32V7_TARBALL)
-
-$(IMAGE_ARM32V7_TARBALL): $(IMAGE_ARM32V7_DOCKERFILE)
-	$(call save_image,$(IMAGE_NAME):$(IMAGE_VERSION)-arm32v7,$@)
-
 ##################################################
 ## "load-*" targets
 ##################################################
@@ -162,7 +138,7 @@ load-native-image:
 	$(call tag_image,$(IMAGE_NAME):$(IMAGE_VERSION),$(IMAGE_NAME):latest)
 
 .PHONY: load-cross-images
-load-cross-images: load-amd64-image load-arm64v8-image load-arm32v7-image
+load-cross-images: load-amd64-image load-arm64v8-image
 
 .PHONY: load-amd64-image
 load-amd64-image:
@@ -174,11 +150,6 @@ load-arm64v8-image:
 	$(call load_image,$(IMAGE_ARM64V8_TARBALL))
 	$(call tag_image,$(IMAGE_NAME):$(IMAGE_VERSION)-arm64v8,$(IMAGE_NAME):latest-arm64v8)
 
-.PHONY: load-arm32v7-image
-load-arm32v7-image:
-	$(call load_image,$(IMAGE_ARM32V7_TARBALL))
-	$(call tag_image,$(IMAGE_NAME):$(IMAGE_VERSION)-arm32v7,$(IMAGE_NAME):latest-arm32v7)
-
 ##################################################
 ## "push-*" targets
 ##################################################
@@ -188,10 +159,9 @@ define push_image
 endef
 
 define push_cross_manifest
-	'$(DOCKER)' manifest create --amend '$(1)' '$(2)-amd64' '$(2)-arm64v8' '$(2)-arm32v7'
+	'$(DOCKER)' manifest create --amend '$(1)' '$(2)-amd64' '$(2)-arm64v8'
 	'$(DOCKER)' manifest annotate '$(1)' '$(2)-amd64' --os linux --arch amd64
 	'$(DOCKER)' manifest annotate '$(1)' '$(2)-arm64v8' --os linux --arch arm64 --variant v8
-	'$(DOCKER)' manifest annotate '$(1)' '$(2)-arm32v7' --os linux --arch arm --variant v7
 	'$(DOCKER)' manifest push --purge '$(1)'
 endef
 
@@ -200,7 +170,7 @@ push-native-image:
 	@printf '%s\n' 'Unimplemented'
 
 .PHONY: push-cross-images
-push-cross-images: push-amd64-image push-arm64v8-image push-arm32v7-image
+push-cross-images: push-amd64-image push-arm64v8-image
 
 .PHONY: push-amd64-image
 push-amd64-image:
@@ -212,11 +182,6 @@ push-arm64v8-image:
 	$(call push_image,$(IMAGE_NAME):$(IMAGE_VERSION)-arm64v8)
 	$(call push_image,$(IMAGE_NAME):latest-arm64v8)
 
-.PHONY: push-arm32v7-image
-push-arm32v7-image:
-	$(call push_image,$(IMAGE_NAME):$(IMAGE_VERSION)-arm32v7)
-	$(call push_image,$(IMAGE_NAME):latest-arm32v7)
-
 push-cross-manifest:
 	$(call push_cross_manifest,$(IMAGE_NAME):$(IMAGE_VERSION),$(IMAGE_NAME):$(IMAGE_VERSION))
 	$(call push_cross_manifest,$(IMAGE_NAME):latest,$(IMAGE_NAME):latest)
@@ -255,6 +220,6 @@ version:
 
 .PHONY: clean
 clean:
-	rm -f '$(IMAGE_NATIVE_DOCKERFILE)' '$(IMAGE_AMD64_DOCKERFILE)' '$(IMAGE_ARM64V8_DOCKERFILE)' '$(IMAGE_ARM32V7_DOCKERFILE)'
+	rm -f '$(IMAGE_NATIVE_DOCKERFILE)' '$(IMAGE_AMD64_DOCKERFILE)' '$(IMAGE_ARM64V8_DOCKERFILE)'
-	rm -f '$(IMAGE_NATIVE_TARBALL)' '$(IMAGE_AMD64_TARBALL)' '$(IMAGE_ARM64V8_TARBALL)' '$(IMAGE_ARM32V7_TARBALL)'
+	rm -f '$(IMAGE_NATIVE_TARBALL)' '$(IMAGE_AMD64_TARBALL)' '$(IMAGE_ARM64V8_TARBALL)'
 	if [ -d '$(DISTDIR)' ] && [ -z "$$(ls -A '$(DISTDIR)')" ]; then rmdir '$(DISTDIR)'; fi