Merge branch 'zephyrproject-rtos:main' into board/fobe_quill_nrf52840_mesh

Author: chihosin

doc/build/version/index.rst

@@ -12,6 +12,7 @@ multiple scopes, including:
 * Code (C/C++)
 * Kconfig
 * CMake
+* Shell
 
 which makes it a very versatile system for lifecycle management of applications. In addition, it
 can be used when building applications which target supported bootloaders (e.g. MCUboot) allowing
@@ -195,3 +196,18 @@ Use in MCUboot-supported applications
 No additional configuration needs to be done to the target application so long as it is configured
 to support MCUboot and a signed image is generated, the version information will be automatically
 included in the image data.
+
+Use in Shell
+============
+
+When a shell interface is configured, the following commands are available to retrieve application version information:
+
++----------------------+-----------------------------+-------------------------+
+| Command              | Variable                    | Example                 |
++----------------------+-----------------------------+-------------------------+
+| app version          | APP_VERSION_STRING          | 1.2.3-unstable.5        |
++----------------------+-----------------------------+-------------------------+
+| app version-extended | APP_VERSION_EXTENDED_STRING | 1.2.3-unstable.5+4      |
++----------------------+-----------------------------+-------------------------+
+| app build-version    | APP_BUILD_VERSION           | v3.3.0-18-g2c85d9224fca |
++----------------------+-----------------------------+-------------------------+

subsys/bluetooth/host/classic/shell/goep.c

@@ -98,14 +98,14 @@ static bool goep_parse_headers_cb(struct bt_obex_hdr *hdr, void *user_data)
 	switch (hdr->id) {
 	case BT_OBEX_HEADER_ID_APP_PARAM:
 	case BT_OBEX_HEADER_ID_AUTH_CHALLENGE:
-	case BT_OBEX_HEADER_ID_AUTH_RSP:
+	case BT_OBEX_HEADER_ID_AUTH_RSP: {
 		int err;
 
 		err = bt_obex_tlv_parse(hdr->len, hdr->data, goep_parse_tlvs_cb, NULL);
 		if (err) {
 			bt_shell_error("Fail to parse OBEX TLV triplet");
 		}
-		break;
+	} break;
 	default:
 		bt_shell_hexdump(hdr->data, hdr->len);
 		break;

subsys/shell/modules/CMakeLists.txt

@@ -16,3 +16,7 @@ zephyr_sources_ifdef(
   CONFIG_DEVMEM_SHELL
   devmem_service.c
   )
+zephyr_sources_ifdef(
+  CONFIG_APP_VERSION_SHELL
+  app_version_service.c
+  )

subsys/shell/modules/Kconfig

@@ -22,4 +22,11 @@ config DEVMEM_SHELL
 	help
 	  This shell command provides read/write access to physical memory.
 
+config APP_VERSION_SHELL
+	bool "Application version information shell"
+	default y if !SHELL_MINIMAL
+	depends on "$(APP_VERSION_EXTENDED_STRING)" != ""
+	help
+	  This shell command provides read access to application version information.
+
 rsource "kernel_service/Kconfig"

subsys/shell/modules/app_version_service.c

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2025 Alex Fabre
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "app_version.h"
+#include <zephyr/shell/shell.h>
+
+static int cmd_app_version_string(const struct shell *sh)
+{
+	shell_print(sh, APP_VERSION_STRING);
+	return 0;
+}
+
+static int cmd_app_version_extended_string(const struct shell *sh)
+{
+	shell_print(sh, APP_VERSION_EXTENDED_STRING);
+	return 0;
+}
+
+static int cmd_app_build_version(const struct shell *sh)
+{
+	shell_print(sh, STRINGIFY(APP_BUILD_VERSION));
+	return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(
+	sub_app,
+	SHELL_CMD(version, NULL, "Application version. (ex. \"1.2.3-unstable.5\")",
+		  cmd_app_version_string),
+	SHELL_CMD(version - extended, NULL,
+		  "Application version extended. (ex. \"1.2.3-unstable.5+4\")",
+		  cmd_app_version_extended_string),
+	SHELL_CMD(build - version, NULL,
+		  "Application build version. (ex. \"v3.3.0-18-g2c85d9224fca\")",
+		  cmd_app_build_version),
+	SHELL_SUBCMD_SET_END /* Array terminated. */
+);
+
+SHELL_CMD_REGISTER(app, &sub_app, "Application version information commands", NULL);

tests/kernel/mem_protect/mem_map/boards/qemu_x86_tiny.conf

@@ -5,4 +5,4 @@
 # Adjust this so that test_k_mem_map_unmap memory exhaustion
 # test can run without failure, as we may run of free pages
 # when there are changes in code and data size.
-CONFIG_DEMAND_PAGING_PAGE_FRAMES_RESERVE=30
+CONFIG_DEMAND_PAGING_PAGE_FRAMES_RESERVE=27