commit 5e8b339d8be144d054032ff0e63dc1b5d209f475
author Nico Huber <nico.h@gmx.de> Sun Apr 21 13:33:56 2024 +0200
committer Nico Huber <nico.h@gmx.de> Fri Jul 12 20:54:09 2024 +0000
tree 035d082da431ae21b0fa31e4550fa218cace0464
parent 61da8c74ab4ff6b722689d2189cab560ea3052be

manibuilder/anita: Add NetBSD 10.0 i386 & amd64 images

`dhcpcd' forks into background more eagerly now, so we tell it
to wait for an IP explicitly.

Binary packages for `pkg_add' seem unavailable for sparc64 atm.
Hopefully, we can add that at a later time.

Change-Id: I4980ad711e1a34d2fd049ee1ea53bba1f14f6310
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.sourcearcade.org/c/flashprog/+/134

util/manibuilder/Dockerfile.anita

diff --git a/util/manibuilder/Dockerfile.anita b/util/manibuilder/Dockerfile.anita
index c8dfae8..2e2b449 100644
--- a/util/manibuilder/Dockerfile.anita
+++ b/util/manibuilder/Dockerfile.anita
@@ -28,7 +28,7 @@
 ARG ORIGIN=https://review.sourcearcade.org/flashprog.git
 ARG PKG_PATH=http://cdn.netbsd.org/pub/pkgsrc/packages/NetBSD/amd64/7.1/All
 RUN cd && anita --persist --memory-size=${RUNTIME_MEM} --run \
-"echo 'dhcpcd'                                   >init && \
+"echo 'dhcpcd --waitip'                          >init && \
  echo 'export PKG_PATH=${PKG_PATH}'             >>init && \
  . ./init && \
  pkg_add gmake git-base ccache pkg-config meson \

util/manibuilder/Makefile.anita

diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita
index f33acc2..73c7ea1 100644
--- a/util/manibuilder/Makefile.anita
+++ b/util/manibuilder/Makefile.anita
@@ -1,6 +1,18 @@
 PKGSRC_MIRROR = http://cdn.netbsd.org/
 NETBSD_MIRROR = http://ftp.de.netbsd.org/
 
+anita\:10.0-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/10.0/All
+anita\:10.0-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-10.0/amd64/
+anita\:10.0-amd64-build: QEMU_DISK_SIZE=2G
+anita\:10.0-amd64-build: QEMU_INSTALL_MEM=192M
+anita\:10.0-amd64-build: QEMU_RUNTIME_MEM=512M
+
+anita\:10.0-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/10.0/All
+anita\:10.0-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-10.0/i386/
+anita\:10.0-i386-build: QEMU_DISK_SIZE=2G
+anita\:10.0-i386-build: QEMU_INSTALL_MEM=128M
+anita\:10.0-i386-build: QEMU_RUNTIME_MEM=256M
+
 anita\:9.3-sparc64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/sparc64/9.3/All
 anita\:9.3-sparc64-build: NETBSD_IMAGE=pub/NetBSD/iso/9.3/NetBSD-9.3-sparc64.iso
 anita\:9.3-sparc64-build: QEMU_DISK_SIZE=2G

util/manibuilder/Makefile.targets

diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets
index e16edef..7d3224a 100644
--- a/util/manibuilder/Makefile.targets
+++ b/util/manibuilder/Makefile.targets
@@ -1,4 +1,5 @@
 ANITA_TAGS := \
+	anita\:10.0-amd64 anita\:10.0-i386 \
 	anita\:9.3-amd64 anita\:9.3-i386 anita\:9.3-sparc64 \
 	anita\:8.2-amd64 anita\:8.2-i386 \
 	anita\:7.1-amd64 anita\:7.1-i386 \