diff options
| author | Nico Huber <nico.h@gmx.de> | 2021-03-14 22:29:06 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2021-04-22 14:52:41 +0000 |
| commit | 928b478d75030eed7e1cf8e1cdfb7722dfe28900 (patch) | |
| tree | 3d044ede8f9ffc84e054bb0f97a3c3e7b1e86422 | |
| parent | 991009505dad48cb9e655d4ad7937db776fdcb4f (diff) | |
| download | flashrom-928b478d75030eed7e1cf8e1cdfb7722dfe28900.tar.gz flashrom-928b478d75030eed7e1cf8e1cdfb7722dfe28900.tar.bz2 flashrom-928b478d75030eed7e1cf8e1cdfb7722dfe28900.zip | |
manibuilder/anita: Factor things out into Makefile.anita
The anita-based NetBSD targets need noisy, per-target handling.
Factor it out into another Makefile.
Change-Id: I0a3ca751b42f1ca8c05d93eb9740bb0ee5cc6d09
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/52483
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
| -rw-r--r-- | util/manibuilder/Makefile | 25 | ||||
| -rw-r--r-- | util/manibuilder/Makefile.anita | 24 |
2 files changed, 25 insertions, 24 deletions
diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile index c0d1eff16..5b58b053b 100644 --- a/util/manibuilder/Makefile +++ b/util/manibuilder/Makefile @@ -12,30 +12,7 @@ spc := $(spc) $(spc) stem = $(word 1,$(subst :,$(spc),$(subst \:,$(spc),$(1)))) ident = $(subst :,_,$(subst \:,_,$(1))) -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/ -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/$* \ - --build-arg PKG_PATH=$(PKGSRC_MIRROR)$(PKGSRC_PATH) \ - --build-arg INST_IMG=$(NETBSD_MIRROR)$(NETBSD_IMAGE) \ - --build-arg DISK_SIZE=$(QEMU_DISK_SIZE) \ - --build-arg MEM_SIZE=$(QEMU_MEM_SIZE) +include Makefile.anita define build_template Dockerfile.$(call ident,$(1)): Dockerfile.$(call stem,$(1)) mani-wrapper.sh diff --git a/util/manibuilder/Makefile.anita b/util/manibuilder/Makefile.anita new file mode 100644 index 000000000..e79519451 --- /dev/null +++ b/util/manibuilder/Makefile.anita @@ -0,0 +1,24 @@ +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/ +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/$* \ + --build-arg PKG_PATH=$(PKGSRC_MIRROR)$(PKGSRC_PATH) \ + --build-arg INST_IMG=$(NETBSD_MIRROR)$(NETBSD_IMAGE) \ + --build-arg DISK_SIZE=$(QEMU_DISK_SIZE) \ + --build-arg MEM_SIZE=$(QEMU_MEM_SIZE) |