diff options
author | Michal Marek <mmarek@suse.cz> | 2013-02-25 07:47:53 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2013-02-25 10:14:48 -0500 |
commit | 423a8155facf23719078ff63911c1e85ba40970b (patch) | |
tree | 1a9078fd444b2d450ac951b409dceca3f05f107c /scripts | |
parent | f893bfb61531548eeaff432e8d10758e86e788a7 (diff) |
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.sh | 9 |
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 | |||
132 | fi | 132 | fi |
133 | 133 | ||
134 | # We need access to CONFIG_ symbols | 134 | # We need access to CONFIG_ symbols |
135 | . ${KCONFIG_CONFIG} | 135 | case "${KCONFIG_CONFIG}" in |
136 | */*) | ||
137 | . "${KCONFIG_CONFIG}" | ||
138 | ;; | ||
139 | *) | ||
140 | # Force using a file from the current directory | ||
141 | . "./${KCONFIG_CONFIG}" | ||
142 | esac | ||
136 | 143 | ||
137 | #link vmlinux.o | 144 | #link vmlinux.o |
138 | info LD vmlinux.o | 145 | info LD vmlinux.o |