mirror of
https://github.com/torvalds/linux
synced 2024-09-06 09:51:23 +00:00
kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG}
As commit 423a8155fa
("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: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
c649bd59b6
commit
94cf8acc38
|
@ -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
|
||||||
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
|
||||||
|
|
Loading…
Reference in a new issue