diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2020-05-22 10:33:31 +0300 |
|---|---|---|
| committer |   Michał Górny <mgorny@gentoo.org> | 2020-05-22 09:54:34 +0200 |
| commit | 3ba83ae4f5c2bbc7f353aa375d1e17dc824d4e65 (patch) | |
| tree | 3fe007ff9dff4f10301bf6bf2d8242d1c1c87da2 /eclass | |
| parent | sys-devel/smatch: avoid hardcoded pkg-config invocation (diff) | |
| download | gentoo-3ba83ae4f5c2bbc7f353aa375d1e17dc824d4e65.tar.gz gentoo-3ba83ae4f5c2bbc7f353aa375d1e17dc824d4e65.tar.bz2 gentoo-3ba83ae4f5c2bbc7f353aa375d1e17dc824d4e65.zip | |
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>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kernel-build.eclass | 12 |
1 files 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 |