From 3ba83ae4f5c2bbc7f353aa375d1e17dc824d4e65 Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Fri, 22 May 2020 10:33:31 +0300 Subject: [PATCH] eclass/kernel-build.eclass: fix messed up dtbs_install MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexey Shvetsov Signed-off-by: Michał Górny --- 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 7d674fa9cf48..7239737810f1 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 -- 2.26.2