[d-kernel] [PATCH 0/2] Replace devicetree

[d-kernel] [PATCH 0/2] Replace devicetree

[antohami]

From: Anton Midyukov <antohami@altlinux.org>

Патчи предназначены для веток std-def-5.10, un-def-5.15, std-def-5.15, un-def-5.16.
Т.е. для ядер в Сизифе и p10.

Первый патч служит для облегчения восприятия какой dtb к какому вендору относится.
Обратная совместимость осуществляется созданием симлинков.

Второй патч решает проблему загрузки с отдельного раздела /boot на компьютерах,
требующих для загрузки devicetree. Для обратной совместимости создаётся симлинк.

Anton Midyukov (2):
  /lib/devicetree/<name.dtb> -> /lib/devicetree/<vendor>/<name.dtb> for aarch64
  Replace devicetree from /lib to /boot

 kernel-image.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

-- 
2.33.0

[d-kernel] [PATCH 1/2] /lib/devicetree/<name.dtb> -> /lib/devicetree/<vendor>/<name.dtb> for aarch64

[antohami]

From: Anton Midyukov <antohami@altlinux.org>

These symbolic links are needed to support U-Boot, which in the path of DTB
is missing VENDOR. There is an need to copy dtb to FAT32 partition to
bootload in UEFI mode.
---
 kernel-image.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel-image.spec b/kernel-image.spec
index 29a6ba0ec066..da2739fc46df 100644
--- a/kernel-image.spec
+++ b/kernel-image.spec
@@ -425,8 +425,10 @@ mv %buildroot%modules_dir/kernel/drivers/media/radio/tea575x.ko %buildroot%modul
 %ifarch aarch64 %arm
 make dtbs_install INSTALL_DTBS_PATH=%buildroot/lib/devicetree/$KernelVer
 %ifarch aarch64
-find %buildroot/lib/devicetree/$KernelVer -mindepth 1 -type d |\
-       while read d; do mv $d/* $d/../ && rmdir $d && ln -srv $d/../ $d; done
+pushd %buildroot/lib/devicetree/$KernelVer/
+find . -mindepth 2 -type f | \
+       while read f; do ln -srv "$f" "$(basename $f)"; done
+popd
 %endif
 %endif
 
-- 
2.33.0

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

[antohami]

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