From a46484400c2808e62ce0efb5b2b76ac837ddc6be Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 1 Jul 2020 10:47:37 +0200 Subject: [PATCH 1/2] ci: tweak detection warning/error messages Prevents make builds failing because 'tinycbor/src/cborerrorstrings.d' file name is printed. --- tools/ci/check_build_warnings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci/check_build_warnings.py b/tools/ci/check_build_warnings.py index 35e3794e7..e64cc4066 100755 --- a/tools/ci/check_build_warnings.py +++ b/tools/ci/check_build_warnings.py @@ -18,7 +18,7 @@ except ImportError: sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..")) from find_build_apps import BuildItem, setup_logging -WARNING_REGEX = re.compile(r"(?:error|warning)", re.MULTILINE | re.IGNORECASE) +WARNING_REGEX = re.compile(r"(?:error|warning)[^\w]", re.MULTILINE | re.IGNORECASE) IGNORE_WARNS = [ re.compile(r_str) for r_str in [ From ee4079e7c771391e026fe706d9389a8f892c892d Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 1 Jul 2020 10:54:24 +0200 Subject: [PATCH 2/2] make: also pass IDF_ENV_FPGA when running ldgen --- make/ldgen.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/make/ldgen.mk b/make/ldgen.mk index bd03e2067..7c88563cf 100644 --- a/make/ldgen.mk +++ b/make/ldgen.mk @@ -44,6 +44,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen_librarie --env "COMPONENT_KCONFIGS_SOURCE_FILE=$(COMPONENT_KCONFIGS_SOURCE_FILE)" \ --env "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \ --env "IDF_CMAKE=n" \ + --env "IDF_ENV_FPGA=n" \ --objdump $(OBJDUMP) endef endif # Windows_NT