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>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index e2cb43895e141286828b1491d705b8d85b78e854..b03dd56a4782b481fc4e176b022d652ec60df2e4 100755 (executable)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -13,7 +13,7 @@
 set -e
 
 is_enabled() {
-       grep -q "^$1=y" $KCONFIG_CONFIG
+       grep -q "^$1=y" include/config/auto.conf
 }
 
 if_enabled_echo() {

diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index cfd2a4a3fe42db1bf21e61ac93cc36f280b8c15b..2f66c81e4021bd808251c3a5ccf9921f0f32dd89 100755 (executable)
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -56,7 +56,7 @@ dirs=boot
 #
 # 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
        dirs="$dirs lib"
 fi

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index fb76dd1b72e8b76e8256fbae7a0e4f4a3439c487..8068328a079c38978ed6ce1bd4d7cff7e00d6bd2 100755 (executable)
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -7,7 +7,7 @@
 set -e
 
 is_enabled() {
-       grep -q "^$1=y" $KCONFIG_CONFIG
+       grep -q "^$1=y" include/config/auto.conf
 }
 
 if_enabled_echo() {