mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 11:26:02 +09:00
UPSTREAM: kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG}
As commit423a8155fa("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. Bug: 148277666 Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> (cherry picked from commit94cf8acc38) Signed-off-by: Quentin Perret <qperret@google.com> Change-Id: I414ffbfa92ee202f0c88757f896bf9c8811822d7
This commit is contained in:
committed by
Quentin Perret
parent
8028f78053
commit
390b115181
@@ -39,14 +39,7 @@ case "$KBUILD_VERBOSE" in
|
||||
esac
|
||||
|
||||
# We need access to CONFIG_ symbols
|
||||
case "${KCONFIG_CONFIG}" in
|
||||
*/*)
|
||||
. "${KCONFIG_CONFIG}"
|
||||
;;
|
||||
*)
|
||||
# Force using a file from the current directory
|
||||
. "./${KCONFIG_CONFIG}"
|
||||
esac
|
||||
. include/config/auto.conf
|
||||
|
||||
# Generate a new ksym list file with symbols needed by the current
|
||||
# set of modules.
|
||||
|
||||
@@ -254,14 +254,7 @@ if [ "$1" = "clean" ]; then
|
||||
fi
|
||||
|
||||
# We need access to CONFIG_ symbols
|
||||
case "${KCONFIG_CONFIG}" in
|
||||
*/*)
|
||||
. "${KCONFIG_CONFIG}"
|
||||
;;
|
||||
*)
|
||||
# Force using a file from the current directory
|
||||
. "./${KCONFIG_CONFIG}"
|
||||
esac
|
||||
. include/config/auto.conf
|
||||
|
||||
# Update version
|
||||
info GEN .version
|
||||
|
||||
Reference in New Issue
Block a user