summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2018-12-14 11:24:55 +0100
committerGitHub <noreply@github.com>2018-12-14 11:24:55 +0100
commitcb8aec948c6c667cb0b0ebffddd2bebda00c7080 (patch)
treea3cac200acc3027e2ae1ba2aa9956e97002f6181 /classes
parenta55aa6f69b3a92186feffb9e9bbdb3f98d70110d (diff)
parent4f267b8acf4c0c2401f827c08b0e18da943c873a (diff)
downloadmeta-updater-cb8aec948c6c667cb0b0ebffddd2bebda00c7080.tar.gz
Merge pull request #437 from LukaPivk/master
classes/image_types_ostree.bbclass: add device tree to boot/devicetree
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ostree.bbclass9
1 files changed, 9 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 4095de0..0820af7 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -6,6 +6,7 @@ OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs"
6OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" 6OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}"
7OSTREE_COMMIT_BODY ??= "" 7OSTREE_COMMIT_BODY ??= ""
8OSTREE_UPDATE_SUMMARY ??= "0" 8OSTREE_UPDATE_SUMMARY ??= "0"
9OSTREE_DEPLOY_DEVICETREE ??= "0"
9 10
10BUILD_OSTREE_TARBALL ??= "1" 11BUILD_OSTREE_TARBALL ??= "1"
11 12
@@ -113,6 +114,14 @@ IMAGE_CMD_ostree () {
113 touch boot/initramfs-${checksum} 114 touch boot/initramfs-${checksum}
114 else 115 else
115 cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} boot/initramfs-${checksum} 116 cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} boot/initramfs-${checksum}
117 if [ "${OSTREE_DEPLOY_DEVICETREE}" = "1" ]; then
118 if test -n "${KERNEL_DEVICETREE}"; then
119 for DTS_FILE in ${KERNEL_DEVICETREE}; do
120 DTS_FILE_BASENAME=$(basename ${DTS_FILE})
121 cp ${DEPLOY_DIR_IMAGE}/${DTS_FILE_BASENAME} boot/devicetree-${DTS_FILE_BASENAME}-${checksum}
122 done
123 fi
124 fi
116 fi 125 fi
117 126
118 # Copy image manifest 127 # Copy image manifest