From c469131828a5062eeb3047309cf69af55f6c7db4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ahelenia=20Ziemia=C5=84ska?= Date: Fri, 16 Aug 2024 05:05:41 +0200 Subject: [PATCH] erofs-utils: use $EROFS_UTILS_VERSION, if set, as the version MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This lets downstreams embed the unpolluted downstream version; when building the Debian package (from gbp) the resulting binary yields $ mkfs.erofs erofs: missing argument: FILE mkfs.erofs 1.8.1-fead89d91-dirty Try 'mkfs.erofs --help' for more information. Now, d/rules can export EROFS_UTILS_VERSION := $(shell IFS="$$IFS()" read -r _ v _ < debian/changelog; echo "$$v") yielding $ mkfs.erofs erofs: missing argument: FILE mkfs.erofs 1.8.1-1 Try 'mkfs.erofs --help' for more information. Signed-off-by: Ahelenia Ziemiańska Link: https://lore.kernel.org/r/gho2b67qax222ewv5xb5cjkkgjgzftr3pyecl536g6jshcfexa@tarta.nabijaczleweli.xyz Signed-off-by: Gao Xiang --- scripts/get-version-number | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/get-version-number b/scripts/get-version-number index 26f0b5a..d216b7a 100755 --- a/scripts/get-version-number +++ b/scripts/get-version-number @@ -9,7 +9,7 @@ scm_version() # If we are at a tagged commit, we ignore it. if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then # Add -g and 8 hex chars. - printf '%s%s' -g "$(echo $head | cut -c1-8)" + printf -- '-g%.8s' "$head" fi # Check for uncommitted changes. # This script must avoid any write attempt to the source tree, @@ -30,4 +30,8 @@ scm_version() fi } -echo $(sed -n '1p' VERSION | tr -d '\n')$(scm_version) +if [ -n "$EROFS_UTILS_VERSION" ]; then + echo "$EROFS_UTILS_VERSION" +else + echo $(head -n1 VERSION)$(scm_version) +fi -- 2.34.1