diff options
| author | Nico Huber <nico.h@gmx.de> | 2021-03-14 13:23:58 +0100 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2021-03-16 10:13:15 +0000 |
| commit | 3992d3ddd166ab8b508ab2b6622ed323c24ae71b (patch) | |
| tree | 2ae37791262dfd082383137e1e29e6bd1ea89b38 /util/manibuilder | |
| parent | 5d7dbc7313434f41e75772a0c0d344945cee0776 (diff) | |
| download | flashrom-3992d3ddd166ab8b508ab2b6622ed323c24ae71b.tar.gz flashrom-3992d3ddd166ab8b508ab2b6622ed323c24ae71b.tar.bz2 flashrom-3992d3ddd166ab8b508ab2b6622ed323c24ae71b.zip | |
manibuilder: Add a version number to anita tags
NetBSD 7.1 mirrors have dropped its packages, so we need something
new and more flexibility. As we have always used NetBSD 7.1 so far,
prepend the tags with `7.1-`.
To avoid re-building old images, one can re-tag them, e.g.:
$ docker image tag mani/anita:amd64 mani/anita:7.1-amd64
Change-Id: I44351805abab93c666d1d12c2bb17380caa75cec
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/51480
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'util/manibuilder')
| -rw-r--r-- | util/manibuilder/Makefile | 10 | ||||
| -rw-r--r-- | util/manibuilder/Makefile.targets | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile index 839fcbf85..01165e909 100644 --- a/util/manibuilder/Makefile +++ b/util/manibuilder/Makefile @@ -15,11 +15,11 @@ ident = $(subst :,_,$(subst \:,_,$(1))) PKGSRC_MIRROR = http://cdn.netbsd.org/ NETBSD_MIRROR = http://ftp.de.netbsd.org/ -anita\:amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All -anita\:amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/ +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\:i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/7.1/All -anita\:i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/i386/ +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/ $(addsuffix -build,$(ANITA_TAGS)): QEMU_DISK_SIZE=1G $(addsuffix -build,$(ANITA_TAGS)): QEMU_MEM_SIZE=128M @@ -52,7 +52,7 @@ $(addsuffix -check-build,$(ALL_TAGS)): %-check-build: [ $$(docker image ls -q mani/$*) ] \ || $(MAKE) $*-build $(if $(QUIET_SETUP),>/dev/null 2>/dev/null) -$(filter centos%,$(MULTIARCH_TAGS)) anita\:sparc: CC=cc +$(filter centos%,$(MULTIARCH_TAGS)) anita\:7.1-sparc: CC=cc djgpp\:6.1.0: CC=ccache i586-pc-msdosdjgpp-gcc djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip djgpp\:6.1.0: LIBS_BASE=../ diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index b41e35173..a5b2f4244 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -1,4 +1,4 @@ -ANITA_TAGS := anita\:amd64 anita\:i386 +ANITA_TAGS := anita\:7.1-amd64 anita\:7.1-i386 MULTIARCH_TAGS := \ centos\:7.6-armhfp-clean centos\:7.6-amd64-clean \ @@ -43,7 +43,7 @@ NATIVE_TAGS := $(call arch_filter,$(call machine_map,$(shell uname -m))) # rather arbitrary selection of images that seem to work (focus on amd64) DEFAULT_TAGS := \ - anita\:amd64 \ + anita\:7.1-amd64 \ djgpp\:6.1.0 \ fedora\:30-aarch64 \ fedora\:25-x86_64 \ @@ -73,8 +73,8 @@ DEFAULT_TAGS += $(filter-out $(DEFAULT_TAGS),$(NATIVE_TAGS)) # original 1.0.x tags 10X_TAGS := \ - anita\:amd64 \ - anita\:i386 \ + anita\:7.1-amd64 \ + anita\:7.1-i386 \ djgpp\:6.1.0 \ alpine\:amd64-v3.6 \ alpine\:amd64-v3.7 \ @@ -120,7 +120,7 @@ DEFAULT_TAGS += $(filter-out $(DEFAULT_TAGS),$(NATIVE_TAGS)) # original 1.1.x tags 11X_TAGS := \ - anita\:amd64 \ + anita\:7.1-amd64 \ djgpp\:6.1.0 \ fedora\:30-x86_64 \ fedora\:30-aarch64 \ |