- export src and obj, so that we can check them in tags.sh
- don't allow * expansion during sh function calls
Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
---
Makefile | 2 +-
scripts/tags.sh | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 8f4f626..a094d74 100644
--- a/Makefile
+++ b/Makefile
@@ -156,7 +156,7 @@ obj := $(objtree)
VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
-export srctree objtree VPATH TOPDIR
+export src obj srctree objtree VPATH TOPDIR
# SUBARCH tells the usermode build what the underlying arch is. That is set
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 47274dc..3b7225c 100644
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -21,25 +21,25 @@ ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \
if [ ${src} == ${obj} ]; 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()
--
1.6.0.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
