Commit b87a2d3e authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  scripts/extract-ikconfig: add xz compression support
  kbuild: add GNU GLOBAL tags generation
  setlocalversion: update mercurial tag parsing
parents 53a94c7d ab94e466
...@@ -421,7 +421,7 @@ endif ...@@ -421,7 +421,7 @@ endif
# of make so .config is not included in this case either (for *config). # of make so .config is not included in this case either (for *config).
no-dot-config-targets := clean mrproper distclean \ no-dot-config-targets := clean mrproper distclean \
cscope TAGS tags help %docs check% coccicheck \ cscope gtags TAGS tags help %docs check% coccicheck \
include/linux/version.h headers_% \ include/linux/version.h headers_% \
kernelversion %src-pkg kernelversion %src-pkg
...@@ -1135,7 +1135,7 @@ CLEAN_FILES += vmlinux System.map \ ...@@ -1135,7 +1135,7 @@ CLEAN_FILES += vmlinux System.map \
MRPROPER_DIRS += include/config usr/include include/generated MRPROPER_DIRS += include/config usr/include include/generated
MRPROPER_FILES += .config .config.old .version .old_version \ MRPROPER_FILES += .config .config.old .version .old_version \
include/linux/version.h \ include/linux/version.h \
Module.symvers tags TAGS cscope* Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
# clean - Delete most, but leave enough to build external modules # clean - Delete most, but leave enough to build external modules
# #
...@@ -1222,6 +1222,7 @@ help: ...@@ -1222,6 +1222,7 @@ help:
@echo ' modules_prepare - Set up for building external modules' @echo ' modules_prepare - Set up for building external modules'
@echo ' tags/TAGS - Generate tags file for editors' @echo ' tags/TAGS - Generate tags file for editors'
@echo ' cscope - Generate cscope index' @echo ' cscope - Generate cscope index'
@echo ' gtags - Generate GNU GLOBAL index'
@echo ' kernelrelease - Output the release version string' @echo ' kernelrelease - Output the release version string'
@echo ' kernelversion - Output the version stored in Makefile' @echo ' kernelversion - Output the version stored in Makefile'
@echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \ @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
...@@ -1380,7 +1381,7 @@ clean: $(clean-dirs) ...@@ -1380,7 +1381,7 @@ clean: $(clean-dirs)
quiet_cmd_tags = GEN $@ quiet_cmd_tags = GEN $@
cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@ cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
tags TAGS cscope: FORCE tags TAGS cscope gtags: FORCE
$(call cmd,tags) $(call cmd,tags)
# Scripts to check various things for consistency # Scripts to check various things for consistency
......
...@@ -56,10 +56,11 @@ trap "rm -f $tmp1 $tmp2" 0 ...@@ -56,10 +56,11 @@ trap "rm -f $tmp1 $tmp2" 0
dump_config "$img" dump_config "$img"
# That didn't work, so retry after decompression. # That didn't work, so retry after decompression.
try_decompress '\037\213\010' xy gunzip try_decompress '\037\213\010' xy gunzip
try_decompress 'BZh' xy bunzip2 try_decompress '\3757zXZ\000' abcde unxz
try_decompress '\135\0\0\0' xxx unlzma try_decompress 'BZh' xy bunzip2
try_decompress '\211\114\132' xy 'lzop -d' try_decompress '\135\0\0\0' xxx unlzma
try_decompress '\211\114\132' xy 'lzop -d'
# Bail out: # Bail out:
echo "$me: Cannot find kernel config." >&2 echo "$me: Cannot find kernel config." >&2
......
...@@ -86,12 +86,16 @@ scm_version() ...@@ -86,12 +86,16 @@ scm_version()
# Check for mercurial and a mercurial repo. # Check for mercurial and a mercurial repo.
if test -d .hg && hgid=`hg id 2>/dev/null`; then if test -d .hg && hgid=`hg id 2>/dev/null`; then
tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` # Do we have an tagged version? If so, latesttagdistance == 1
if [ "`hg log -r . --template '{latesttagdistance}'`" == "1" ]; then
# Do we have an untagged version? id=`hg log -r . --template '{latesttag}'`
if [ -z "$tag" -o "$tag" = tip ]; then
id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
printf '%s%s' -hg "$id" 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 fi
# Are there uncommitted changes? # Are there uncommitted changes?
......
...@@ -114,6 +114,11 @@ docscope() ...@@ -114,6 +114,11 @@ docscope()
cscope -b -f cscope.out cscope -b -f cscope.out
} }
dogtags()
{
all_sources | gtags -f -
}
exuberant() exuberant()
{ {
all_sources | xargs $1 -a \ all_sources | xargs $1 -a \
...@@ -187,6 +192,10 @@ case "$1" in ...@@ -187,6 +192,10 @@ case "$1" in
docscope docscope
;; ;;
"gtags")
dogtags
;;
"tags") "tags")
rm -f tags rm -f tags
xtags ctags xtags ctags
......
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