summaryrefslogtreecommitdiffstats
path: root/scripts/package
diff options
context:
space:
mode:
authorNicolas Porcel <nicolasporcel06@gmail.com>2017-08-19 00:20:51 +0200
committerMasahiro Yamada <yamada.masahiro@socionext.com>2017-09-02 10:00:02 +0200
commitcfd63736726a7fabb3dd89ea91cff143ac4dc8a7 (patch)
tree0509b0cecf98c4820b3e9f0e077d1336160ac1e0 /scripts/package
parentKbuild: enable -Wunused-macros warning for "make W=2" (diff)
downloadlinux-cfd63736726a7fabb3dd89ea91cff143ac4dc8a7.tar.xz
linux-cfd63736726a7fabb3dd89ea91cff143ac4dc8a7.zip
kbuild: Use KCONFIG_CONFIG in buildtar
Previously, .config was used in buildtar script regardless of the value of KCONFIG_CONFIG. Signed-off-by: Nicolas Porcel <nicolasporcel06@gmail.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/package')
-rwxr-xr-xscripts/package/buildtar4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index e046bff33589..483ba00524d5 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -56,7 +56,7 @@ mkdir -p -- "${tmpdir}/boot"
#
# Try to install modules
#
-if grep -q '^CONFIG_MODULES=y' "${objtree}/.config"; then
+if grep -q '^CONFIG_MODULES=y' "${KCONFIG_CONFIG}"; then
make ARCH="${ARCH}" O="${objtree}" KBUILD_SRC= INSTALL_MOD_PATH="${tmpdir}" modules_install
fi
@@ -65,7 +65,7 @@ fi
# Install basic kernel files
#
cp -v -- "${objtree}/System.map" "${tmpdir}/boot/System.map-${KERNELRELEASE}"
-cp -v -- "${objtree}/.config" "${tmpdir}/boot/config-${KERNELRELEASE}"
+cp -v -- "${KCONFIG_CONFIG}" "${tmpdir}/boot/config-${KERNELRELEASE}"
cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"