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

masahir0y · masahir0y · commit 6fb7ef5a343d · 2019-03-14T02:39:13.000+09:00
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 &lt;yamada.masahiro@socionext.com&gt;
diff --git 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
@@ -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
@@ -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() {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`set -e`
`14`	`14`
`15`	`15`	`is_enabled() {`
`16`		`- grep -q "^$1=y" $KCONFIG_CONFIG`
	`16`	`+ grep -q "^$1=y" include/config/auto.conf`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`if_enabled_echo() {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ dirs=boot`
`56`	`56`	`#`
`57`	`57`	`# Try to install modules`
`58`	`58`	`#`
`59`		`-if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then`
	`59`	`+if grep -q '^CONFIG_MODULES=y' include/config/auto.conf; then`
`60`	`60`	`make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install`
`61`	`61`	`dirs="$dirs lib"`
`62`	`62`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`set -e`
`8`	`8`
`9`	`9`	`is_enabled() {`
`10`		`- grep -q "^$1=y" $KCONFIG_CONFIG`
	`10`	`+ grep -q "^$1=y" include/config/auto.conf`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`if_enabled_echo() {`