Răsfoiți Sursa

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>
Michal Marek 12 ani în urmă
părinte
comite
423a8155fa
1 a modificat fișierele cu 8 adăugiri și 1 ștergeri
  1. 8 1
      scripts/link-vmlinux.sh

+ 8 - 1
scripts/link-vmlinux.sh

@@ -132,7 +132,14 @@ if [ "$1" = "clean" ]; then
 fi
 fi
 
 
 # We need access to CONFIG_ symbols
 # 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
 #link vmlinux.o
 info LD vmlinux.o
 info LD vmlinux.o