| 1 |
commit: 3ba83ae4f5c2bbc7f353aa375d1e17dc824d4e65 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 22 07:33:31 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 22 07:54:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba83ae4 |
| 7 |
|
| 8 |
eclass/kernel-build.eclass: fix messed up dtbs_install |
| 9 |
|
| 10 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
eclass/kernel-build.eclass | 12 ++++-------- |
| 14 |
1 file changed, 4 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass |
| 17 |
index 7d674fa9cf4..7239737810f 100644 |
| 18 |
--- a/eclass/kernel-build.eclass |
| 19 |
+++ b/eclass/kernel-build.eclass |
| 20 |
@@ -100,12 +100,13 @@ kernel-build_src_compile() { |
| 21 |
kernel-build_src_test() { |
| 22 |
debug-print-function ${FUNCNAME} "${@}" |
| 23 |
local targets=( modules_install ) |
| 24 |
+ # on arm or arm64 you also need dtb |
| 25 |
if use arm || use arm64; then |
| 26 |
targets+=( dtbs_install ) |
| 27 |
fi |
| 28 |
|
| 29 |
emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \ |
| 30 |
- INSTALL_MOD_PATH="${T}" "${targets[@]}" |
| 31 |
+ INSTALL_MOD_PATH="${T}" INSTALL_PATH="${ED}/boot" "${targets[@]}" |
| 32 |
|
| 33 |
kernel-install_test "${PV}" \ |
| 34 |
"${WORKDIR}/build/$(kernel-install_get_image_path)" \ |
| 35 |
@@ -122,18 +123,13 @@ kernel-build_src_install() { |
| 36 |
# do not use 'make install' as it behaves differently based |
| 37 |
# on what kind of installkernel is installed |
| 38 |
local targets=( modules_install ) |
| 39 |
+ # on arm or arm64 you also need dtb |
| 40 |
if use arm || use arm64; then |
| 41 |
targets+=( dtbs_install ) |
| 42 |
fi |
| 43 |
|
| 44 |
emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \ |
| 45 |
- INSTALL_MOD_PATH="${ED}" "${targets[@]}" |
| 46 |
- |
| 47 |
- # on arm or arm64 dtbs also needed |
| 48 |
- if (use arm || use arm64); then |
| 49 |
- emake O="${WORKDIR}"/build "${MAKEARGS[@]}" \ |
| 50 |
- INSTALL_PATH="${ED}/boot" dtbs_install |
| 51 |
- fi |
| 52 |
+ INSTALL_MOD_PATH="${ED}" INSTALL_PATH="${ED}/boot" "${targets[@]}" |
| 53 |
|
| 54 |
# note: we're using mv rather than doins to save space and time |
| 55 |
# install main and arch-specific headers first, and scripts |
Archives