1 files changed, 7 insertions, 3 deletions

diff --git a/classes/override_image_types_ostree.inc b/classes/override_image_types_ostree.inc
index 241afcd..34d2d1f 100644
--- a/classes/override_image_types_ostree.inc
+++ b/classes/override_image_types_ostree.inc
@@ -12,6 +12,7 @@ do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}"
 do_image_ostree[subimages] = "rootfs.ostree.tar.bz2"
 do_image_ostree[imgsuffix] = "."
 export OSTREE_ROOTFS
+SECURE_BOOT_ENABLED = "${@bb.utils.contains("DISTRO_FEATURES", "efi-secure-boot", "1", "0", d)}"
 
 IMAGE_CMD_ostree () {
     if [ -z "$OSTREE_REPO" ]; then
@@ -128,11 +129,14 @@ IMAGE_CMD_ostree () {
 
     checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " "`
 
-    # Copy kernel and initramfs and their signature files
     cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum}
-    cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL}.p7b boot/vmlinuz-${checksum}.p7b
     cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum}
-    cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT}.p7b boot/initramfs-${checksum}.p7b
+
+    if [ "${SECURE_BOOT_ENABLED}" == "1" ]; then
+        # Copy kernel and initramfs and their signature files
+        cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL}.p7b boot/vmlinuz-${checksum}.p7b
+        cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT}.p7b boot/initramfs-${checksum}.p7b
+    fi
 
     # Copy image manifest
     cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest