diff options
-rw-r--r-- | classes/sota.bbclass | 1 | ||||
-rw-r--r-- | recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb | 7 |
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" | |||
32 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 32 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
33 | OSTREE_DEPLOY_DEVICETREE ??= "0" | 33 | OSTREE_DEPLOY_DEVICETREE ??= "0" |
34 | OSTREE_DEVICETREE ??= "${KERNEL_DEVICETREE}" | 34 | OSTREE_DEVICETREE ??= "${KERNEL_DEVICETREE}" |
35 | OSTREE_MULTI_DEVICETREE_SUPPORT ??= "0" | ||
35 | 36 | ||
36 | INITRAMFS_IMAGE ?= "initramfs-ostree-image" | 37 | INITRAMFS_IMAGE ?= "initramfs-ostree-image" |
37 | 38 | ||
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" | |||
15 | FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz" | 15 | FILES_ostree-kernel = "${nonarch_base_libdir}/modules/*/vmlinuz" |
16 | FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img" | 16 | FILES_ostree-initramfs = "${nonarch_base_libdir}/modules/*/initramfs.img" |
17 | FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \ | 17 | FILES_ostree-devicetrees = "${nonarch_base_libdir}/modules/*/dtb/* \ |
18 | ${nonarch_base_libdir}/modules/*/devicetree \ | 18 | ${@'' if oe.types.boolean(d.getVar('OSTREE_MULTI_DEVICETREE_SUPPORT')) else '${nonarch_base_libdir}/modules/*/devicetree'} \ |
19 | " | 19 | " |
20 | 20 | ||
21 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 21 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
@@ -47,7 +47,10 @@ do_install() { | |||
47 | dts_file_basename=$(basename $dts_file) | 47 | dts_file_basename=$(basename $dts_file) |
48 | cp ${DEPLOY_DIR_IMAGE}/$dts_file_basename $kerneldir/dtb/$dts_file_basename | 48 | cp ${DEPLOY_DIR_IMAGE}/$dts_file_basename $kerneldir/dtb/$dts_file_basename |
49 | done | 49 | done |
50 | cp $kerneldir/dtb/$(basename $(echo ${OSTREE_DEVICETREE} | awk '{print $1}')) $kerneldir/devicetree | 50 | |
51 | if [ ${@ oe.types.boolean('${OSTREE_MULTI_DEVICETREE_SUPPORT}')} = False ]; then | ||
52 | cp $kerneldir/dtb/$(basename $(echo ${OSTREE_DEVICETREE} | awk '{print $1}')) $kerneldir/devicetree | ||
53 | fi | ||
51 | fi | 54 | fi |
52 | fi | 55 | fi |
53 | } | 56 | } |