Merge pull request #772 from liuming50/introduce-OSTREE_MULTI_DEVICETREES_SUPPORT

sota: introduce OSTREE_MULTI_DEVICETREE_SUPPORT

2 files changed, 6 insertions, 2 deletions

diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index fde00cd..e6a0f8b 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -32,6 +32,7 @@ OSTREE_BOOT_PARTITION ??= "/boot"
 OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
 OSTREE_DEPLOY_DEVICETREE ??= "0"
 OSTREE_DEVICETREE ??= "${KERNEL_DEVICETREE}"
+OSTREE_MULTI_DEVICETREE_SUPPORT ??= "0"
 
 INITRAMFS_IMAGE ?= "initramfs-ostree-image"
 
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 136bb22..9ac90b9 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
@@ -15,7 +15,7 @@ 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/* \
-    ${nonarch_base_libdir}/modules/*/devicetree \
+    ${@'' if oe.types.boolean(d.getVar('OSTREE_MULTI_DEVICETREE_SUPPORT')) else '${nonarch_base_libdir}/modules/*/devicetree'} \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -47,7 +47,10 @@ 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
+
+            if [ ${@ oe.types.boolean('${OSTREE_MULTI_DEVICETREE_SUPPORT}')} = False ]; then
+                cp $kerneldir/dtb/$(basename $(echo ${OSTREE_DEVICETREE} | awk '{print $1}')) $kerneldir/devicetree
+            fi
         fi
     fi
 }