Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=709cc3...
Commit: 709cc372cad628846d73447edfd95ac39c8e2319
Parent: 31110ebbec8688c6e9597b641101afc94e1c762a
Author: Jiri Slaby <jirislaby@gmail.com>
AuthorDate: Wed Dec 10 13:10:13 2008 +0100
Committer: Sam Ravnborg <sam@ravnborg.org>
CommitDate: Sun Dec 14 00:15:09 2008 +0100
kbuild: fix make tags/cscope
- fix combining O=... and tags
- don't allow * expansion during sh function calls
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
[sam: use KBUILD_SRC to check if we use O=...]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
scripts/tags.sh | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 47274dc..3c814ba 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -18,28 +18,28 @@ ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \
-prune -o"
# Do not use full path is we do not use O=.. builds
-if [ ${src} == ${obj} ]; then
+if [ "${KBUILD_SRC}" == "" ]; then
tree=
else
- tree=${srctree}
+ tree=${srctree}/
fi
# find sources in arch/$ARCH
find_arch_sources()
{
- find ${tree}arch/$1 $ignore -name $2 -print;
+ find ${tree}arch/$1 $ignore -name "$2" -print;
}
# find sources in arch/$1/include
find_arch_include_sources()
{
- find ${tree}arch/$1/include $ignore -name $2 -print;
+ find ${tree}arch/$1/include $ignore -name "$2" -print;
}
# find sources in include/
find_include_sources()
{
- find ${tree}include $ignore -name config -prune -o -name $1 -print;
+ find ${tree}include $ignore -name config -prune -o -name "$1" -print;
}
# find sources in rest of tree
@@ -48,27 +48,27 @@ find_other_sources()
{
find ${tree}* $ignore \
\( -name include -o -name arch -o -name '.tmp_*' \) -prune -o \
- -name $1 -print;
+ -name "$1" -print;
}
find_sources()
{
- find_arch_sources $1 $2
- find_include_sources $2
- find_other_sources $2
+ find_arch_sources $1 "$2"
+ find_include_sources "$2"
+ find_other_sources "$2"
}
all_sources()
{
- find_sources $SRCARCH *.[chS]
+ find_sources $SRCARCH '*.[chS]'
if [ ! -z "$archinclude" ]; then
- find_arch_include_sources $archinclude *.[chS]
+ find_arch_include_sources $archinclude '*.[chS]'
fi
}
all_kconfigs()
{
- find_sources $SRCARCH "Kconfig*"
+ find_sources $SRCARCH 'Kconfig*'
}
all_defconfigs()
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
