| Message ID | 1552024150-9831-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 94cf8acc38e57caaba1329a255409b6d93936ba7 |
| Headers | show |
| Series | kbuild: source include/config/auto.conf instead of ${KCONFIG_CONFIG} | expand |
On Fri, Mar 8, 2019 at 2:50 PM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > 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> > --- Applied to linux-kbuild. > scripts/adjust_autoksyms.sh | 9 +-------- > 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 6e6d639..84bf6b5 100755 > --- a/scripts/adjust_autoksyms.sh > +++ b/scripts/adjust_autoksyms.sh > @@ -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. > diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh > index bc7f1fc..dc0e8c5 100755 > --- a/scripts/link-vmlinux.sh > +++ b/scripts/link-vmlinux.sh > @@ -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 > -- > 2.7.4 > -- Best Regards Masahiro Yamada
diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh index 6e6d639..84bf6b5 100755 --- a/scripts/adjust_autoksyms.sh +++ b/scripts/adjust_autoksyms.sh @@ -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. diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index bc7f1fc..dc0e8c5 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -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
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> --- scripts/adjust_autoksyms.sh | 9 +-------- scripts/link-vmlinux.sh | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) -- 2.7.4