Commit 62052be3 authored by Michal Marek's avatar Michal Marek

Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes

Conflicts:
	Makefile
parents d5eda75f 0a564b26
...@@ -883,80 +883,10 @@ PHONY += $(vmlinux-dirs) ...@@ -883,80 +883,10 @@ PHONY += $(vmlinux-dirs)
$(vmlinux-dirs): prepare scripts $(vmlinux-dirs): prepare scripts
$(Q)$(MAKE) $(build)=$@ $(Q)$(MAKE) $(build)=$@
# Build the kernel release string
#
# The KERNELRELEASE value built here is stored in the file
# include/config/kernel.release, and is used when executing several
# make targets, such as "make install" or "make modules_install."
#
# The eventual kernel release string consists of the following fields,
# shown in a hierarchical format to show how smaller parts are concatenated
# to form the larger and final value, with values coming from places like
# the Makefile, kernel config options, make command line options and/or
# SCM tag information.
#
# $(KERNELVERSION)
# $(VERSION) eg, 2
# $(PATCHLEVEL) eg, 6
# $(SUBLEVEL) eg, 18
# $(EXTRAVERSION) eg, -rc6
# $(localver-full)
# $(localver)
# localversion* (files without backups, containing '~')
# $(CONFIG_LOCALVERSION) (from kernel config setting)
# $(LOCALVERSION) (from make command line, if provided)
# $(localver-extra)
# $(scm-identifier) (unique SCM tag, if one exists)
# ./scripts/setlocalversion (only with CONFIG_LOCALVERSION_AUTO)
# .scmversion (only with CONFIG_LOCALVERSION_AUTO)
# + (only without CONFIG_LOCALVERSION_AUTO
# and without LOCALVERSION= and
# repository is at non-tagged commit)
#
# For kernels without CONFIG_LOCALVERSION_AUTO compiled from an SCM that has
# been revised beyond a tagged commit, `+' is appended to the version string
# when not overridden by using "make LOCALVERSION=". This indicates that the
# kernel is not a vanilla release version and has been modified.
pattern = ".*/localversion[^~]*"
string = $(shell cat /dev/null \
`find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort -u`)
localver = $(subst $(space),, $(string) \
$(patsubst "%",%,$(CONFIG_LOCALVERSION)))
# scripts/setlocalversion is called to create a unique identifier if the source
# is managed by a known SCM and the repository has been revised since the last
# tagged (release) commit. The format of the identifier is determined by the
# SCM's implementation.
#
# .scmversion is used when generating rpm packages so we do not loose
# the version information from the SCM when we do the build of the kernel
# from the copied source
ifeq ($(wildcard .scmversion),)
scm-identifier = $(shell $(CONFIG_SHELL) \
$(srctree)/scripts/setlocalversion $(srctree))
else
scm-identifier = $(shell cat .scmversion 2> /dev/null)
endif
ifdef CONFIG_LOCALVERSION_AUTO
localver-extra = $(scm-identifier)
else
ifneq ($(scm-identifier),)
ifeq ("$(origin LOCALVERSION)", "undefined")
localver-extra = +
endif
endif
endif
localver-full = $(localver)$(LOCALVERSION)$(localver-extra)
# Store (new) KERNELRELASE string in include/config/kernel.release # Store (new) KERNELRELASE string in include/config/kernel.release
kernelrelease = $(KERNELVERSION)$(localver-full)
include/config/kernel.release: include/config/auto.conf FORCE include/config/kernel.release: include/config/auto.conf FORCE
$(Q)rm -f $@ $(Q)rm -f $@
$(Q)echo $(kernelrelease) > $@ $(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
# Things we need to do before we recursively start building the kernel # Things we need to do before we recursively start building the kernel
......
...@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE ...@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
fi fi
$(MAKE) clean $(MAKE) clean
$(PREV) ln -sf $(srctree) $(KERNELPATH) $(PREV) ln -sf $(srctree) $(KERNELPATH)
$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --scm-only > $(objtree)/.scmversion
$(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/. $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
$(PREV) rm $(KERNELPATH) $(PREV) rm $(KERNELPATH)
rm -f $(objtree)/.scmversion rm -f $(objtree)/.scmversion
......
...@@ -10,73 +10,158 @@ ...@@ -10,73 +10,158 @@
# #
usage() { usage() {
echo "Usage: $0 [srctree]" >&2 echo "Usage: $0 [--scm-only] [srctree]" >&2
exit 1 exit 1
} }
cd "${1:-.}" || usage scm_only=false
srctree=.
if test "$1" = "--scm-only"; 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
# Check for git and a git repo. scm_version()
if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then {
local short=false
# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it, cd "$srctree"
# because this version is defined in the top level Makefile. if test -e .scmversion; then
if [ -z "`git describe --exact-match 2>/dev/null`" ]; then cat "$_"
return
fi
if test "$1" = "--short"; then
short=true
fi
# If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"), # Check for git and a git repo.
# we pretty print it. if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
if atag="`git describe 2>/dev/null`"; then
echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' # 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
# If we don't have a tag at all we print -g{commitish}. # Is this git on svn?
else if git config --get svn-remote.svn.url >/dev/null; then
printf '%s%s' -g $head printf -- '-svn%s' "`git svn find-rev $head`"
fi fi
fi
# Is this git on svn? # Update index only on r/w media
if git config --get svn-remote.svn.url >/dev/null; then [ -w . ] && git update-index --refresh --unmerged > /dev/null
printf -- '-svn%s' "`git svn find-rev $head`"
fi
# Update index only on r/w media # Check for uncommitted changes
[ -w . ] && git update-index --refresh --unmerged > /dev/null if git diff-index --name-only HEAD | grep -v "^scripts/package" \
| read dummy; then
printf '%s' -dirty
fi
# Check for uncommitted changes # All done with git
if git diff-index --name-only HEAD | grep -v "^scripts/package" \ return
| read dummy; then
printf '%s' -dirty
fi fi
# All done with git # Check for mercurial and a mercurial repo.
exit if hgid=`hg id 2>/dev/null`; then
fi tag=`printf '%s' "$hgid" | cut -d' ' -f2`
# Do we have an untagged version?
if [ -z "$tag" -o "$tag" = tip ]; then
id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
printf '%s%s' -hg "$id"
fi
# Check for mercurial and a mercurial repo. # Are there uncommitted changes?
if hgid=`hg id 2>/dev/null`; then # These are represented by + after the changeset id.
tag=`printf '%s' "$hgid" | cut -d' ' -f2` case "$hgid" in
*+|*+\ *) printf '%s' -dirty ;;
esac
# Do we have an untagged version? # All done with mercurial
if [ -z "$tag" -o "$tag" = tip ]; then return
id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
printf '%s%s' -hg "$id"
fi fi
# Are there uncommitted changes? # Check for svn and a svn repo.
# These are represented by + after the changeset id. if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
case "$hgid" in rev=`echo $rev | awk '{print $NF}'`
*+|*+\ *) printf '%s' -dirty ;; printf -- '-svn%s' "$rev"
esac
# All done with mercurial # 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
scm_version
exit exit
fi fi
# Check for svn and a svn repo. if test -e include/config/auto.conf; then
if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then source "$_"
rev=`echo $rev | awk '{print $NF}'` else
printf -- '-svn%s' "$rev" echo "Error: kernelrelease not valid - run 'make prepare' to update it"
exit 1
fi
# All done with svn # localversion* files in the build and source directory
exit 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
# apped a plus sign if the repository is not in a clean tagged
# state and LOCALVERSION= is not specified
if test "${LOCALVERSION+set}" != "set"; then
scm=$(scm_version --short)
res="$res${scm:++}"
fi
fi fi
echo "$res"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment