erofs-utils: use $EROFS_UTILS_VERSION, if set, as the version
authorAhelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Fri, 16 Aug 2024 03:05:41 +0000 (05:05 +0200)
committerGao Xiang <hsiangkao@linux.alibaba.com>
Fri, 16 Aug 2024 06:24:09 +0000 (14:24 +0800)
This lets downstreams embed the unpolluted downstream version;
when building the Debian package (from gbp) the resulting binary yields
  $ mkfs.erofs
  <E> 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
  <E> erofs: missing argument: FILE
  mkfs.erofs 1.8.1-1
  Try 'mkfs.erofs --help' for more information.

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Link: https://lore.kernel.org/r/gho2b67qax222ewv5xb5cjkkgjgzftr3pyecl536g6jshcfexa@tarta.nabijaczleweli.xyz
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
scripts/get-version-number

index 26f0b5acb753251e75bc44d223b282c6c67e083e..d216b7a424e0a4f15d361039c8e9f59650ca6921 100755 (executable)
@@ -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