diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-03-08 04:56:25 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-03-13 13:39:13 -0400 |
commit | 6fb7ef5a343dea78e71600314cbb5e5b7466243b (patch) | |
tree | 575fa86dae819d93652b61e7d9dfa46826d8d072 /scripts | |
parent | 515f4c633daee7654a199deed3e1939c7933ae2c (diff) |
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>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/package/builddeb | 2 | ||||
-rwxr-xr-x | scripts/package/buildtar | 2 | ||||
-rwxr-xr-x | scripts/package/mkdebian | 2 |
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 @@ | |||
13 | set -e | 13 | set -e |
14 | 14 | ||
15 | is_enabled() { | 15 | is_enabled() { |
16 | grep -q "^$1=y" $KCONFIG_CONFIG | 16 | grep -q "^$1=y" include/config/auto.conf |
17 | } | 17 | } |
18 | 18 | ||
19 | if_enabled_echo() { | 19 | 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 | |||
56 | # | 56 | # |
57 | # Try to install modules | 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 | make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install | 60 | make ARCH="${ARCH}" -f ${srctree}/Makefile INSTALL_MOD_PATH="${tmpdir}" modules_install |
61 | dirs="$dirs lib" | 61 | dirs="$dirs lib" |
62 | fi | 62 | 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 @@ | |||
7 | set -e | 7 | set -e |
8 | 8 | ||
9 | is_enabled() { | 9 | is_enabled() { |
10 | grep -q "^$1=y" $KCONFIG_CONFIG | 10 | grep -q "^$1=y" include/config/auto.conf |
11 | } | 11 | } |
12 | 12 | ||
13 | if_enabled_echo() { | 13 | if_enabled_echo() { |