diff options
| -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 \ |