From 537d8d5ad9218c025001dfc17e8c956d12bbdde3 Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Mon, 7 Dec 2020 16:19:42 +0000
Subject: [PATCH] display release type instead of keys

---
 core/Makefile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 8aa1cee892..dd56a43578 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -123,7 +123,14 @@ BUILD_KEYS := test-keys
 else
 BUILD_KEYS := dev-keys
 endif
-BUILD_VERSION_TAGS += $(BUILD_KEYS)
+
+ifndef RELEASE_TYPE
+  BUILD_DISPLAY_KEYS := $(BUILD_KEYS)
+else
+  BUILD_DISPLAY_KEYS := $(RELEASE_TYPE)-keys
+endif
+
+BUILD_VERSION_TAGS += $(BUILD_DISPLAY_KEYS)
 BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))
 
 # If the final fingerprint should be different than what was used by the build system,
@@ -188,9 +195,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user)
 
   # Dev. branches should have DISPLAY_BUILD_NUMBER set
   ifeq "true" "$(DISPLAY_BUILD_NUMBER)"
-    BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS)
+    BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_DISPLAY_KEYS)
   else
-    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS)
+    BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_DISPLAY_KEYS)
   endif
 else
   # Non-user builds should show detailed build information
-- 
GitLab