From 451ce2ae41bf52b348013d812bafc03afe2bcc58 Mon Sep 17 00:00:00 2001 From: aviralgarg05 Date: Wed, 3 Jun 2026 19:21:14 +0530 Subject: [PATCH] apps: add missing module metadata for executable tools Add the missing module metadata for the executable ELF helpers used by the package fixture flow so the generated artifacts describe their target and type consistently. Also fix the existing embedlog spelling issue that is picked up by the current apps check, keeping this branch clean under CI. Signed-off-by: aviralgarg05 --- crypto/libtomcrypt/Makefile | 3 +++ crypto/tinycrypt/Makefile | 3 ++- database/sqlite/Makefile | 2 +- logging/embedlog/Kconfig | 4 ++-- logging/embedlog/Makefile | 3 ++- math/libtommath/Makefile | 4 ++++ system/fdt/Kconfig | 8 ++++---- system/fdt/Makefile | 12 ++++++++---- system/libuv/Kconfig | 4 ++-- system/libuv/Makefile | 4 +++- videoutils/x264/Makefile | 3 +-- 11 files changed, 32 insertions(+), 18 deletions(-) diff --git a/crypto/libtomcrypt/Makefile b/crypto/libtomcrypt/Makefile index 68219a8cf89..b4fe79fd6fb 100644 --- a/crypto/libtomcrypt/Makefile +++ b/crypto/libtomcrypt/Makefile @@ -451,6 +451,7 @@ ifneq ($(CONFIG_LIBTOMCRYPT_DEMOS),) ifneq ($(CONFIG_LIBTOMCRYPT_LTCRYPT),) MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/demos/ltcrypt.c +MODULE += $(CONFIG_LIBTOMCRYPT_LTCRYPT) PROGNAME += $(CONFIG_LIBTOMCRYPT_LTCRYPT_PROGNAME) PRIORITY += $(CONFIG_LIBTOMCRYPT_LTCRYPT_PRIORITY) STACKSIZE += $(CONFIG_LIBTOMCRYPT_LTCRYPT_STACKSIZE) @@ -459,6 +460,7 @@ endif ifneq ($(CONFIG_LIBTOMCRYPT_HASHSUM),) MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/demos/hashsum.c +MODULE += $(CONFIG_LIBTOMCRYPT_HASHSUM) PROGNAME += $(CONFIG_LIBTOMCRYPT_HASHSUM_PROGNAME) PRIORITY += $(CONFIG_LIBTOMCRYPT_HASHSUM_PRIORITY) STACKSIZE += $(CONFIG_LIBTOMCRYPT_HASHSUM_STACKSIZE) @@ -478,6 +480,7 @@ NEWSRC := $(wildcard libtomcrypt/tests/*.c) CSRCS += $(filter-out $(LIBTOMCRYPT_UNPACKNAME)/tests/test.c, $(NEWSRC)) MAINSRC += $(LIBTOMCRYPT_UNPACKNAME)/tests/test.c +MODULE += $(CONFIG_LIBTOMCRYPT_TEST) PROGNAME += $(CONFIG_LIBTOMCRYPT_TEST_PROGNAME) PRIORITY += $(CONFIG_LIBTOMCRYPT_TEST_PRIORITY) STACKSIZE += $(CONFIG_LIBTOMCRYPT_TEST_STACKSIZE) diff --git a/crypto/tinycrypt/Makefile b/crypto/tinycrypt/Makefile index 70cee243530..d5c2c0e9f34 100644 --- a/crypto/tinycrypt/Makefile +++ b/crypto/tinycrypt/Makefile @@ -104,10 +104,11 @@ ifeq ($(CONFIG_TINYCRYPT_CTR_PRNG),y) CSRCS += tinycrypt/lib/source/ctr_prng.c endif -ifeq ($(CONFIG_TINYCRYPT_TEST),y) +ifneq ($(CONFIG_TINYCRYPT_TEST),) CFLAGS += ${INCDIR_PREFIX}$(APPDIR)/crypto/tinycrypt/tinycrypt/tests/include CFLAGS += -DENABLE_TESTS CSRCS += tinycrypt/tests/test_ecc_utils.c + MODULE += $(CONFIG_TINYCRYPT_TEST) PRIORITY = $(CONFIG_TINYCRYPT_TEST_PRIORITY) STACKSIZE = $(CONFIG_TINYCRYPT_TEST_STACKSIZE) diff --git a/database/sqlite/Makefile b/database/sqlite/Makefile index cc1e6b4602b..3a109672f7b 100644 --- a/database/sqlite/Makefile +++ b/database/sqlite/Makefile @@ -36,6 +36,7 @@ ifneq ($(CONFIG_UTILS_SQLITE),) PROGNAME = sqlite3 PRIORITY = 100 STACKSIZE = ${CONFIG_UTILS_SQLITE_STACKSIZE} +MODULE = $(CONFIG_UTILS_SQLITE) MAINSRC = ${BUILDDIR}/shell.c endif @@ -67,4 +68,3 @@ ifeq ($(wildcard sqlite/.git),) endif include $(APPDIR)/Application.mk - diff --git a/logging/embedlog/Kconfig b/logging/embedlog/Kconfig index c6cad947caf..ce5dd19d36c 100644 --- a/logging/embedlog/Kconfig +++ b/logging/embedlog/Kconfig @@ -189,7 +189,7 @@ config EMBEDLOG_LOG_MAX int "Max length of log message" default 128 ---help--- - Maximum length of single log message. This defines length of finall + Maximum length of single log message. This defines length of final message, so message "foo() returned %s" may consume for example 200 bytes since '%s' may be a long string. Metadata like timestamp or file info uses this space too. Output log will be truncated if @@ -205,7 +205,7 @@ config EMBEDLOG_MEM_LINE_SIZE for more information about this. config EMBEDLOG_DEMO_PROGRAMS - bool "Compile demo programs" + tristate "Compile demo programs" default n ---help--- Compile demo programs that visualise how embedlog works. Also good diff --git a/logging/embedlog/Makefile b/logging/embedlog/Makefile index ef7b306f7d0..45d499bc059 100644 --- a/logging/embedlog/Makefile +++ b/logging/embedlog/Makefile @@ -168,10 +168,11 @@ CFLAGS += -DENABLE_OUT_NET=0 # nuttx does not implement clock() function CFLAGS += -DENABLE_CLOCK=0 -ifeq ($(CONFIG_EMBEDLOG_DEMO_PROGRAMS),y) +ifneq ($(CONFIG_EMBEDLOG_DEMO_PROGRAMS),) # build demo programs as library instead of standalone programs CFLAGS += -DEMBEDLOG_DEMO_LIBRARY + MODULE = $(CONFIG_EMBEDLOG_DEMO_PROGRAMS) PROGNAME = el_demo_print_memory PRIORITY = $(CONFIG_EMBEDLOG_DEMO_PROGRAMS_PRIORITY) STACKSIZE = $(CONFIG_EMBEDLOG_DEMO_PROGRAMS_STACKSIZE) diff --git a/math/libtommath/Makefile b/math/libtommath/Makefile index 91b47d46376..0d9fe26e43c 100644 --- a/math/libtommath/Makefile +++ b/math/libtommath/Makefile @@ -65,6 +65,7 @@ DEPPATH += --dep-path $(LIBTOMMATH_UNPACKNAME)/demo ifneq ($(CONFIG_LIBTOMMATH_TEST),) MAINSRC += test.c +MODULE += $(CONFIG_LIBTOMMATH_TEST) PROGNAME += $(CONFIG_LIBTOMMATH_TEST_PROGNAME) PRIORITY += $(CONFIG_LIBTOMMATH_TEST_PRIORITY) STACKSIZE += $(CONFIG_LIBTOMMATH_TEST_STACKSIZE) @@ -73,6 +74,7 @@ endif ifneq ($(CONFIG_LIBTOMMATH_MTEST_OPPONENT),) MAINSRC += mtest_opponent.c +MODULE += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT) PROGNAME += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT_PROGNAME) PRIORITY += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT_PRIORITY) STACKSIZE += $(CONFIG_LIBTOMMATH_MTEST_OPPONENT_STACKSIZE) @@ -81,6 +83,7 @@ endif ifneq ($(CONFIG_LIBTOMMATH_TIMING),) MAINSRC += timing.c +MODULE += $(CONFIG_LIBTOMMATH_TIMING) PROGNAME += $(CONFIG_LIBTOMMATH_TIMING_PROGNAME) PRIORITY += $(CONFIG_LIBTOMMATH_TIMING_PRIORITY) STACKSIZE += $(CONFIG_LIBTOMMATH_TIMING_STACKSIZE) @@ -91,6 +94,7 @@ MAINSRC += mtest.c VPATH += $(LIBTOMMATH_UNPACKNAME)/mtest DEPPATH += --dep-path $(LIBTOMMATH_UNPACKNAME)/mtest +MODULE += $(CONFIG_LIBTOMMATH_MTEST) PROGNAME += $(CONFIG_LIBTOMMATH_MTEST_PROGNAME) PRIORITY += $(CONFIG_LIBTOMMATH_MTEST_PRIORITY) STACKSIZE += $(CONFIG_LIBTOMMATH_MTEST_STACKSIZE) diff --git a/system/fdt/Kconfig b/system/fdt/Kconfig index 0d3af5e5491..1d9c7f23593 100644 --- a/system/fdt/Kconfig +++ b/system/fdt/Kconfig @@ -12,7 +12,7 @@ config SYSTEM_FDT if LIBC_FDT config SYSTEM_FDTDUMP - bool "system fdtdump command" + tristate "system fdtdump command" default n select SYSTEM_FDT ---help--- @@ -35,7 +35,7 @@ config SYSTEM_FDTDUMP_PRIORITY endif # SYSTEM_FDTDUMP config SYSTEM_FDTGET - bool "system fdtget command" + tristate "system fdtget command" default n select SYSTEM_FDT ---help--- @@ -58,7 +58,7 @@ config SYSTEM_FDTGET_PRIORITY endif # SYSTEM_FDTGET config SYSTEM_FDTPUT - bool "system fdtput command" + tristate "system fdtput command" default n select SYSTEM_FDT ---help--- @@ -81,7 +81,7 @@ config SYSTEM_FDTPUT_PRIORITY endif # SYSTEM_FDTPUT config SYSTEM_FDTOVERLAY - bool "system fdtoverlay command" + tristate "system fdtoverlay command" default n select SYSTEM_FDT ---help--- diff --git a/system/fdt/Makefile b/system/fdt/Makefile index 58329c89aa2..6b428469783 100644 --- a/system/fdt/Makefile +++ b/system/fdt/Makefile @@ -26,29 +26,33 @@ include $(APPDIR)/Make.defs CSRCS = util.c -ifeq ($(CONFIG_SYSTEM_FDTDUMP),y) +ifneq ($(CONFIG_SYSTEM_FDTDUMP),) MAINSRC += fdtdump.c + MODULE += $(CONFIG_SYSTEM_FDTDUMP) PROGNAME += fdtdump STACKSIZE += $(CONFIG_SYSTEM_FDTDUMP_STACKSIZE) PRIORITY += $(CONFIG_SYSTEM_FDTDUMP_PRIORITY) endif -ifeq ($(CONFIG_SYSTEM_FDTGET),y) +ifneq ($(CONFIG_SYSTEM_FDTGET),) MAINSRC += fdtget.c + MODULE += $(CONFIG_SYSTEM_FDTGET) PROGNAME += fdtget STACKSIZE += $(CONFIG_SYSTEM_FDTGET_STACKSIZE) PRIORITY += $(CONFIG_SYSTEM_FDTGET_PRIORITY) endif -ifeq ($(CONFIG_SYSTEM_FDTPUT),y) +ifneq ($(CONFIG_SYSTEM_FDTPUT),) MAINSRC += fdtput.c + MODULE += $(CONFIG_SYSTEM_FDTPUT) PROGNAME += fdtput STACKSIZE += $(CONFIG_SYSTEM_FDTPUT_STACKSIZE) PRIORITY += $(CONFIG_SYSTEM_FDTPUT_PRIORITY) endif -ifeq ($(CONFIG_SYSTEM_FDTOVERLAY),y) +ifneq ($(CONFIG_SYSTEM_FDTOVERLAY),) MAINSRC += fdtoverlay.c + MODULE += $(CONFIG_SYSTEM_FDTOVERLAY) PROGNAME += fdtoverlay STACKSIZE += $(CONFIG_SYSTEM_FDTOVERLAY_STACKSIZE) PRIORITY += $(CONFIG_SYSTEM_FDTOVERLAY_PRIORITY) diff --git a/system/libuv/Kconfig b/system/libuv/Kconfig index 6b2caf7eff9..b969cda9053 100644 --- a/system/libuv/Kconfig +++ b/system/libuv/Kconfig @@ -62,10 +62,10 @@ config LIBUV_UTILS_NONE bool "none" config LIBUV_UTILS_TEST - bool "uv_run_tests" + tristate "uv_run_tests" config LIBUV_UTILS_BENCHMARK - bool "uv_run_benchmarks" + tristate "uv_run_benchmarks" endchoice diff --git a/system/libuv/Makefile b/system/libuv/Makefile index b8d4e0d8b93..dec76cc1aa0 100644 --- a/system/libuv/Makefile +++ b/system/libuv/Makefile @@ -129,13 +129,14 @@ ifneq ($(CONFIG_NET_UDP),) CSRCS += udp.c endif -ifeq ($(findstring y,$(CONFIG_LIBUV_UTILS_TEST)$(CONFIG_LIBUV_UTILS_BENCHMARK)), y) +ifneq ($(CONFIG_LIBUV_UTILS_TEST)$(CONFIG_LIBUV_UTILS_BENCHMARK),) PRIORITY = $(CONFIG_LIBUV_UTILS_PRIORITY) STACKSIZE = $(CONFIG_LIBUV_UTILS_STACKSIZE) endif ifneq ($(CONFIG_LIBUV_UTILS_TEST),) +MODULE = $(CONFIG_LIBUV_UTILS_TEST) PROGNAME = uv_run_tests MAINSRC = run-tests.c @@ -148,6 +149,7 @@ endif ifneq ($(CONFIG_LIBUV_UTILS_BENCHMARK),) +MODULE = $(CONFIG_LIBUV_UTILS_BENCHMARK) PROGNAME = uv_run_benchmarks MAINSRC = run-benchmarks.c diff --git a/videoutils/x264/Makefile b/videoutils/x264/Makefile index 8faf0771a7f..b8f05ead456 100644 --- a/videoutils/x264/Makefile +++ b/videoutils/x264/Makefile @@ -239,7 +239,7 @@ $(OBJASM_G): $(PREFIX)%.$(ASMEXT)$(NASUFFIX)$(OBJEXT): %.$(ASMEXT) $(Q) $(AS) $(ASFLAGS) $< -o $@ ifneq ($(CONFIG_UTILS_X264),) - MODULE += CONFIG_UTILS_X264 + MODULE += $(CONFIG_UTILS_X264) PROGNAME += x264 PRIORITY += $(CONFIG_UTILS_X264_PRIORITY) STACKSIZE += $(CONFIG_UTILS_X264_STACKSIZE) @@ -282,4 +282,3 @@ distclean:: endif include $(APPDIR)/Application.mk -