eclass/kernel-build.eclass: fix messed up dtbs_install

Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>

diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass
index 7d674fa9cf48ac469486ab51f73a1b5f54f4ec28..7239737810f1b9159c3f9a96b50f9b8713ef2e4a 100644 (file)
--- 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