From d8537948c5020d3d8c525f8c6f40b8003dbde4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Sun, 8 Jul 2018 11:48:05 +0200
Subject: [PATCH] Optimise variants handling

---
 .gitlab-ci.yml       | 28 ++++++++++++++++------------
 Makefile.variants.mk | 43 +++++++------------------------------------
 2 files changed, 23 insertions(+), 48 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fb3e35f..d325ffe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,20 +64,24 @@ pre-release:
   when: manual
   allow_failure: true
 
-bionic-lxde rock64: *build
-bionic-lxde rockpro64: *build
+bionic-lxde-arm64 rock64: *build
+bionic-lxde-arm64 rockpro64: *build
 
-bionic-containers rock64: *build
-bionic-containers rockpro64: *build
+bionic-containers-arm64 rock64: *build
+bionic-containers-arm64 rockpro64: *build
 
-stretch-openmediavault rock64: *build
-stretch-openmediavault rockpro64: *build
+stretch-openmediavault-arm64 rock64: *build
+stretch-openmediavault-armhf rock64: *build
+stretch-openmediavault-arm64 rockpro64: *build
+stretch-openmediavault-armhf rockpro64: *build
 
-stretch-minimal rock64: *build
-stretch-minimal rockpro64: *build
+stretch-minimal-arm64 rock64: *build
+stretch-minimal-arm64 rockpro64: *build
 
-bionic-minimal rock64: *build
-bionic-minimal rockpro64: *build
+bionic-minimal-arm64 rock64: *build
+bionic-minimal-armhf rock64: *build
+bionic-minimal-arm64 rockpro64: *build
+bionic-minimal-armhf rockpro64: *build
 
-bionic-mate rock64: *build_manual
-bionic-mate rockpro64: *build_manual
+bionic-mate-arm64 rock64: *build_manual
+bionic-mate-arm64 rockpro64: *build_manual
diff --git a/Makefile.variants.mk b/Makefile.variants.mk
index c88ef01..c843d01 100644
--- a/Makefile.variants.mk
+++ b/Makefile.variants.mk
@@ -1,42 +1,13 @@
-.PHONY: stretch-minimal
-stretch-minimal: stretch-minimal-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-arm64.img.xz
+VARIANTS := $(foreach system, $(BUILD_SYSTEMS), $(foreach variants, $(BUILD_VARIANTS), $(system)-$(variants)))
 
-.PHONY: jessie-openmediavault
-stretch-openmediavault: stretch-openmediavault-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-armhf.img.xz \
-	stretch-openmediavault-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-arm64.img.xz
+variants:
+	@echo $(VARIANTS)
 
-.PHONY: bionic-minimal
-bionic-minimal: bionic-minimal-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-armhf.img.xz \
-	bionic-minimal-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-arm64.img.xz
-
-.PHONY: bionic-containers
-bionic-containers: bionic-containers-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-arm64.img.xz
-
-.PHONY: bionic-mate
-bionic-mate: bionic-mate-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-arm64.img.xz
-
-.PHONY: bionic-lxde
-bionic-lxde: bionic-lxde-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-arm64.img.xz
-
-.PHONY: bionic		# build all bionic variants
-bionic: bionic-minimal \
-	bionic-containers \
-	bionic-lxde
-
-.PHONY: stretch		# build all stretch variants
-stretch: stretch-minimal \
-	stretch-openmediavault
+$(addsuffix -armhf, $(VARIANTS)): %-armhf: %-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-armhf.img.xz
+$(addsuffix -arm64, $(VARIANTS)): %-arm64: %-$(BOARD_TARGET)-$(IMAGE_SUFFIX)-arm64.img.xz
 
 .PHONY: linux-variants		# build all linux variants
 linux-variants: \
-	bionic \
-	stretch \
-	linux-virtual
-
-.PHONY: linux-minimal		# build all linux variants
-linux-minimal: \
-	bionic-minimal \
-	bionic-containers \
-	stretch-minimal \
-	stretch-openmediavault \
+	bionic-minimal-arm64 \
+	stretch-minimal-arm64 \
 	linux-virtual