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