gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Alexey Shvetsov
2020-05-22 10:33:31 +03:00
committed by Michał Górny
parent 41189fa2e1
commit 3ba83ae4f5
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eclass/kernel-build.eclass
View File

@@ -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