manibuilder: Prepare for official multi-arch images
Now that we can use official multi-arch images prepare for tag names
matching the upstream ones. These will be prefixed with their respective
architecture, e.g. `ppc64le/`. To make the existing dockerfiles for
Debian and Ubuntu usable with the official images, remove their
`-debootstrap` suffix.
Change-Id: I11a7d13c7eb976205093f16dc9d3f5a57bc8f1bb
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/73433
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets
index 883b512..9b57a64 100644
--- a/util/manibuilder/Makefile.targets
+++ b/util/manibuilder/Makefile.targets
@@ -36,7 +36,7 @@
OTHER_TAGS := djgpp\:6.1.0
-ALL_TAGS := $(ANITA_TAGS) $(MULTIARCH_TAGS) $(OTHER_TAGS)
+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 \
@@ -46,7 +46,8 @@
arch_filter = $(sort \
$(foreach arch,$(1), \
- $(filter-out $(subst $(arch),,$(MULTIARCH_TAGS)),$(MULTIARCH_TAGS))))
+ $(filter-out $(subst $(arch),,$(MULTIARCH_TAGS) $(OFFICIAL_TAGS)), \
+ $(MULTIARCH_TAGS) $(OFFICIAL_TAGS))))
machine_map = \
$(if $(filter i386 i686 x86,$(1)),i386 x86, \