Skip to content

Commit

Permalink
kbuild: pkg: grep include/config/auto.conf instead of $KCONFIG_CONFIG
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
masahir0y committed Mar 13, 2019
1 parent 515f4c6 commit 6fb7ef5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion scripts/package/builddeb
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion scripts/package/buildtar
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/package/mkdebian
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit 6fb7ef5

Please sign in to comment.