[ptxdist] [PATCH] ptxd_make_vcs_version: always use all Git tags

[ptxdist] [PATCH] ptxd_make_vcs_version: always use all Git tags

[Roland Hieber]

The short-circuit results in a preference of signed tags over non-signed
tags. In BSPs where non-signed tags exist (e.g. DistroKit-2023.09.0)
that are newer than the latest signed tag (e.g. DistroKit-2019.12.0),
this will always lead to an unnecessarily old tag being used.

Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
Steffen, do you still know why you chose a plain "git describe" first?


 scripts/lib/ptxd_make_vcs_version.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/lib/ptxd_make_vcs_version.sh b/scripts/lib/ptxd_make_vcs_version.sh
index 69e486ab31a5..d59e1eba9872 100644
--- a/scripts/lib/ptxd_make_vcs_version.sh
+++ b/scripts/lib/ptxd_make_vcs_version.sh
@@ -7,8 +7,7 @@
 #
 
 ptxd_make_vcs_version() {
-    PTXDIST_VCS_VERSION="$(git describe 2>/dev/null || \
-			   git describe --always --tags 2>/dev/null)"
+    PTXDIST_VCS_VERSION="$(git describe --always --tags 2>/dev/null)"
 
     if [ -z "${PTXDIST_VCS_VERSION}" ]; then
 	PTXDIST_VCS_VERSION="unknown"
-- 
2.39.2

Re: [ptxdist] [PATCH] ptxd_make_vcs_version: always use all Git tags

[Alexander Dahl]

Hello Roland,

Am Tue, Sep 26, 2023 at 10:32:05AM +0200 schrieb Roland Hieber:
> The short-circuit results in a preference of signed tags over non-signed
> tags. In BSPs where non-signed tags exist (e.g. DistroKit-2023.09.0)
> that are newer than the latest signed tag (e.g. DistroKit-2019.12.0),
> this will always lead to an unnecessarily old tag being used.

Maybe this thread from 2018 can help (been there, tried that):

https://lore.ptxdist.org/ptxdist/20180907100105.nleg2qmttyahcmzm@pengutronix.de/

Greets
Alex

> 
> Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> Steffen, do you still know why you chose a plain "git describe" first?
> 
> 
>  scripts/lib/ptxd_make_vcs_version.sh | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/scripts/lib/ptxd_make_vcs_version.sh b/scripts/lib/ptxd_make_vcs_version.sh
> index 69e486ab31a5..d59e1eba9872 100644
> --- a/scripts/lib/ptxd_make_vcs_version.sh
> +++ b/scripts/lib/ptxd_make_vcs_version.sh
> @@ -7,8 +7,7 @@
>  #
>  
>  ptxd_make_vcs_version() {
> -    PTXDIST_VCS_VERSION="$(git describe 2>/dev/null || \
> -			   git describe --always --tags 2>/dev/null)"
> +    PTXDIST_VCS_VERSION="$(git describe --always --tags 2>/dev/null)"
>  
>      if [ -z "${PTXDIST_VCS_VERSION}" ]; then
>  	PTXDIST_VCS_VERSION="unknown"
> -- 
> 2.39.2
> 
>