Skip to content

Commit

Permalink
kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG}
Browse files Browse the repository at this point in the history
As commit 423a815 ("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 <[email protected]>
  • Loading branch information
masahir0y committed Mar 13, 2019
1 parent c649bd5 commit 94cf8ac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
9 changes: 1 addition & 8 deletions scripts/adjust_autoksyms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 1 addition & 8 deletions scripts/link-vmlinux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,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
Expand Down

0 comments on commit 94cf8ac

Please sign in to comment.