mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-11-01 09:13:37 +00:00 
			
		
		
		
	The previous commit fixed up all shell scripts to not include
include/config/auto.conf.
Now that include/config/auto.conf is only included by Makefiles,
we can change it into a more Make-friendly form.
Previously, Kconfig output string values enclosed with double-quotes
(both in the .config and include/config/auto.conf):
    CONFIG_X="foo bar"
Unlike shell, Make handles double-quotes (and single-quotes as well)
verbatim. We must rip them off when used.
There are some patterns:
  [1] $(patsubst "%",%,$(CONFIG_X))
  [2] $(CONFIG_X:"%"=%)
  [3] $(subst ",,$(CONFIG_X))
  [4] $(shell echo $(CONFIG_X))
These are not only ugly, but also fragile.
[1] and [2] do not work if the value contains spaces, like
   CONFIG_X=" foo bar "
[3] does not work correctly if the value contains double-quotes like
   CONFIG_X="foo\"bar"
[4] seems to work better, but has a cost of forking a process.
Anyway, quoted strings were always PITA for our Makefiles.
This commit changes Kconfig to stop quoting in include/config/auto.conf.
These are the string type symbols referenced in Makefiles or scripts:
    ACPI_CUSTOM_DSDT_FILE
    ARC_BUILTIN_DTB_NAME
    ARC_TUNE_MCPU
    BUILTIN_DTB_SOURCE
    CC_IMPLICIT_FALLTHROUGH
    CC_VERSION_TEXT
    CFG80211_EXTRA_REGDB_KEYDIR
    EXTRA_FIRMWARE
    EXTRA_FIRMWARE_DIR
    EXTRA_TARGETS
    H8300_BUILTIN_DTB
    INITRAMFS_SOURCE
    LOCALVERSION
    MODULE_SIG_HASH
    MODULE_SIG_KEY
    NDS32_BUILTIN_DTB
    NIOS2_DTB_SOURCE
    OPENRISC_BUILTIN_DTB
    SOC_CANAAN_K210_DTB_SOURCE
    SYSTEM_BLACKLIST_HASH_LIST
    SYSTEM_REVOCATION_KEYS
    SYSTEM_TRUSTED_KEYS
    TARGET_CPU
    UNUSED_KSYMS_WHITELIST
    XILINX_MICROBLAZE0_FAMILY
    XILINX_MICROBLAZE0_HW_VER
    XTENSA_VARIANT_NAME
I checked them one by one, and fixed up the code where necessary.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
		
	
			
		
			
				
	
	
		
			145 lines
		
	
	
	
		
			3.6 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable file
		
	
	
	
	
			
		
		
	
	
			145 lines
		
	
	
	
		
			3.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 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", $(NF-1))}'
 | 
						|
			fi
 | 
						|
 | 
						|
			# Add -g and exactly 12 hex chars.
 | 
						|
			printf '%s%s' -g "$(echo $head | cut -c1-12)"
 | 
						|
		fi
 | 
						|
 | 
						|
		# Check for uncommitted changes.
 | 
						|
		# This script must avoid any write attempt to the source tree,
 | 
						|
		# which might be read-only.
 | 
						|
		# You cannot use 'git describe --dirty' because it tries to
 | 
						|
		# create .git/index.lock .
 | 
						|
		# 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
 | 
						|
		} | read dummy; then
 | 
						|
			printf '%s' -dirty
 | 
						|
		fi
 | 
						|
	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
 | 
						|
	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)
 | 
						|
config_localversion=$(sed -n 's/^CONFIG_LOCALVERSION=\(.*\)$/\1/p' include/config/auto.conf)
 | 
						|
res="${res}${config_localversion}${LOCALVERSION}"
 | 
						|
 | 
						|
# scm version string if not at a tagged commit
 | 
						|
if grep -q "^CONFIG_LOCALVERSION_AUTO=y$" include/config/auto.conf; then
 | 
						|
	# full scm version string
 | 
						|
	res="$res$(scm_version)"
 | 
						|
elif [ "${LOCALVERSION+set}" != "set" ]; then
 | 
						|
	# If the variable LOCALVERSION is not set, 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).
 | 
						|
	#
 | 
						|
	# If the variable LOCALVERSION is set (including being set
 | 
						|
	# to an empty string), we don't want to append a plus sign.
 | 
						|
	scm=$(scm_version --short)
 | 
						|
	res="$res${scm:++}"
 | 
						|
fi
 | 
						|
 | 
						|
echo "$res"
 |