ninharp/ninlight-w600
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: Versions-Regex in run_mkimage.cmake an NINLIGHT_FW_VERSION verankern

Browse Source 
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:
Michael Sauer
2026-09-12 01:28:27 +02:00
parent 4cd7fde0cd
commit ebee9e8e61
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/run_mkimage.cmake
+4 -1
View File
@@ -1,6 +1,9 @@
file(READ ${VERSION_HEADER} V) file(READ ${VERSION_HEADER} V)
string(REGEX MATCH "\"([^\"]*)\"" _m "${V}") string(REGEX MATCH "NINLIGHT_FW_VERSION[ \t]+\"([^\"]*)\"" _m "${V}")
set(VERSION "${CMAKE_MATCH_1}") 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} execute_process(COMMAND python3 ${MKIMAGE} --image ${IMAGE} --device ${DEVICE} --version ${VERSION} --out ${OUT}
RESULT_VARIABLE rc) RESULT_VARIABLE rc)
if(NOT rc EQUAL 0) if(NOT rc EQUAL 0)