Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-02 09:46:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

scripts/setlocalversion: sync with linux v6.15

Browse Source 
The changes upstream since the last sync at commit 5c02350fa0
("scripts/setlocalversion: sync with linux v6.9") are

e2ff1219a554 setlocalversion: add -e option
523f3dbc187a setlocalversion: work around "git describe" performance

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
2025-05-26 07:35:10 -06:00
parent 8c986521c3
commit ef0eec3fa9
1 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
scripts/setlocalversion
View File

@@ -10,6 +10,8 @@
#
#
set -e
usage() {
echo "Usage: $0 [--no-local] [srctree]" >&2
exit 1
@@ -30,6 +32,29 @@ if test $# -gt 0 -o ! -d "$srctree"; then
usage
fi
try_tag() {
tag="$1"
# Is $tag an annotated tag?
if [ "$(git cat-file -t "$tag" 2> /dev/null)" != tag ]; then
return
fi
# Is it an ancestor of HEAD, and if so, how many commits are in $tag..HEAD?
# shellcheck disable=SC2046 # word splitting is the point here
set -- $(git rev-list --count --left-right "$tag"...HEAD 2> /dev/null)
# $1 is 0 if and only if $tag is an ancestor of HEAD. Use
# string comparison, because $1 is empty if the 'git rev-list'
# command somehow failed.
if [ "$1" != 0 ]; then
return
fi
# $2 is the number of commits in the range $tag..HEAD, possibly 0.
count="$2"
}
scm_version()
{
local short=false
@@ -61,33 +86,33 @@ scm_version()
# stable kernel: 6.1.7 -> v6.1.7
version_tag=v$(echo "${KERNELVERSION}" | sed -E 's/^([0-9]+\.[0-9]+)\.0(.*)$/\1\2/')
# try_tag initializes count if the tag is usable.
count=
# If a localversion* file exists, and the corresponding
# annotated tag exists and is an ancestor of HEAD, use
# it. This is the case in linux-next.
tag=${file_localversion#-}
desc=
if [ -n "${tag}" ]; then
desc=$(git describe --match=$tag 2>/dev/null)
if [ -n "${file_localversion#-}" ] ; then
try_tag "${file_localversion#-}"
fi
# Otherwise, if a localversion* file exists, and the tag
# obtained by appending it to the tag derived from
# KERNELVERSION exists and is an ancestor of HEAD, use
# it. This is e.g. the case in linux-rt.
if [ -z "${desc}" ] && [ -n "${file_localversion}" ]; then
tag="${version_tag}${file_localversion}"
desc=$(git describe --match=$tag 2>/dev/null)
if [ -z "${count}" ] && [ -n "${file_localversion}" ]; then
try_tag "${version_tag}${file_localversion}"
fi
# Otherwise, default to the annotated tag derived from KERNELVERSION.
if [ -z "${desc}" ]; then
tag="${version_tag}"
desc=$(git describe --match=$tag 2>/dev/null)
if [ -z "${count}" ]; then
try_tag "${version_tag}"
fi
# If we are at the tagged commit, we ignore it because the version is
# well-defined.
if [ "${tag}" != "${desc}" ]; then
# If we are at the tagged commit, we ignore it because the
# version is well-defined. If none of the attempted tags exist
# or were usable, $count is still empty.
if [ -z "${count}" ] || [ "${count}" -gt 0 ]; then
# If only the short version is requested, don't bother
# running further git commands
@@ -95,14 +120,15 @@ scm_version()
echo "+"
return
fi
# If we are past the tagged commit, we pretty print it.
# (like 6.1.0-14595-g292a089d78d3)
if [ -n "${desc}" ]; then
echo "${desc}" | awk -F- '{printf("-%05d", $(NF-1))}'
if [ -n "${count}" ]; then
printf "%s%05d" "-" "${count}"
fi
# Add -g and exactly 12 hex chars.
printf '%s%s' -g "$(echo $head | cut -c1-12)"
printf '%s%.12s' -g "$head"
fi
if ${no_dirty}; then