summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2019-03-08 18:56:25 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2019-03-14 02:39:13 +0900
commit6fb7ef5a343dea78e71600314cbb5e5b7466243b (patch)
tree575fa86dae819d93652b61e7d9dfa46826d8d072
parent515f4c633daee7654a199deed3e1939c7933ae2c (diff)
downloadlinux-0-day-6fb7ef5a343dea78e71600314cbb5e5b7466243b.tar.gz
linux-0-day-6fb7ef5a343dea78e71600314cbb5e5b7466243b.tar.xz
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>
-rwxr-xr-xscripts/package/builddeb2
-rwxr-xr-xscripts/package/buildtar2
-rwxr-xr-xscripts/package/mkdebian2
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index e2cb43895e14..b03dd56a4782 100755
--- 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 cfd2a4a3fe42..2f66c81e4021 100755
--- 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 fb76dd1b72e8..8068328a079c 100755
--- 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() {