main.mk, p9.mk, regular-vm.mk: Board name should be a suffix of image name

conf.d/p9.mk

@@ -82,22 +82,22 @@ endif
 endif
 
 ifeq (,$(filter-out mipsel,$(ARCH)))
-vm/tavolga-alt-p9-jeos-systemd vm/tavolga-alt-p9-jeos-sysv \
-	vm/tavolga-alt-p9-builder: \
-	vm/tavolga-alt-p9-%: vm/tavolga-regular-% mixin/p9; @:
-
-vm/tavolga-alt-p9-lxde vm/tavolga-alt-p9-lxqt \
-	vm/tavolga-alt-p9-mate vm/tavolga-alt-p9-xfce \
-	vm/tavolga-alt-p9-icewm-sysv: \
-	vm/tavolga-alt-p9-%: vm/tavolga-regular-% mixin/p9; @:
-
-vm/bfk3-alt-p9-jeos-systemd vm/bfk3-alt-p9-jeos-sysv \
-	vm/bfk3-alt-p9-builder: \
-	vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
-
-vm/bfk3-alt-p9-lxde vm/bfk3-alt-p9-lxqt vm/bfk3-alt-p9-mate \
-	vm/bfk3-alt-p9-xfce vm/bfk3-alt-p9-icewm-sysv: \
-	vm/bfk3-alt-p9-%: vm/bfk3-regular-% mixin/p9; @:
+vm/alt-p9-jeos-systemd-tavolga vm/alt-p9-jeos-sysv-tavolga \
+	vm/alt-p9-builder-tavolga: \
+	vm/alt-p9-%-tavolga: vm/regular-%-tavolga mixin/p9; @:
+
+vm/alt-p9-lxde-tavolga vm/alt-p9-lxqt-tavolga \
+	vm/alt-p9-mate-tavolga vm/alt-p9-xfce-tavolga \
+	vm/alt-p9-icewm-sysv-tavolga: \
+	vm/alt-p9-%-tavolga: vm/regular-%-tavolga mixin/p9; @:
+
+vm/alt-p9-jeos-systemd-bfk3 vm/alt-p9-jeos-sysv-bfk3 \
+	vm/alt-p9-builder-bfk3: \
+	vm/alt-p9-%-bfk3: vm/regular-%-bfk3 mixin/p9; @:
+
+vm/alt-p9-lxde-bfk3 vm/alt-p9-lxqt-bfk3 vm/alt-p9-mate-bfk3 \
+	vm/alt-p9-xfce-bfk3 vm/alt-p9-icewm-sysv-bfk3: \
+	vm/alt-p9-%-bfk3: vm/regular-%-bfk3 mixin/p9; @:
 endif
 
 endif

conf.d/regular-vm.mk

@@ -158,56 +158,56 @@ endif
 
 ifeq (,$(filter-out mipsel,$(ARCH)))
 # Tavolga
-vm/tavolga-regular-jeos-systemd: vm/systemd-net mixin/regular-vm-jeos \
+vm/regular-jeos-systemd-tavolga: vm/systemd-net mixin/regular-vm-jeos \
 	use/mipsel-mitx; @:
 
-vm/tavolga-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
+vm/regular-jeos-sysv-tavolga: vm/net mixin/regular-vm-jeos \
 	use/mipsel-mitx +power; @:
 
-vm/tavolga-regular-builder: vm/tavolga-regular-jeos-sysv \
+vm/regular-builder-tavolga: vm/regular-jeos-sysv-tavolga \
 	mixin/regular-builder; @:
 
-vm/tavolga-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
+vm/regular-icewm-sysv-tavolga: vm/.regular-desktop-sysv mixin/regular-icewm \
 	use/mipsel-mitx/x11; @:
 
-vm/tavolga-regular-lxde: vm/.regular-gtk mixin/regular-lxde \
+vm/regular-lxde-tavolga: vm/.regular-gtk mixin/regular-lxde \
 	use/mipsel-mitx/x11; @:
 
-vm/tavolga-regular-lxqt: vm/.regular-gtk mixin/regular-lxqt \
+vm/regular-lxqt-tavolga: vm/.regular-gtk mixin/regular-lxqt \
 	use/mipsel-mitx/x11; @:
 
-vm/tavolga-regular-mate: vm/.regular-gtk mixin/regular-mate \
+vm/regular-mate-tavolga: vm/.regular-gtk mixin/regular-mate \
 	use/mipsel-mitx/x11
 	@$(call add,THE_PACKAGES,mate-reduced-resource)
 
-vm/tavolga-regular-xfce: vm/.regular-gtk mixin/regular-xfce \
+vm/regular-xfce-tavolga: vm/.regular-gtk mixin/regular-xfce \
 	use/mipsel-mitx/x11
 	@$(call add,THE_PACKAGES,xfce-reduced-resource)
 
 # bfk3
-vm/bfk3-regular-jeos-systemd: vm/systemd-net mixin/regular-vm-jeos \
+vm/regular-jeos-systemd-bfk3: vm/systemd-net mixin/regular-vm-jeos \
 	use/mipsel-bfk3; @:
 
-vm/bfk3-regular-jeos-sysv: vm/net mixin/regular-vm-jeos \
+vm/regular-jeos-sysv-bfk3: vm/net mixin/regular-vm-jeos \
 	use/mipsel-bfk3 +power; @:
 
-vm/bfk3-regular-builder: vm/bfk3-regular-jeos-sysv \
+vm/regular-builder-bfk3: vm/regular-jeos-sysv-bfk3 \
 	mixin/regular-builder; @:
 
-vm/bfk3-regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
+vm/regular-icewm-sysv-bfk3: vm/.regular-desktop-sysv mixin/regular-icewm \
 	use/mipsel-bfk3/x11; @:
 
-vm/bfk3-regular-lxde: vm/.regular-gtk mixin/regular-lxde \
+vm/regular-lxde-bfk3: vm/.regular-gtk mixin/regular-lxde \
 	use/mipsel-bfk3/x11; @:
 
-vm/bfk3-regular-lxqt: vm/.regular-gtk mixin/regular-lxqt \
+vm/regular-lxqt-bfk3: vm/.regular-gtk mixin/regular-lxqt \
 	use/mipsel-bfk3/x11; @:
 
-vm/bfk3-regular-mate: vm/.regular-gtk mixin/regular-mate \
+vm/regular-mate-bfk3: vm/.regular-gtk mixin/regular-mate \
 	use/mipsel-bfk3/x11
 	@$(call add,THE_PACKAGES,mate-reduced-resource)
 
-vm/bfk3-regular-xfce: vm/.regular-gtk mixin/regular-xfce \
+vm/regular-xfce-bfk3: vm/.regular-gtk mixin/regular-xfce \
 	use/mipsel-bfk3/x11
 	@$(call add,THE_PACKAGES,xfce-reduced-resource)
 endif

main.mk

@@ -63,7 +63,7 @@ DISTROS := $(call addsuffices,$(DISTRO_EXTS),$(DISTRO_TARGETS))
 VES     := $(call addsuffices,$(VE_EXTS),$(VE_TARGETS))
 VES_TAR := $(call addsuffices,.tar,$(VE_TARGETS))
 VMS     := $(call addsuffices,$(VM_EXTS),$(VM_TARGETS)) \
- $(call addsuffices,$(VM_TAVOLGA_EXTS), $(filter vm/tavolga-%, $(VM_TARGETS)))
+ $(call addsuffices,$(VM_TAVOLGA_EXTS), $(filter vm/%-tavolga, $(VM_TARGETS)))
 VMS_IMG := $(call addsuffices,.img,$(VM_TARGETS))
 IMAGES  := $(DISTROS) $(VES) $(VMS)