openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-29 07:53:44 +02:00
Code Issues Releases Wiki Activity

manibuilder: Add a version number to anita tags

Browse Source 
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>
This commit is contained in:
Nico Huber 2021-03-14 13:23:58 +01:00 committed by Angel Pons
parent 5d7dbc7313
commit 3992d3ddd1
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/manibuilder/Makefile
View File

@ -15,11 +15,11 @@ ident = $(subst :,_,$(subst \:,_,$(1)))
PKGSRC_MIRROR = http://cdn.netbsd.org/ PKGSRC_MIRROR = http://cdn.netbsd.org/
NETBSD_MIRROR = http://ftp.de.netbsd.org/ NETBSD_MIRROR = http://ftp.de.netbsd.org/
anita\:amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All anita\:7.1-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: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/
anita\:i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/7.1/All anita\:7.1-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: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/i386/
$(addsuffix -build,$(ANITA_TAGS)): QEMU_DISK_SIZE=1G $(addsuffix -build,$(ANITA_TAGS)): QEMU_DISK_SIZE=1G
$(addsuffix -build,$(ANITA_TAGS)): QEMU_MEM_SIZE=128M $(addsuffix -build,$(ANITA_TAGS)): QEMU_MEM_SIZE=128M
@ -52,7 +52,7 @@ $(addsuffix -check-build,$(ALL_TAGS)): %-check-build:
[ $$(docker image ls -q mani/$*) ] \ [ $$(docker image ls -q mani/$*) ] \
|| $(MAKE) $*-build $(if $(QUIET_SETUP),>/dev/null 2>/dev/null) || $(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: CC=ccache i586-pc-msdosdjgpp-gcc
djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip djgpp\:6.1.0: STRIP=i586-pc-msdosdjgpp-strip
djgpp\:6.1.0: LIBS_BASE=../ djgpp\:6.1.0: LIBS_BASE=../

10
util/manibuilder/Makefile.targets
View File

@ -1,4 +1,4 @@
ANITA_TAGS := anita\:amd64 anita\:i386 ANITA_TAGS := anita\:7.1-amd64 anita\:7.1-i386
MULTIARCH_TAGS := \ MULTIARCH_TAGS := \
centos\:7.6-armhfp-clean centos\:7.6-amd64-clean \ 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) # rather arbitrary selection of images that seem to work (focus on amd64)
DEFAULT_TAGS := \ DEFAULT_TAGS := \
anita\:amd64 \ anita\:7.1-amd64 \
djgpp\:6.1.0 \ djgpp\:6.1.0 \
fedora\:30-aarch64 \ fedora\:30-aarch64 \
fedora\:25-x86_64 \ fedora\:25-x86_64 \
@ -73,8 +73,8 @@ DEFAULT_TAGS += $(filter-out $(DEFAULT_TAGS),$(NATIVE_TAGS))
# original 1.0.x tags # original 1.0.x tags
10X_TAGS := \ 10X_TAGS := \
anita\:amd64 \ anita\:7.1-amd64 \
anita\:i386 \ anita\:7.1-i386 \
djgpp\:6.1.0 \ djgpp\:6.1.0 \
alpine\:amd64-v3.6 \ alpine\:amd64-v3.6 \
alpine\:amd64-v3.7 \ alpine\:amd64-v3.7 \
@ -120,7 +120,7 @@ DEFAULT_TAGS += $(filter-out $(DEFAULT_TAGS),$(NATIVE_TAGS))
# original 1.1.x tags # original 1.1.x tags
11X_TAGS := \ 11X_TAGS := \
anita\:amd64 \ anita\:7.1-amd64 \
djgpp\:6.1.0 \ djgpp\:6.1.0 \
fedora\:30-x86_64 \ fedora\:30-x86_64 \
fedora\:30-aarch64 \ fedora\:30-aarch64 \