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

Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main

Browse Source 
* changes:
  Add the list of makefiles that were also included by product config to dumpconfig.
  Add tracing for board config to dumpconfig
  Fix newline for dumpconfig
This commit is contained in:
Cole Faust
2024-08-29 22:07:41 +00:00
committed by Gerrit Code Review
parent 0ad443b80c 248580cb41
commit da669fa5f0
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/board_config.mk
View File

@@ -237,6 +237,7 @@ else
.KATI_READONLY := TARGET_DEVICE_DIR .KATI_READONLY := TARGET_DEVICE_DIR
endif endif
$(call dump-phase-start,BOARD,,,, build/make/core/board_config.mk)
ifndef RBC_PRODUCT_CONFIG ifndef RBC_PRODUCT_CONFIG
include $(board_config_mk) include $(board_config_mk)
else else
@@ -261,6 +262,7 @@ else
include $(OUT_DIR)/rbc/rbc_board_config_results.mk include $(OUT_DIR)/rbc/rbc_board_config_results.mk
endif endif
$(call dump-phase-end, build/make/core/board_config.mk)
ifneq (,$(and $(TARGET_ARCH),$(TARGET_ARCH_SUITE))) ifneq (,$(and $(TARGET_ARCH),$(TARGET_ARCH_SUITE)))
$(error $(board_config_mk) erroneously sets both TARGET_ARCH and TARGET_ARCH_SUITE) $(error $(board_config_mk) erroneously sets both TARGET_ARCH and TARGET_ARCH_SUITE)

4
core/dumpconfig.mk
View File

@@ -56,7 +56,7 @@ BUILD_DATETIME_FILE := $(OUT_DIR)/build_date.txt
# Escape quotation marks for CSV, and wraps in quotation marks. # Escape quotation marks for CSV, and wraps in quotation marks.
define escape-for-csv define escape-for-csv
"$(subst ","",$1)" "$(subst ","",$(subst $(newline), ,$1))"
endef endef
# Args: # Args:
@@ -68,7 +68,7 @@ endef
# Args: # Args:
# $(1): include stack # $(1): include stack
define dump-import-done define dump-import-done
$(eval $(file >> $(DUMPCONFIG_FILE),imported,$(strip $(1)))) $(eval $(file >> $(DUMPCONFIG_FILE),imported,$(strip $(1)),$(filter-out $(1),$(MAKEFILE_LIST))))
endef endef
# Args: # Args: