Commit 94cf8acc authored by Masahiro Yamada's avatar Masahiro Yamada

kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG}

As commit 423a8155 ("kbuild: Fix reading of .config in
link-vmlinux.sh") addressed, some shells fail to perform '.' if
${KCONFIG_CONFIG} does not contain a slash at all.

Instead, we can source include/config/auto.conf, which obviously
contain slashes, and we do not expect its file path overridden by
a user. Perhaps, the performance might be slightly better since
unset CONFIG options are stripped from include/config/auto.conf.

scripts/setlocalversion already works this way.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent c649bd59
...@@ -39,14 +39,7 @@ case "$KBUILD_VERBOSE" in ...@@ -39,14 +39,7 @@ case "$KBUILD_VERBOSE" in
esac esac
# We need access to CONFIG_ symbols # We need access to CONFIG_ symbols
case "${KCONFIG_CONFIG}" in . include/config/auto.conf
*/*)
. "${KCONFIG_CONFIG}"
;;
*)
# Force using a file from the current directory
. "./${KCONFIG_CONFIG}"
esac
# Generate a new ksym list file with symbols needed by the current # Generate a new ksym list file with symbols needed by the current
# set of modules. # set of modules.
......
...@@ -171,14 +171,7 @@ if [ "$1" = "clean" ]; then ...@@ -171,14 +171,7 @@ if [ "$1" = "clean" ]; then
fi fi
# We need access to CONFIG_ symbols # We need access to CONFIG_ symbols
case "${KCONFIG_CONFIG}" in . include/config/auto.conf
*/*)
. "${KCONFIG_CONFIG}"
;;
*)
# Force using a file from the current directory
. "./${KCONFIG_CONFIG}"
esac
# Update version # Update version
info GEN .version info GEN .version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment