scripts/tags.sh: don't rely on parsing `ls` for $ALLSOURCE_ARCHS generation
PATCH 1/1 scripts/tags.sh: don't rely on parsing `ls` for $ALLSOURCE_ARCHS generation
Parsing ls is fragile at best and _will_ fail when $tree contains spaces. Replace this with a glob-generated string and directly assign it to $ALLSOURCE_ARCHS; use a subshell so cd doesn't affect the current working directory.
1 file changed, 1 insertion(+), 4 deletions(-)
scripts/tags.sh +1 -4
@@ -29,14 +29,11 @@ fi ignore="$ignore ( -path ${tree}tools ) -prune -o" # Find all available archs find_all_archs() { - ALLSOURCE_ARCHS="" - for arch in `ls ${tree}arch`; do - ALLSOURCE_ARCHS="${ALLSOURCE_ARCHS} "${arch##\/} - done + ALLSOURCE_ARCHS="$( (cd "${tree}arch/" && echo *) )" } # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH if [ "${ALLSOURCE_ARCHS}" = "" ]; then ALLSOURCE_ARCHS=${SRCARCH}
Signature · 1 line
2.17.0.rc1.35.g90bbd502d54fe92035.dirty
Quoted 2 lines · Joey Pabalinas
and directly assign it to $ALLSOURCE_ARCHS; use a subshell so
cddoesn't affect the current working directory.
Whoops, turns out the inner () isn't needed, so going to revise and send a v2.
Signature · 2 lines
Cheers, Joey Pabalinas
2018-05-16 9:13 GMT+09:00 Joey Pabalinas <[email protected]>:
Quoted 8 lines
Parsing
lsis fragile at best and _will_ fail when $tree contains spaces. Replace this with a glob-generated string and directly assign it to $ALLSOURCE_ARCHS; use a subshell socddoesn't affect the current working directory.Signed-off-by Joey Pabalinas <[email protected]>1 file changed, 1 insertion(+), 4 deletions(-)
Andrew picked it up, but this patch is *bad*
You missed arch/Kconfig.
$(cd "${tree}arch/" && echo *)
contains Kconfig, but it is not arch.
Quoted 23 lines
scripts/tags.sh +1
-5@@ -29,14 +29,11 @@ fi ignore="$ignore ( -path ${tree}tools ) -prune -o" # Find all available archs find_all_archs() { - ALLSOURCE_ARCHS="" - for arch in `ls ${tree}arch`; do - ALLSOURCE_ARCHS="${ALLSOURCE_ARCHS} "${arch##\/} - done + ALLSOURCE_ARCHS="$( (cd "${tree}arch/" && echo *) )" } # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH if [ "${ALLSOURCE_ARCHS}" = "" ]; then ALLSOURCE_ARCHS=${SRCARCH} --2.17.0.rc1.35.g90bbd502d54fe92035.dirty
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 6 lines · Masahiro Yamada
Andrew picked it up, but this patch is *bad*
You missed
arch/Kconfig.$(cd "${tree}arch/" && echo *)
containsKconfig, but it is not arch.
That was also something that I found a bit weird myself, but I had assumed there was a good reason for keeping that. The original command also returns a string containing Kconfig:
Quoted 7 lines
tree="$PWD/"
echo "$tree"
ALLSOURCE_ARCHS=""
for arch inls ${tree}arch; doALLSOURCE_ARCHS="${ALLSOURCE_ARCHS} "${arch##\/}done
echo "$ALLSOURCE_ARCHS"'
gives the same output as my command (albeit with an extra leading space that shouldn't be important):
Quoted 2 lines
/store/code/projects/kernel/linux/
Kconfigalpha arc arm arm64 c6x h8300 hexagon ia64 m68k microblaze mips nds32 nios2 openrisc parisc powerpc riscv s390 sh sparc um unicore32 x86 xtensa
However, if there really is no reason for that being there, I have no complaints against fixing it. I'll send a v3 in a bit.
Signature · 2 lines
Cheers, Joey Pabalinas