Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fb7ef5a authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 515f4c63

scripts/package/builddeb

+1 −1
Original line number Diff line number Diff line
@@ -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() {

scripts/package/buildtar

+1 −1
Original line number Diff line number Diff line
@@ -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

scripts/package/mkdebian

+1 −1
Original line number Diff line number Diff line
@@ -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() {