Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cmake/llext-edk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ endfunction()
# read in computed build configuration
import_kconfig(CONFIG ${PROJECT_BINARY_DIR}/.config)

if (CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
if(CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID)
message(FATAL_ERROR
"The LLEXT EDK is not compatible with CONFIG_LLEXT_EXPORT_BUILTINS_BY_SLID.")
endif()
Expand Down Expand Up @@ -211,7 +211,7 @@ list(APPEND base_flags ${llext_edk_cflags} ${imacros})

file(MAKE_DIRECTORY ${llext_edk_inc})
foreach(dir ${INTERFACE_INCLUDE_DIRECTORIES})
if (NOT EXISTS ${dir})
if(NOT EXISTS ${dir})
continue()
endif()

Expand Down Expand Up @@ -281,4 +281,6 @@ file(ARCHIVE_CREATE
${llext_edk_format}
)

file(REMOVE_RECURSE ${llext_edk})
if(NOT CONFIG_LLEXT_EDK_PRESERVE_INPUT_FOLDER)
file(REMOVE_RECURSE ${llext_edk})
endif()
8 changes: 6 additions & 2 deletions subsys/llext/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,9 @@ config LLEXT_EDK_NAME
instance, the default name, "llext-edk", becomes LLEXT_EDK_INSTALL_DIR.

choice LLEXT_EDK_FORMAT
prompt "EDK compression and output format"
default LLEXT_EDK_FORMAT_TAR_XZ
prompt "EDK compression and output format"
default LLEXT_EDK_FORMAT_TAR_ZSTD if LLEXT_EDK_PRESERVE_INPUT_FOLDER
default LLEXT_EDK_FORMAT_TAR_XZ

config LLEXT_EDK_FORMAT_TAR_XZ
bool ".tar.xz"
Expand Down Expand Up @@ -213,4 +214,7 @@ config LLEXT_EDK_USERSPACE_ONLY
to be used by userspace only extensions, this option will make EDK stubs
not contain the routing code, and only generate the userspace one.

config LLEXT_EDK_PRESERVE_INPUT_FOLDER
bool "Don't delete the EDK source folder"

endif