ostree-kernel-initramfs: fix devicetree deployment

Following the changes in ostree's deployment of the kernel, initramfs
and devicetree in /lib/modules/$kver, the deployment method of the
device tree also changed. Instead of picking the first device tree it
finds at a given location, ostree looks at a file named devicetree, next
to kernel and initramfs in /lib/modules/$kver.

This commit modifies ostree-kernel-initramfs to deploy the devicetree
from the sota-defined variable OSTREE_DEVICETREE. It will pick the
first one from the list of device trees that OSTREE_DEVICETREE defines,
and copy it to /lib/modules/$kver. Note that since OSTREE_DEVICETREE
equals to KERNEL_DEVICETREE when it isn't explicitly defined, it could
indeed be a list of device trees.

Signed-off-by: antznin <agodard@witekio.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
index 6159f00..136bb22 100644
--- a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
+++ b/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb
@@ -14,7 +14,9 @@ ALLOW_EMPTY_ostree-devicetrees = "1"
 
 FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz"
 FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img"
-FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/*"
+FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \
+    ${nonarch_base_libdir}/modules/*/devicetree \
+"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -45,6 +47,7 @@ do_install() {
                 dts_file_basename=$(basename $dts_file)
                 cp ${DEPLOY_DIR_IMAGE}/$dts_file_basename $kerneldir/dtb/$dts_file_basename
             done
+            cp $kerneldir/dtb/$(basename $(echo ${OSTREE_DEVICETREE} | awk '{print $1}')) $kerneldir/devicetree
         fi
     fi
 }