Skip to content

Commit d1bd96e

Browse files
oyvindronningstadhakonfam
authored andcommitted
bootloader: debug_keys.cmake: Resolve paths if not absolute
Resolve from ${CMAKE_SOURCE_DIR}, the directory containing the app's CMakeLists.txt. Signed-off-by: Øyvind Rønningstad <[email protected]>
1 parent 5ff8db8 commit d1bd96e

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

subsys/bootloader/cmake/debug_keys.cmake

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,17 @@ if( "${CONFIG_SB_SIGNING_KEY_FILE}" STREQUAL "")
5353
)
5454
set(SIGN_KEY_FILE_DEPENDS debug_sign_key_target)
5555
else()
56-
if (NOT EXISTS "${CONFIG_SB_SIGNING_KEY_FILE}")
57-
message(FATAL_ERROR "Config points to non-existing PEM file '${CONFIG_SB_SIGNING_KEY_FILE}'")
56+
# Resolve path.
57+
if(IS_ABSOLUTE ${CONFIG_SB_SIGNING_KEY_FILE})
58+
set(SIGNATURE_PRIVATE_KEY_FILE ${CONFIG_SB_SIGNING_KEY_FILE})
59+
else()
60+
set(SIGNATURE_PRIVATE_KEY_FILE
61+
${CMAKE_SOURCE_DIR}/${CONFIG_SB_SIGNING_KEY_FILE})
62+
endif()
63+
64+
if (NOT EXISTS ${SIGNATURE_PRIVATE_KEY_FILE})
65+
message(FATAL_ERROR "Config points to non-existing PEM file '${SIGNATURE_PRIVATE_KEY_FILE}'")
5866
endif()
59-
set(SIGNATURE_PRIVATE_KEY_FILE ${CONFIG_SB_SIGNING_KEY_FILE})
6067
endif()
6168

6269
if ("${CONFIG_SB_PUBLIC_KEY_FILES}" STREQUAL "")
@@ -100,5 +107,14 @@ if ("${CONFIG_SB_PUBLIC_KEY_FILES}" STREQUAL "")
100107
)
101108
set(PROVISION_KEY_DEPENDS provision_key_target)
102109
else ()
103-
set (PUBLIC_KEY_FILES ${CONFIG_SB_PUBLIC_KEY_FILES})
110+
string(REPLACE "," ";" PUBLIC_KEY_FILES_LIST ${CONFIG_SB_PUBLIC_KEY_FILES})
111+
foreach(key ${PUBLIC_KEY_FILES_LIST})
112+
# Resolve path.
113+
if(IS_ABSOLUTE ${key})
114+
list(APPEND PUBLIC_KEY_FILES ${key})
115+
else()
116+
list(APPEND PUBLIC_KEY_FILES ${CMAKE_SOURCE_DIR}/${key})
117+
endif()
118+
endforeach()
119+
string(REPLACE ";" "," PUBLIC_KEY_FILES "${PUBLIC_KEY_FILES}")
104120
endif()

0 commit comments

Comments
 (0)