diff options
author | Masahiro Yamada | 2019-03-07 23:49:10 -0600 |
---|---|---|
committer | Masahiro Yamada | 2019-03-13 12:39:11 -0500 |
commit | 94cf8acc38e57caaba1329a255409b6d93936ba7 (patch) | |
tree | c0823765b3b572d1d67631913cb733f292bcd39d | |
parent | c649bd59b6d43998d8c408e2a2fa1922ce5d8363 (diff) | |
download | kishons-ti-linux-kernel-94cf8acc38e57caaba1329a255409b6d93936ba7.tar.gz kishons-ti-linux-kernel-94cf8acc38e57caaba1329a255409b6d93936ba7.tar.xz kishons-ti-linux-kernel-94cf8acc38e57caaba1329a255409b6d93936ba7.zip |
kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG}
As commit 423a8155facf ("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>
-rwxr-xr-x | scripts/adjust_autoksyms.sh | 9 | ||||
-rwxr-xr-x | scripts/link-vmlinux.sh | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 6e6d63957da3..84bf6b500815 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh | |||
@@ -39,14 +39,7 @@ case "$KBUILD_VERBOSE" in | |||
39 | esac | 39 | esac |
40 | 40 | ||
41 | # We need access to CONFIG_ symbols | 41 | # We need access to CONFIG_ symbols |
42 | case "${KCONFIG_CONFIG}" in | 42 | . include/config/auto.conf |
43 | */*) | ||
44 | . "${KCONFIG_CONFIG}" | ||
45 | ;; | ||
46 | *) | ||
47 | # Force using a file from the current directory | ||
48 | . "./${KCONFIG_CONFIG}" | ||
49 | esac | ||
50 | 43 | ||
51 | # Generate a new ksym list file with symbols needed by the current | 44 | # Generate a new ksym list file with symbols needed by the current |
52 | # set of modules. | 45 | # set of modules. |
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index bc7f1fc1f55b..dc0e8c5a1402 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh | |||
@@ -171,14 +171,7 @@ if [ "$1" = "clean" ]; then | |||
171 | fi | 171 | fi |
172 | 172 | ||
173 | # We need access to CONFIG_ symbols | 173 | # We need access to CONFIG_ symbols |
174 | case "${KCONFIG_CONFIG}" in | 174 | . include/config/auto.conf |
175 | */*) | ||
176 | . "${KCONFIG_CONFIG}" | ||
177 | ;; | ||
178 | *) | ||
179 | # Force using a file from the current directory | ||
180 | . "./${KCONFIG_CONFIG}" | ||
181 | esac | ||
182 | 175 | ||
183 | # Update version | 176 | # Update version |
184 | info GEN .version | 177 | info GEN .version |