From fdf8461452b48ce63f2c825ef0ac352db1a06fc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Thu, 11 Nov 2021 10:43:41 +0100 Subject: [PATCH] ver: print PX4_BOARD_LABEL for 'ver all' --- src/lib/version/CMakeLists.txt | 1 + src/lib/version/version.h | 8 ++++++++ src/systemcmds/ver/ver.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/src/lib/version/CMakeLists.txt b/src/lib/version/CMakeLists.txt index 4c445eaf24..1a961eef5f 100644 --- a/src/lib/version/CMakeLists.txt +++ b/src/lib/version/CMakeLists.txt @@ -79,6 +79,7 @@ add_library(version version.c) target_compile_definitions(version PUBLIC PX4_BOARD_NAME="${PX4_BOARD_NAME}" + PX4_BOARD_LABEL="${PX4_BOARD_LABEL}" PRIVATE BUILD_URI=${BUILD_URI} ) diff --git a/src/lib/version/version.h b/src/lib/version/version.h index 2190fefdbf..ef2d9b5f09 100644 --- a/src/lib/version/version.h +++ b/src/lib/version/version.h @@ -56,6 +56,14 @@ static inline const char *px4_board_name(void) return PX4_BOARD_NAME; } +/** + * get the board build target variant + */ +static inline const char *px4_board_target_label(void) +{ + return PX4_BOARD_LABEL; +} + /** * get the board sub type */ diff --git a/src/systemcmds/ver/ver.c b/src/systemcmds/ver/ver.c index 34806eb291..b5e9885f07 100644 --- a/src/systemcmds/ver/ver.c +++ b/src/systemcmds/ver/ver.c @@ -217,6 +217,9 @@ int ver_main(int argc, char *argv[]) } + if (show_all) { + printf("Build variant: %s\n", px4_board_target_label()); + } if (show_all || !strncmp(argv[1], sz_ver_gcc_str, sizeof(sz_ver_gcc_str))) { printf("Toolchain: %s, %s\n", px4_toolchain_name(), px4_toolchain_version());