Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0de8833d authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'oreo-display-release-type-instead-of-keys' into 'v1-oreo' 

display release type instead of keys

See merge request !16
parents a9bc17ae 0c0d795d

core/Makefile

+10 −3
Original line number Diff line number Diff line
@@ -171,7 +171,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)))



# A human-readable string that descibes this build in detail.
@@ -219,9 +226,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