From ebee9e8e61906410169fe04940d9c4e3ddb7ae00 Mon Sep 17 00:00:00 2001 From: Michael Sauer Date: Sat, 12 Sep 2026 01:28:27 +0200 Subject: [PATCH] fix: Versions-Regex in run_mkimage.cmake an NINLIGHT_FW_VERSION verankern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vorher traf die Regex das erste Stringliteral im generierten Header, unabhängig vom Makronamen. Zusätzlich bricht ein leerer Regex-Treffer jetzt hörbar ab, statt eine leere Version stillschweigend in den OTA-Trailer zu schreiben. --- cmake/run_mkimage.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/run_mkimage.cmake b/cmake/run_mkimage.cmake index a0ac4ec..821de76 100644 --- a/cmake/run_mkimage.cmake +++ b/cmake/run_mkimage.cmake @@ -1,6 +1,9 @@ file(READ ${VERSION_HEADER} V) -string(REGEX MATCH "\"([^\"]*)\"" _m "${V}") +string(REGEX MATCH "NINLIGHT_FW_VERSION[ \t]+\"([^\"]*)\"" _m "${V}") set(VERSION "${CMAKE_MATCH_1}") +if(NOT VERSION) + message(FATAL_ERROR "run_mkimage: NINLIGHT_FW_VERSION not found in ${VERSION_HEADER}") +endif() execute_process(COMMAND python3 ${MKIMAGE} --image ${IMAGE} --device ${DEVICE} --version ${VERSION} --out ${OUT} RESULT_VARIABLE rc) if(NOT rc EQUAL 0)