[d-kernel] [PATCH 2/2] Replace devicetree from /lib to /boot

[antohami на basealt.ru]

From: Anton Midyukov <antohami на altlinux.org>

To bootload with a separate patition /boot, it is required to
devicetree on the same partition.
---
 kernel-image.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kernel-image.spec b/kernel-image.spec
index da2739fc46df..ca6e562dfc81 100644
--- a/kernel-image.spec
+++ b/kernel-image.spec
@@ -423,13 +423,15 @@ mv %buildroot%modules_dir/kernel/drivers/media/dvb-core/dvb-core.ko %buildroot%m
 mv %buildroot%modules_dir/kernel/drivers/media/radio/tea575x.ko %buildroot%modules_dir/kernel/drivers/media-core/
 
 %ifarch aarch64 %arm
-make dtbs_install INSTALL_DTBS_PATH=%buildroot/lib/devicetree/$KernelVer
+make dtbs_install INSTALL_DTBS_PATH=%buildroot/boot/devicetree/$KernelVer
 %ifarch aarch64
-pushd %buildroot/lib/devicetree/$KernelVer/
+pushd %buildroot/boot/devicetree/$KernelVer/
 find . -mindepth 2 -type f | \
        while read f; do ln -srv "$f" "$(basename $f)"; done
 popd
 %endif
+mkdir -p %buildroot/lib/devicetree
+ln -s /boot/devicetree/$KernelVer %buildroot/lib/devicetree/$KernelVer
 %endif
 
 mkdir -p %buildroot%kbuild_dir/arch/%arch_dir
@@ -592,6 +594,7 @@ check-pesign-helper
 %ghost %modules_dir/modules.symbols.bin
 %ghost %modules_dir/modules.builtin.bin
 %ifarch aarch64 %arm
+/boot/devicetree/%kversion-%flavour-%krelease
 /lib/devicetree/%kversion-%flavour-%krelease
 %endif
 
-- 
2.33.0