From a0585cec572df54dae0d2369e558b98df3989f4a Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 1 Aug 2022 14:54:01 +0000 Subject: [PATCH 1/2] Fix naming in guix builds --- contrib/guix/libexec/prelude.bash | 2 +- contrib/shell/git-utils.bash | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash index 9705607119..dcc7885cd1 100644 --- a/contrib/guix/libexec/prelude.bash +++ b/contrib/guix/libexec/prelude.bash @@ -50,7 +50,7 @@ fi ################ VERSION="${VERSION:-$(git_head_version)}" -DISTNAME="${DISTNAME:-bitcoin-${VERSION}}" +DISTNAME="${DISTNAME:-elements-${VERSION}}" version_base_prefix="${PWD}/guix-build-" VERSION_BASE="${version_base_prefix}${VERSION}" # TOP diff --git a/contrib/shell/git-utils.bash b/contrib/shell/git-utils.bash index 37bac1f38d..1a9aaadf78 100644 --- a/contrib/shell/git-utils.bash +++ b/contrib/shell/git-utils.bash @@ -7,6 +7,7 @@ git_root() { git_head_version() { local recent_tag if recent_tag="$(git describe --exact-match HEAD 2> /dev/null)"; then + recent_tag="${recent_tag#elements-}" echo "${recent_tag#v}" else git rev-parse --short=12 HEAD From 7ab26e5fd36c60a2f33ecca98809b8ed94cd005c Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Mon, 1 Aug 2022 15:30:53 +0000 Subject: [PATCH 2/2] Fix elements naming in gitian builds --- contrib/gitian-descriptors/assign_DISTNAME | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/gitian-descriptors/assign_DISTNAME b/contrib/gitian-descriptors/assign_DISTNAME index f6ba157b6c..13469d6b75 100644 --- a/contrib/gitian-descriptors/assign_DISTNAME +++ b/contrib/gitian-descriptors/assign_DISTNAME @@ -5,6 +5,7 @@ # A helper script to be sourced into the gitian descriptors if RECENT_TAG="$(git describe --exact-match HEAD 2> /dev/null)"; then + RECENT_TAG="${RECENT_TAG#elements-}" VERSION="${RECENT_TAG#v}" else VERSION="$(git rev-parse --short=12 HEAD)"