summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-02-25 13:47:53 +0100
committerMichal Marek <mmarek@suse.cz>2013-02-25 16:14:48 +0100
commit423a8155facf23719078ff63911c1e85ba40970b (patch)
tree1a9078fd444b2d450ac951b409dceca3f05f107c /scripts
parentf893bfb61531548eeaff432e8d10758e86e788a7 (diff)
downloadlinux-stable-423a8155facf23719078ff63911c1e85ba40970b.tar.gz
linux-stable-423a8155facf23719078ff63911c1e85ba40970b.tar.bz2
linux-stable-423a8155facf23719078ff63911c1e85ba40970b.zip
kbuild: Fix reading of .config in link-vmlinux.sh
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 <sfr@canb.auug.org.au> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/link-vmlinux.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index e62f1e000a7b..3d569d6022c2 100644
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -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