commit: 3ba83ae4f5c2bbc7f353aa375d1e17dc824d4e65
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 07:33:31 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri May 22 07:54:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba83ae4
eclass/kernel-build.eclass: fix messed up dtbs_install
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
eclass/kernel-build.eclass | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 7d674fa9cf4..7239737810f 100644
--- a/eclass/kernel-build.eclass
+++ b/eclass/kernel-build.eclass
@@ -100,12 +100,13 @@ kernel-build_src_compile() {
kernel-build_src_test() {
debug-print-function ${FUNCNAME} "${@}"
local targets=( modules_install )
+ # on arm or arm64 you also need dtb
if use arm || use arm64; then
targets+=( dtbs_install )
fi
emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
- INSTALL_MOD_PATH="${T}" "${targets[@]}"
+ INSTALL_MOD_PATH="${T}" INSTALL_PATH="${ED}/boot"
"${targets[@]}"
kernel-install_test "${PV}" \
"${WORKDIR}/build/$(kernel-install_get_image_path)" \
@@ -122,18 +123,13 @@ kernel-build_src_install() {
# do not use 'make install' as it behaves differently based
# on what kind of installkernel is installed
local targets=( modules_install )
+ # on arm or arm64 you also need dtb
if use arm || use arm64; then
targets+=( dtbs_install )
fi
emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
- INSTALL_MOD_PATH="${ED}" "${targets[@]}"
-
- # on arm or arm64 dtbs also needed
- if (use arm || use arm64); then
- emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \
- INSTALL_PATH="${ED}/boot" dtbs_install
- fi
+ INSTALL_MOD_PATH="${ED}" INSTALL_PATH="${ED}/boot"
"${targets[@]}"
# note: we're using mv rather than doins to save space and time
# install main and arch-specific headers first, and scripts
