Skip to content

Commit

Permalink
kbuild: Fix reading of .config in link-vmlinux.sh
Browse files Browse the repository at this point in the history
The shell '.' command is not required to search the current directory as
a fallback and in fact newer versions of bash in sh-mode do not do this.
Force reading the file from the current directory if $KCONFIG_CONFIG
contains no '/'.

Reported-by: Stephen Rothwell <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
michal42 committed Feb 25, 2013
1 parent f893bfb commit 423a815
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion scripts/link-vmlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,14 @@ if [ "$1" = "clean" ]; then
fi

# We need access to CONFIG_ symbols
. ${KCONFIG_CONFIG}
case "${KCONFIG_CONFIG}" in
*/*)
. "${KCONFIG_CONFIG}"
;;
*)
# Force using a file from the current directory
. "./${KCONFIG_CONFIG}"
esac

#link vmlinux.o
info LD vmlinux.o
Expand Down

0 comments on commit 423a815

Please sign in to comment.