[nrf noup] nrfconnect: Use version string with tweak

LuDuda · LuDuda · commit df753b22ec08 · 2024-02-25T12:39:39.000+01:00
This commit modifies the string format of versioning to include tweak.

Signed-off-by: Łukasz Duda &lt;lukasz.duda@nordicsemi.no&gt;
diff --git a/config/zephyr/ota-image.cmake b/config/zephyr/ota-image.cmake
@@ -40,7 +40,7 @@ function(chip_ota_image TARGET_NAME)
             "--version"
             ${APPVERSION}
             "--version-str"
-            ${APP_VERSION_STRING}
+            ${APP_VERSION_TWEAK_STRING}
             "--digest-algorithm"
             "sha256"
         )
diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -94,7 +94,7 @@
 #ifdef CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
 #define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING CONFIG_CHIP_DEVICE_SOFTWARE_VERSION_STRING
 #else
-#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING APP_VERSION_STRING
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING APP_VERSION_TWEAK_STRING
 #endif
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ function(chip_ota_image TARGET_NAME)`
`40`	`40`	`"--version"`
`41`	`41`	`${APPVERSION}`
`42`	`42`	`"--version-str"`
`43`		`- ${APP_VERSION_STRING}`
	`43`	`+ ${APP_VERSION_TWEAK_STRING}`
`44`	`44`	`"--digest-algorithm"`
`45`	`45`	`"sha256"`
`46`	`46`	`)`