From f468e26cd92f2e4c9b966b81ce79e57d296049d3 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Wed, 14 Jul 2021 11:47:19 +0200 Subject: [PATCH] Revert "Fix RELEASE build comparison with mkversion output" This reverts commit ea7c9cc, which obviously only made things worse. The correct fix seems to be to use -f and have the same external arg in both places. Signed-off-by: Joachim Wiberg --- Config.in | 2 +- board/common/post-image.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Config.in b/Config.in index b145af7..9b3dcf1 100644 --- a/Config.in +++ b/Config.in @@ -37,7 +37,7 @@ config DEMO_VENDOR_HOME config DEMO_VENDOR_VERSION string "Version of operating system, may be a script with ``" - default "`$BR2_EXTERNAL_NETBOX_PATH/bin/mkversion`" + default "`$BR2_EXTERNAL_NETBOX_PATH/bin/mkversion $BR2_EXTERNAL_DEMO_PATH`" help A lower-case string (no spaces or other characters outside of 0–9, a–z, '.', '_' and '-') identifying the operating system diff --git a/board/common/post-image.sh b/board/common/post-image.sh index 77e2d54..01d5a49 100755 --- a/board/common/post-image.sh +++ b/board/common/post-image.sh @@ -8,7 +8,8 @@ err=0 ver="" if [ -n "$RELEASE" ]; then - ver="-$($BR2_EXTERNAL_NETBOX_PATH/bin/mkversion)" + # NOTE: Must use `-f $BR2_EXTERNAL` here to get, e.g. app-demo GIT version + ver="-$($BR2_EXTERNAL_NETBOX_PATH/bin/mkversion -f $BR2_EXTERNAL)" if [ "$RELEASE" != "$ver" ]; then echo "==============================================================================="