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

Merge "Revert "Require TARGET_RELEASE for builds"" into main

Browse Source
This commit is contained in:
Robin Lee
2023-11-09 08:49:25 +00:00
committed by Gerrit Code Review
parent 1f94a3d547 50fe46c1d3
commit 092c6b68b8
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/release_config.mk
View File

@@ -82,25 +82,13 @@ $(foreach f, $(config_map_files), \
) )
FLAG_DECLARATION_FILES := FLAG_DECLARATION_FILES :=
ifeq ($(TARGET_RELEASE),) # If TARGET_RELEASE is set, fail if there is no matching release config
# We allow some internal paths to explicitly set TARGET_RELEASE to the # If it isn't set, no release config files will be included and all flags
# empty string. For the most part, 'make' treats unset and empty string as # will get their default values.
# the same. But the following line differentiates, and will only assign ifneq ($(TARGET_RELEASE),)
# if the variable was completely unset.
TARGET_RELEASE ?= was_unset
ifeq ($(TARGET_RELEASE),was_unset)
$(error No release config set for target; please set TARGET_RELEASE, or if building on the command line use 'lunch <target>-<release>-<build_type>', where release is one of: $(_all_release_configs))
endif
# Instead of leaving this string empty, we want to default to a valid
# setting. Full builds coming through this path is a bug, but in case
# of such a bug, we want to at least get consistent, valid results.
TARGET_RELEASE = trunk_staging
endif
ifeq ($(filter $(_all_release_configs), $(TARGET_RELEASE)),) ifeq ($(filter $(_all_release_configs), $(TARGET_RELEASE)),)
$(error No release config found for TARGET_RELEASE: $(TARGET_RELEASE). Available releases are: $(_all_release_configs)) $(error No release config found for TARGET_RELEASE: $(TARGET_RELEASE). Available releases are: $(_all_release_configs))
endif else
# Choose flag files # Choose flag files
# Don't sort this, use it in the order they gave us. # Don't sort this, use it in the order they gave us.
# Do allow duplicate entries, retaining only the first usage. # Do allow duplicate entries, retaining only the first usage.
@@ -108,6 +96,14 @@ flag_value_files :=
$(foreach f,$(_all_release_configs.$(TARGET_RELEASE).FILES), \ $(foreach f,$(_all_release_configs.$(TARGET_RELEASE).FILES), \
$(if $(filter $(f),$(flag_value_files)),,$(eval flag_value_files += $(f)))\ $(if $(filter $(f),$(flag_value_files)),,$(eval flag_value_files += $(f)))\
) )
endif
else
# Useful for finding scripts etc that aren't passing or setting TARGET_RELEASE
ifneq ($(FAIL_IF_NO_RELEASE_CONFIG),)
$(error FAIL_IF_NO_RELEASE_CONFIG was set and TARGET_RELEASE was not)
endif
flag_value_files :=
endif
# Unset variables so they can't use them # Unset variables so they can't use them
define declare-release-config define declare-release-config