Skip to content

Commit

Permalink
scripts/tags.sh: handle OMAP platforms properly
Browse files Browse the repository at this point in the history
When SUBARCH is "omap1" or "omap2", plat-omap/ directory must be
indexed.  Handle this special case properly.

While at it, check if mach- directory exists at all.

Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Sam Protsenko <[email protected]>
Cc: Michal Marek <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Sam Protsenko authored and torvalds committed Dec 13, 2016
1 parent 0d7bbb4 commit 779d5eb
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions scripts/tags.sh
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,26 @@ if [ "${ARCH}" = "um" ]; then
elif [ "${SRCARCH}" = "arm" -a "${SUBARCH}" != "" ]; then
subarchdir=$(find ${tree}arch/$SRCARCH/ -name "mach-*" -type d -o \
-name "plat-*" -type d);
mach_suffix=$SUBARCH
plat_suffix=$SUBARCH

# Special cases when $plat_suffix != $mach_suffix
case $mach_suffix in
"omap1" | "omap2")
plat_suffix="omap"
;;
esac

if [ ! -d ${tree}arch/$SRCARCH/mach-$mach_suffix ]; then
echo "Warning: arch/arm/mach-$mach_suffix/ not found." >&2
echo " Fix your \$SUBARCH appropriately" >&2
fi

for i in $subarchdir; do
case "$i" in
*"mach-"${SUBARCH})
*"mach-"${mach_suffix})
;;
*"plat-"${SUBARCH})
*"plat-"${plat_suffix})
;;
*)
subarchprune="$subarchprune \
Expand Down

0 comments on commit 779d5eb

Please sign in to comment.