manibuilder: Stop build testing oldest, EOL targets
These old targets can't compile the complete flashprog code anymore.
As they are all EOL, just remove them. As a bonus, this also reduces
our quirk handling a lot.
Change-Id: I0c1d7914e5d2bcce508ea6b8ce3a82d909081975
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/274
diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita
index 73c7ea1..2a8146f 100644
--- a/util/manibuilder/Makefile.anita
+++ b/util/manibuilder/Makefile.anita
@@ -43,18 +43,6 @@
anita\:8.2-i386-build: QEMU_INSTALL_MEM=128M
anita\:8.2-i386-build: QEMU_RUNTIME_MEM=256M
-anita\:7.1-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All
-anita\:7.1-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/
-anita\:7.1-amd64-build: QEMU_DISK_SIZE=1G
-anita\:7.1-amd64-build: QEMU_INSTALL_MEM=192M
-anita\:7.1-amd64-build: QEMU_RUNTIME_MEM=512M
-
-anita\:7.1-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/7.1/All
-anita\:7.1-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/i386/
-anita\:7.1-i386-build: QEMU_DISK_SIZE=1G
-anita\:7.1-i386-build: QEMU_INSTALL_MEM=128M
-anita\:7.1-i386-build: QEMU_RUNTIME_MEM=256M
-
$(addsuffix -build,$(ANITA_TAGS)): %-build: Dockerfile.anita anita-wrapper.sh
$(QUIET_SETUP)docker build . -f $< -t mani/$* \
--build-arg PKG_PATH=$(PKGSRC_MIRROR)$(PKGSRC_PATH) \
@@ -80,15 +68,3 @@
# No libftdi1
$(ANITA_TAGS): MAKEARGS+=CONFIG_FT2232_SPI=no CONFIG_USBBLASTER_SPI=no
-
-# Compiler doesn't like simplified initializers, e.g. `= { 0 };`
-anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=WARNERROR=no
-
-# Missing pkg-config (container images can't be updated anymore)
-anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=HAS_LIBPCI=yes
-anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=CONFIG_LIBPCI_LDFLAGS='-L/usr/pkg/lib -lpciutils -lpci'
-anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=CONFIG_LIBPCI_CFLAGS=-I/usr/pkg/include/pciutils
-anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=HAS_LIBUSB1=yes
-anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=CONFIG_LIBUSB1_LDFLAGS='-L/usr/pkg/lib -lusb-1.0'
-anita\:7.1-i386 anita\:7.1-amd64: MAKEARGS+=CONFIG_LIBUSB1_CFLAGS=-I/usr/pkg/include/libusb-1.0
-anita\:7.1-i386 anita\:7.1-amd64: ENV_VARS+=LD_LIBRARY_PATH=/usr/pkg/lib
diff --git a/util/manibuilder/Makefile.env b/util/manibuilder/Makefile.env
index 7264bb5..001ec2d 100644
--- a/util/manibuilder/Makefile.env
+++ b/util/manibuilder/Makefile.env
@@ -1,5 +1,5 @@
# No ccache
-$(ALMALINUX_TAGS) $(filter centos\:%, $(MULTIARCH_TAGS)): CC=cc
+$(ALMALINUX_TAGS): CC=cc
# DJGPP is very special
djgpp\:6.1.0: ENV_VARS=CROSS_COMPILE=i586-pc-msdosdjgpp-
@@ -7,40 +7,33 @@
djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip
djgpp\:6.1.0: LIBS_BASE=../
djgpp\:6.1.0: MAKEARGS+=HAS_LIBPCI=yes CONFIG_LIBPCI_LDFLAGS=-lpci
-djgpp\:6.1.0: MAKEARGS+=strip
+djgpp\:6.1.0: MAKEARGS+=strip WARNERROR=no
djgpp\:6.1.0: MESONCMD=
-# Compiler doesn't like simplified initializers, e.g. `= { 0 };`
-$(filter centos\:%, $(MULTIARCH_TAGS)): MAKEARGS+=WARNERROR=no
-
# No libftdi1
NO_LIBFTDI1_TAGS := \
$(ALMALINUX_TAGS) \
- $(filter centos\:%, $(MULTIARCH_TAGS)) \
$(NO_LIBFTDI1_TAGS): MAKEARGS+=CONFIG_FT2232_SPI=no CONFIG_USBBLASTER_SPI=no
# No libgpiod
NO_LIBGPIOD_TAGS := \
$(filter %\:8, $(ALMALINUX_TAGS)) \
- $(filter centos\:% %-bionic %-xenial %-stretch, $(MULTIARCH_TAGS)) \
- $(foreach v, fedora\:24 fedora\:25, $(filter $(v)-%, $(MULTIARCH_TAGS))) \
- $(foreach v, v3.6 v3.7 v3.8 v3.9 v3.10, $(filter alpine\:%-$(v), $(MULTIARCH_TAGS))) \
+ $(foreach v, v3.8 v3.9 v3.10, $(filter alpine\:%-$(v), $(MULTIARCH_TAGS))) \
$(NO_LIBGPIOD_TAGS): MAKEARGS+=CONFIG_LINUX_GPIO_SPI=no
# No libjaylink
NO_LIBJAYLINK_TAGS := \
$(ALMALINUX_TAGS) \
- $(filter alpine\:% centos\:% %-xenial %-stretch, $(MULTIARCH_TAGS)) \
+ $(filter alpine\:%, $(MULTIARCH_TAGS)) \
$(NO_LIBJAYLINK_TAGS): MAKEARGS+=CONFIG_JLINK_SPI=no
# No compatible Meson
NO_MESON_TAGS := \
- $(filter anita\:7.%, $(ANITA_TAGS)) \
- $(filter centos\:% %-bionic %-xenial %-buster %-stretch, $(MULTIARCH_TAGS)) \
- $(foreach v, 24 25 29 30 31, $(filter fedora\:$(v)-%, $(MULTIARCH_TAGS))) \
- $(foreach v, 3.6 3.7 3.8 3.9 3.10 3.11, $(filter alpine\:%-v$(v), $(MULTIARCH_TAGS))) \
+ $(filter %-buster, $(MULTIARCH_TAGS)) \
+ $(foreach v, 29 30 31, $(filter fedora\:$(v)-%, $(MULTIARCH_TAGS))) \
+ $(foreach v, 3.8 3.9 3.10 3.11, $(filter alpine\:%-v$(v), $(MULTIARCH_TAGS))) \
$(NO_MESON_TAGS): MESONCMD=
diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets
index de164df..b463ba8 100644
--- a/util/manibuilder/Makefile.targets
+++ b/util/manibuilder/Makefile.targets
@@ -2,37 +2,27 @@
anita\:10.0-amd64 anita\:10.0-i386 \
anita\:9.3-amd64 anita\:9.3-i386 anita\:9.3-sparc64 \
anita\:8.2-amd64 anita\:8.2-i386 \
- anita\:7.1-amd64 anita\:7.1-i386 \
MULTIARCH_TAGS := \
- centos\:7.6-armhfp-clean centos\:7.6-amd64-clean \
- centos\:7.3-aarch64-clean centos\:7.3-amd64-clean \
- centos\:7.2-amd64-clean \
$(foreach a,x86_64 aarch64, \
- $(foreach v,34 33 32 31 30 29 25 24, \
- fedora\:$(v)-$(a))) \
- $(foreach a,ppc64le, \
- $(foreach v,34 33 29 25 24, \
- fedora\:$(v)-$(a))) \
- $(foreach a,s390x, \
$(foreach v,34 33 32 31 30 29, \
fedora\:$(v)-$(a))) \
- fedora\:28-armhfp \
+ $(foreach a,ppc64le, \
+ $(foreach v,34 33 29, \
+ fedora\:$(v)-$(a))) \
+ $(foreach a,s390x, \
+ $(foreach v,34 33 32 31 29, \
+ fedora\:$(v)-$(a))) \
$(foreach a,ppc64el armhf mipsel amd64 i386, \
- $(foreach v,bullseye buster stretch, \
+ $(foreach v,bullseye buster, \
debian-debootstrap\:$(a)-$(v))) \
$(foreach a,arm64 mips, \
- $(foreach v,buster stretch, \
- debian-debootstrap\:$(a)-$(v))) \
+ debian-debootstrap\:$(a)-buster) \
$(foreach a,ppc64el arm64 armhf amd64, \
- $(foreach v,jammy focal bionic xenial, \
+ $(foreach v,jammy focal, \
ubuntu-debootstrap\:$(a)-$(v))) \
- $(foreach a,i386, \
- $(foreach v,bionic xenial, \
- ubuntu-debootstrap\:$(a)-$(v))) \
- ubuntu-debootstrap\:powerpc-xenial \
$(foreach a,aarch64 armhf amd64 i386, \
- $(foreach v,v3.14 v3.13 v3.12 v3.11 v3.10 v3.9 v3.8 v3.7 v3.6, \
+ $(foreach v,v3.14 v3.13 v3.12 v3.11 v3.10 v3.9 v3.8, \
alpine\:$(a)-$(v))) \
ALMALINUX_TAGS := \
@@ -59,9 +49,7 @@
ALL_TAGS := $(ANITA_TAGS) $(MULTIARCH_TAGS) $(OFFICIAL_TAGS) $(OTHER_TAGS)
-BROKEN_TAGS := anita\:7.1-amd64 anita\:7.1-i386 \
- centos\:7.6-armhfp-clean \
- arm64v8/fedora\:35 fedora\:30-s390x fedora\:28-armhfp \
+BROKEN_TAGS := arm64v8/fedora\:35
WORKING_TAGS := $(filter-out $(BROKEN_TAGS),$(ALL_TAGS))
@@ -100,12 +88,6 @@
fedora\:34-ppc64le \
fedora\:34-s390x \
fedora\:34-x86_64 \
- centos\:7.6-amd64-clean \
- debian-debootstrap\:amd64-stretch \
- debian-debootstrap\:arm64-stretch \
- debian-debootstrap\:armhf-stretch \
- debian-debootstrap\:i386-stretch \
- debian-debootstrap\:mipsel-stretch \
debian-debootstrap\:amd64-buster \
debian-debootstrap\:arm64-buster \
debian-debootstrap\:armhf-buster \
@@ -118,9 +100,6 @@
debian-debootstrap\:i386-bullseye \
debian-debootstrap\:mipsel-bullseye \
debian-debootstrap\:ppc64el-bullseye \
- ubuntu-debootstrap\:amd64-bionic \
- ubuntu-debootstrap\:arm64-bionic \
- ubuntu-debootstrap\:i386-bionic \
ubuntu-debootstrap\:amd64-focal \
ubuntu-debootstrap\:arm64-focal \
ubuntu-debootstrap\:armhf-focal \