manibuilder: Drop old, unsupported Fedora and Alpine versions
Change-Id: I4f6e8df61118c80ae43cd1f918fcc5bc1f81e2d4
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/359
diff --git a/util/manibuilder/Makefile.env b/util/manibuilder/Makefile.env
index 001ec2d..18b953d 100644
--- a/util/manibuilder/Makefile.env
+++ b/util/manibuilder/Makefile.env
@@ -19,7 +19,6 @@
# No libgpiod
NO_LIBGPIOD_TAGS := \
$(filter %\:8, $(ALMALINUX_TAGS)) \
- $(foreach v, v3.8 v3.9 v3.10, $(filter alpine\:%-$(v), $(MULTIARCH_TAGS))) \
$(NO_LIBGPIOD_TAGS): MAKEARGS+=CONFIG_LINUX_GPIO_SPI=no
@@ -33,7 +32,5 @@
# No compatible Meson
NO_MESON_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 1a7ec9c..49f44a6 100644
--- a/util/manibuilder/Makefile.targets
+++ b/util/manibuilder/Makefile.targets
@@ -4,14 +4,8 @@
anita\:8.2-amd64 anita\:8.2-i386 \
MULTIARCH_TAGS := \
- $(foreach a,x86_64 aarch64, \
- $(foreach v,34 33 32 31 30 29, \
- fedora\:$(v)-$(a))) \
- $(foreach a,ppc64le, \
- $(foreach v,34 33 29, \
- fedora\:$(v)-$(a))) \
- $(foreach a,s390x, \
- $(foreach v,34 33 32 31 29, \
+ $(foreach a,x86_64 aarch64 ppc64le s390x, \
+ $(foreach v,34 33, \
fedora\:$(v)-$(a))) \
$(foreach a,ppc64el armhf mipsel amd64 i386, \
$(foreach v,bullseye buster, \
@@ -22,7 +16,7 @@
$(foreach v,jammy focal, \
ubuntu-debootstrap\:$(a)-$(v))) \
$(foreach a,aarch64 armhf amd64 i386, \
- $(foreach v,v3.14 v3.13 v3.12 v3.11 v3.10 v3.9 v3.8, \
+ $(foreach v,v3.14 v3.13 v3.12, \
alpine\:$(a)-$(v))) \
ALMALINUX_TAGS := \