mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 14:00:19 +00:00 
			
		
		
		
	The linux changes since v3.16 are 78283edf2c01 kbuild: setlocalversion: print error to STDERR b24413180f56 License cleanup: add SPDX GPL-2.0 license identifier to files with no license 6147b1cf1965 scripts/setlocalversion: git: Make -dirty check more robust 8ef14c2c41d9 Revert "scripts/setlocalversion: git: Make -dirty check more robust" ff64dd485730 scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks 7a82e3fa28f1 scripts/setlocalversion: clear local variable to make it work for sh 991b78fbd223 scripts: setlocalversion: fix a bashism 3c96bdd0ebfa scripts: setlocalversion: replace backquote to dollar parenthesis and it's ff64dd485730 that is the motivation for this sync. It fixes false positive "-dirty" added to the version string when building with Yocto (https://lists.openembedded.org/g/openembedded-core/message/137702). There has been one U-Boot specific patch since this was synced with linux 3.16: 81630a3b38c2 (scripts: setlocalversion: safely extract variables from auto.conf using awk). Keep these changes applied. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> [trini: Re-add 81630a3b38c2 and reword message] Signed-off-by: Tom Rini <trini@konsulko.com>
		
			
				
	
	
		
			188 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			188 lines
		
	
	
		
			4.6 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
# SPDX-License-Identifier: GPL-2.0
 | 
						|
#
 | 
						|
# This scripts adds local version information from the version
 | 
						|
# control systems git, mercurial (hg) and subversion (svn).
 | 
						|
#
 | 
						|
# If something goes wrong, send a mail the kernel build mailinglist
 | 
						|
# (see MAINTAINERS) and CC Nico Schottelius
 | 
						|
# <nico-linuxsetlocalversion -at- schottelius.org>.
 | 
						|
#
 | 
						|
#
 | 
						|
 | 
						|
usage() {
 | 
						|
	echo "Usage: $0 [--save-scmversion] [srctree]" >&2
 | 
						|
	exit 1
 | 
						|
}
 | 
						|
 | 
						|
scm_only=false
 | 
						|
srctree=.
 | 
						|
if test "$1" = "--save-scmversion"; then
 | 
						|
	scm_only=true
 | 
						|
	shift
 | 
						|
fi
 | 
						|
if test $# -gt 0; then
 | 
						|
	srctree=$1
 | 
						|
	shift
 | 
						|
fi
 | 
						|
if test $# -gt 0 -o ! -d "$srctree"; then
 | 
						|
	usage
 | 
						|
fi
 | 
						|
 | 
						|
scm_version()
 | 
						|
{
 | 
						|
	local short
 | 
						|
	short=false
 | 
						|
 | 
						|
	cd "$srctree"
 | 
						|
	if test -e .scmversion; then
 | 
						|
		cat .scmversion
 | 
						|
		return
 | 
						|
	fi
 | 
						|
	if test "$1" = "--short"; then
 | 
						|
		short=true
 | 
						|
	fi
 | 
						|
 | 
						|
	# Check for git and a git repo.
 | 
						|
	if test -z "$(git rev-parse --show-cdup 2>/dev/null)" &&
 | 
						|
	   head=$(git rev-parse --verify --short HEAD 2>/dev/null); then
 | 
						|
 | 
						|
		# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
 | 
						|
		# it, because this version is defined in the top level Makefile.
 | 
						|
		if [ -z "$(git describe --exact-match 2>/dev/null)" ]; then
 | 
						|
 | 
						|
			# If only the short version is requested, don't bother
 | 
						|
			# running further git commands
 | 
						|
			if $short; then
 | 
						|
				echo "+"
 | 
						|
				return
 | 
						|
			fi
 | 
						|
			# If we are past a tagged commit (like
 | 
						|
			# "v2.6.30-rc5-302-g72357d5"), we pretty print it.
 | 
						|
			if atag="$(git describe 2>/dev/null)"; then
 | 
						|
				echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
 | 
						|
 | 
						|
			# If we don't have a tag at all we print -g{commitish}.
 | 
						|
			else
 | 
						|
				printf '%s%s' -g $head
 | 
						|
			fi
 | 
						|
		fi
 | 
						|
 | 
						|
		# Is this git on svn?
 | 
						|
		if git config --get svn-remote.svn.url >/dev/null; then
 | 
						|
			printf -- '-svn%s' "$(git svn find-rev $head)"
 | 
						|
		fi
 | 
						|
 | 
						|
		# Check for uncommitted changes.
 | 
						|
		# First, with git-status, but --no-optional-locks is only
 | 
						|
		# supported in git >= 2.14, so fall back to git-diff-index if
 | 
						|
		# it fails. Note that git-diff-index does not refresh the
 | 
						|
		# index, so it may give misleading results. See
 | 
						|
		# git-update-index(1), git-diff-index(1), and git-status(1).
 | 
						|
		if {
 | 
						|
			git --no-optional-locks status -uno --porcelain 2>/dev/null ||
 | 
						|
			git diff-index --name-only HEAD
 | 
						|
		} | grep -qvE '^(.. )?scripts/package'; then
 | 
						|
			printf '%s' -dirty
 | 
						|
		fi
 | 
						|
 | 
						|
		# All done with git
 | 
						|
		return
 | 
						|
	fi
 | 
						|
 | 
						|
	# Check for mercurial and a mercurial repo.
 | 
						|
	if test -d .hg && hgid=$(hg id 2>/dev/null); then
 | 
						|
		# Do we have an tagged version?  If so, latesttagdistance == 1
 | 
						|
		if [ "$(hg log -r . --template '{latesttagdistance}')" = "1" ]; then
 | 
						|
			id=$(hg log -r . --template '{latesttag}')
 | 
						|
			printf '%s%s' -hg "$id"
 | 
						|
		else
 | 
						|
			tag=$(printf '%s' "$hgid" | cut -d' ' -f2)
 | 
						|
			if [ -z "$tag" -o "$tag" = tip ]; then
 | 
						|
				id=$(printf '%s' "$hgid" | sed 's/[+ ].*//')
 | 
						|
				printf '%s%s' -hg "$id"
 | 
						|
			fi
 | 
						|
		fi
 | 
						|
 | 
						|
		# Are there uncommitted changes?
 | 
						|
		# These are represented by + after the changeset id.
 | 
						|
		case "$hgid" in
 | 
						|
			*+|*+\ *) printf '%s' -dirty ;;
 | 
						|
		esac
 | 
						|
 | 
						|
		# All done with mercurial
 | 
						|
		return
 | 
						|
	fi
 | 
						|
 | 
						|
	# Check for svn and a svn repo.
 | 
						|
	if rev=$(LANG= LC_ALL= LC_MESSAGES=C svn info 2>/dev/null | grep '^Last Changed Rev'); then
 | 
						|
		rev=$(echo $rev | awk '{print $NF}')
 | 
						|
		printf -- '-svn%s' "$rev"
 | 
						|
 | 
						|
		# All done with svn
 | 
						|
		return
 | 
						|
	fi
 | 
						|
}
 | 
						|
 | 
						|
collect_files()
 | 
						|
{
 | 
						|
	local file res=
 | 
						|
 | 
						|
	for file; do
 | 
						|
		case "$file" in
 | 
						|
		*\~*)
 | 
						|
			continue
 | 
						|
			;;
 | 
						|
		esac
 | 
						|
		if test -e "$file"; then
 | 
						|
			res="$res$(cat "$file")"
 | 
						|
		fi
 | 
						|
	done
 | 
						|
	echo "$res"
 | 
						|
}
 | 
						|
 | 
						|
if $scm_only; then
 | 
						|
	if test ! -e .scmversion; then
 | 
						|
		res=$(scm_version)
 | 
						|
		echo "$res" >.scmversion
 | 
						|
	fi
 | 
						|
	exit
 | 
						|
fi
 | 
						|
 | 
						|
if test -e include/config/auto.conf; then
 | 
						|
	# We are interested only in CONFIG_LOCALVERSION and
 | 
						|
	# CONFIG_LOCALVERSION_AUTO, so extract these in a safe
 | 
						|
	# way (i.e. w/o sourcing auto.conf)
 | 
						|
	CONFIG_LOCALVERSION=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION=/ {print $2}'`
 | 
						|
	CONFIG_LOCALVERSION_AUTO=`cat include/config/auto.conf | awk -F '=' '/^CONFIG_LOCALVERSION_AUTO=/ {print $2}'`
 | 
						|
else
 | 
						|
	echo "Error: kernelrelease not valid - run 'make prepare' to update it" >&2
 | 
						|
	exit 1
 | 
						|
fi
 | 
						|
 | 
						|
# localversion* files in the build and source directory
 | 
						|
res="$(collect_files localversion*)"
 | 
						|
if test ! "$srctree" -ef .; then
 | 
						|
	res="$res$(collect_files "$srctree"/localversion*)"
 | 
						|
fi
 | 
						|
 | 
						|
# CONFIG_LOCALVERSION and LOCALVERSION (if set)
 | 
						|
res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}"
 | 
						|
 | 
						|
# scm version string if not at a tagged commit
 | 
						|
if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
 | 
						|
	# full scm version string
 | 
						|
	res="$res$(scm_version)"
 | 
						|
else
 | 
						|
	# append a plus sign if the repository is not in a clean
 | 
						|
	# annotated or signed tagged state (as git describe only
 | 
						|
	# looks at signed or annotated tags - git tag -a/-s) and
 | 
						|
	# LOCALVERSION= is not specified
 | 
						|
	if test "${LOCALVERSION+set}" != "set"; then
 | 
						|
		scm=$(scm_version --short)
 | 
						|
		res="$res${scm:++}"
 | 
						|
	fi
 | 
						|
fi
 | 
						|
 | 
						|
echo "$res"
 |