StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add alias-release-config function

Browse Source 
This should be used to declare that a release config is an alias for
another one.  Aliases have no release config files of their own, and are
primarily used to simplify continuous integration as releases happen.

Bug: None
Test: manual
Change-Id: Ife5eb1f8f4bf8e06832dc55bbc390ce2f741ebb8
This commit is contained in:
LaMont Jones
2024-01-30 23:04:02 +00:00
parent 55d5fc504b
commit 61b0f799e2
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/release_config.mk
View File

@@ -59,6 +59,17 @@ $(foreach map,$(PRODUCT_RELEASE_CONFIG_MAPS), \
$(if $(filter $(map),$(config_map_files)),,$(eval config_map_files += $(map))) \ $(if $(filter $(map),$(config_map_files)),,$(eval config_map_files += $(map))) \
) )
# Declare an alias release-config
#
# This should be used to declare a release as an alias of another, meaning no
# release config files should be present.
#
# $1 config name
# $2 release config for which it is an alias
define alias-release-config
$(call _declare-release-config,$(1),,$(2),true)
endef
# Declare or extend a release-config. # Declare or extend a release-config.
# #
# The order of processing is: # The order of processing is:
@@ -85,9 +96,14 @@ $(foreach map,$(PRODUCT_RELEASE_CONFIG_MAPS), \
# $2 release config files # $2 release config files
# $3 overridden release config # $3 overridden release config
define declare-release-config define declare-release-config
$(call _declare-release-config,$(1),$(2),$(3),)
endef
define _declare-release-config
$(if $(strip $(2)$(3)),, \ $(if $(strip $(2)$(3)),, \
$(error declare-release-config: config $(strip $(1)) must have release config files, override another release config, or both) \ $(error declare-release-config: config $(strip $(1)) must have release config files, override another release config, or both) \
) )
$(if $(strip $(4)),$(eval _all_release_configs.$(strip $(1)).ALIAS := true))
$(eval _all_release_configs := $(sort $(_all_release_configs) $(strip $(1)))) $(eval _all_release_configs := $(sort $(_all_release_configs) $(strip $(1))))
$(if $(strip $(3)), \ $(if $(strip $(3)), \
$(if $(filter $(_all_release_configs), $(strip $(3))), $(if $(filter $(_all_release_configs), $(strip $(3))),
@@ -169,6 +185,11 @@ TARGET_RELEASE:=
endif endif
.KATI_READONLY := TARGET_RELEASE .KATI_READONLY := TARGET_RELEASE
# Verify that alias configs do not have config files.
$(foreach r,$(_all_release_configs),\
$(if $(_all_release_configs.$(r).ALIAS),$(if $(_all_release_configs.$(r).FILES),\
$(error Alias release config "$(r)" may not specify release config files $(_all_release_configs.$(r).FILES))\
)))
$(foreach config, $(_all_release_configs), \ $(foreach config, $(_all_release_configs), \
$(eval _all_release_configs.$(config).DECLARED_IN:= ) \ $(eval _all_release_configs.$(config).DECLARED_IN:= ) \