summaryrefslogtreecommitdiffstats
path: root/classes/image_types_ostree.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'classes/image_types_ostree.bbclass')
-rw-r--r--classes/image_types_ostree.bbclass23
1 files changed, 0 insertions, 23 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index fd38d28..0b928a3 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -3,13 +3,11 @@ inherit features_check
3 3
4REQUIRED_DISTRO_FEATURES = "usrmerge" 4REQUIRED_DISTRO_FEATURES = "usrmerge"
5 5
6OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
7OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" 6OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs"
8OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" 7OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}"
9OSTREE_COMMIT_BODY ??= "" 8OSTREE_COMMIT_BODY ??= ""
10OSTREE_COMMIT_VERSION ??= "${DISTRO_VERSION}" 9OSTREE_COMMIT_VERSION ??= "${DISTRO_VERSION}"
11OSTREE_UPDATE_SUMMARY ??= "0" 10OSTREE_UPDATE_SUMMARY ??= "0"
12OSTREE_DEPLOY_DEVICETREE ??= "0"
13 11
14BUILD_OSTREE_TARBALL ??= "1" 12BUILD_OSTREE_TARBALL ??= "1"
15 13
@@ -134,27 +132,6 @@ IMAGE_CMD_ostree () {
134 132
135 ln -sf ../var/usrlocal usr/local 133 ln -sf ../var/usrlocal usr/local
136 134
137 if [ "${KERNEL_IMAGETYPE}" = "fitImage" ]; then
138 # this is a hack for ostree not to override init= in kernel cmdline -
139 # make it think that the initramfs is present (while it is in FIT image)
140 # since initramfs is fake file, it does not need to be included in checksum
141 checksum=$(sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " ")
142 touch boot/initramfs-${checksum}
143 else
144 if [ ${@ oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}')} = True ] && [ -n "${KERNEL_DEVICETREE}" ]; then
145 checksum=$(cat ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} ${KERNEL_DEVICETREE} | sha256sum | cut -f 1 -d " ")
146 for DTS_FILE in ${KERNEL_DEVICETREE}; do
147 DTS_FILE_BASENAME=$(basename ${DTS_FILE})
148 cp ${DEPLOY_DIR_IMAGE}/${DTS_FILE_BASENAME} boot/devicetree-${DTS_FILE_BASENAME}-${checksum}
149 done
150 else
151 checksum=$(cat ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} | sha256sum | cut -f 1 -d " ")
152 fi
153 cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES} boot/initramfs-${checksum}
154 fi
155
156 cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum}
157
158 # Copy image manifest 135 # Copy image manifest
159 cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest 136 cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest
160} 137}