fix: Versions-Regex in run_mkimage.cmake an NINLIGHT_FW_VERSION verankern
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.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user