mirror of
https://github.com/systemd/systemd
synced 2024-07-21 10:17:21 +00:00
aa314c87c5
We generate a "version string" that is reported by various tools. This patch changes this version string to use the characters specified for the version string in the Boot Loader Specification. We start using the special characters we have in the spec for this exact purpose and thus fix version comparisons. We also stop using '+' which is not part of the allowed charset and is used for boot attempt counting and should not be part of the version string. The version string is (among other places) used in sd-boot and the comparison result is used by 'bootctl update' to decide whether to install a new binary. Before, because 'nn-rc1' compares higher than 'nn', we would refuse to upgrade pre-release versions. The boot loader is the primary motivation. I'm not aware of programatic version comparisons in other places, but it makes sense to use the same versions string everywhere. (This patch effectively only matters for non-distro builds, because distro builds presumably use -Dversion-tag to set something meaningful. Ideally, those version strings are compatible with our version strings, but this is outside of our control.)
20 lines
637 B
Bash
Executable file
20 lines
637 B
Bash
Executable file
#!/usr/bin/env bash
|
|
# SPDX-License-Identifier: LGPL-2.1-or-later
|
|
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
dir="${1:?}"
|
|
fallback="${2:?}"
|
|
|
|
# Apparently git describe has a bug where it always considers the work-tree
|
|
# dirty when invoked with --git-dir (even though 'git status' is happy). Work
|
|
# around this issue by cd-ing to the source directory.
|
|
cd "$dir"
|
|
# Check that we have either .git/ (a normal clone) or a .git file (a work-tree)
|
|
# and that we don't get confused if a tarball is extracted in a higher-level
|
|
# git repository.
|
|
[ -e .git ] && \
|
|
git describe --abbrev=7 --dirty=^ 2>/dev/null | sed 's/^v//; s/-rc/~rc/' || \
|
|
echo "$fallback"
|