Angel Pons has submitted this change. ( https://review.coreboot.org/c/flashrom/+/51481 )
Change subject: manibuilder: Add NetBSD 8.2 target (anita:8.2-amd64) ......................................................................
manibuilder: Add NetBSD 8.2 target (anita:8.2-amd64)
It needs more disk space and RAM. Also, make it the default as NetBSD 7.1 packages are gone.
Change-Id: Ic823cd30228f15859462844eb50d213487f74873 Signed-off-by: Nico Huber nico.h@gmx.de Reviewed-on: https://review.coreboot.org/c/flashrom/+/51481 Reviewed-by: Angel Pons th3fanbus@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M util/manibuilder/Makefile M util/manibuilder/Makefile.targets 2 files changed, 11 insertions(+), 5 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile index 01165e9..c0d1eff 100644 --- a/util/manibuilder/Makefile +++ b/util/manibuilder/Makefile @@ -15,14 +15,20 @@ PKGSRC_MIRROR = http://cdn.netbsd.org/ NETBSD_MIRROR = http://ftp.de.netbsd.org/
+anita:8.2-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/8.2/All +anita:8.2-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/amd64/ +anita:8.2-amd64-build: QEMU_DISK_SIZE=2G +anita:8.2-amd64-build: QEMU_MEM_SIZE=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_MEM_SIZE=128M
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 +anita:7.1-i386-build: QEMU_DISK_SIZE=1G +anita:7.1-i386-build: QEMU_MEM_SIZE=128M
$(addsuffix -build,$(ANITA_TAGS)): %-build: Dockerfile.anita anita-wrapper.sh $(QUIET_SETUP)docker build . -f $< -t mani/$* \ diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets index a5b2f42..0fe9026 100644 --- a/util/manibuilder/Makefile.targets +++ b/util/manibuilder/Makefile.targets @@ -1,4 +1,4 @@ -ANITA_TAGS := anita:7.1-amd64 anita:7.1-i386 +ANITA_TAGS := anita:8.2-amd64 anita:7.1-amd64 anita:7.1-i386
MULTIARCH_TAGS := \ centos:7.6-armhfp-clean centos:7.6-amd64-clean \ @@ -43,7 +43,7 @@
# rather arbitrary selection of images that seem to work (focus on amd64) DEFAULT_TAGS := \ - anita:7.1-amd64 \ + anita:8.2-amd64 \ djgpp:6.1.0 \ fedora:30-aarch64 \ fedora:25-x86_64 \