kbuild: pkg: grep include/config/auto.conf instead of $KCONFIG_CONFIG

This will be a little more efficient since unset CONFIG options are
stripped away from auto.conf, and we can hard-code the path to auto.conf
since it is never overridden.

include/config/kernel.release is generated before %pkg is run.
So, it is guaranteed auto.conf is up-to-date.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2019-03-08 18:56:25 +09:00
parent 515f4c633d
commit 6fb7ef5a34
3 changed files with 3 additions and 3 deletions

View File

@ -13,7 +13,7 @@
set -e set -e
is_enabled() { is_enabled() {
grep -q "^$1=y" $KCONFIG_CONFIG grep -q "^$1=y" include/config/auto.conf
} }
if_enabled_echo() { if_enabled_echo() {

View File

@ -56,7 +56,7 @@ dirs=boot
# #
# Try to install modules # Try to install modules
# #
if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then if grep -q '^CONFIG_MODULES=y' include/config/auto.conf; then
make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install
dirs="$dirs lib" dirs="$dirs lib"
fi fi

View File

@ -7,7 +7,7 @@
set -e set -e
is_enabled() { is_enabled() {
grep -q "^$1=y" $KCONFIG_CONFIG grep -q "^$1=y" include/config/auto.conf
} }
if_enabled_echo() { if_enabled_echo() {