Skip to contentSkip to conversation

scripts/tags.sh: use `find` for $ALLSOURCE_ARCHS generation

PATCH In review Joey Pabalinas 2 participants 3 messages May 22, 2018

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 scripts/tags.sh: use `find` for $ALLSOURCE_ARCHS generation

The current code includes 'Kconfig' in ALLSOURCE_ARCHS, but it should not (Kconfig is not an architecture). Replace this with a find-generated string and directly assign it to $ALLSOURCE_ARCHS. The find_all_archs() function is no longer needed for a one-liner with obvious semantics, so inline the arch generation into the surrounding conditional.

 1 file changed, 1 insertion(+), 10 deletions(-)
scripts/tags.sh +1 -10
index 78e546ff689c2d5f40..e587610d149271171d 100755
@@ -26,24 +26,15 @@ else
 fi
 
 # ignore userspace tools
 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
-}
-
 # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
 if [ "${ALLSOURCE_ARCHS}" = "" ]; then
 	ALLSOURCE_ARCHS=${SRCARCH}
 elif [ "${ALLSOURCE_ARCHS}" = "all" ]; then
-	find_all_archs
+	ALLSOURCE_ARCHS=$(find ${tree}arch/ -mindepth 1 -maxdepth 1 -type d -printf '%f ')
 fi
 
 # find sources in arch/$ARCH
 find_arch_sources()
 {
Signature · 1 line
2.17.0.rc1.35.g90bbd502d54fe92035.dirty
#1 lore raw

2018-05-22 18:16 GMT+09:00 Joey Pabalinas <[email protected]>:

Quoted 9 lines

The current code includes 'Kconfig' in ALLSOURCE_ARCHS, but it should not (Kconfig is not an architecture). Replace this with a find-generated string and directly assign it to $ALLSOURCE_ARCHS. The find_all_archs() function is no longer needed for a one-liner with obvious semantics, so inline the arch generation into the surrounding conditional.

Applied to linux-kbuild. Thanks!

Quoted 34 lines
 1 file changed, 1 insertion(+), 10 deletions(-)
scripts/tags.sh +1 -11
index 78e546ff689c2d5f40..e587610d149271171d 100755
@@ -26,24 +26,15 @@ else
 fi
 
 # ignore userspace tools
 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
-}
-
 # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
 if [ "${ALLSOURCE_ARCHS}" = "" ]; then
        ALLSOURCE_ARCHS=${SRCARCH}
 elif [ "${ALLSOURCE_ARCHS}" = "all" ]; then
-       find_all_archs
+       ALLSOURCE_ARCHS=$(find ${tree}arch/ -mindepth 1 -maxdepth 1 -type d -printf '%f ')
 fi
 
 # find sources in arch/$ARCH
 find_arch_sources()
 {
--

2.17.0.rc1.35.g90bbd502d54fe92035.dirty

Signature · 2 lines
Best Regards
Masahiro Yamada
#2 lore raw
Quoted 2 lines · Masahiro Yamada

Applied to linux-kbuild. Thanks!

Cheers :)

Signature · 1 line
Joey Pabalinas