diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2018-11-16 09:27:44 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2018-11-28 16:30:23 +0100 |
| commit | 9d6cf7300d6d7cc6f9447f5882bc3186b6c7e255 (patch) | |
| tree | 540ded0b717e206c8578b3c30406a545925f7907 /classes | |
| parent | 8f08a3b489206a2137600941eb45198cf15cecc9 (diff) | |
| download | meta-updater-9d6cf7300d6d7cc6f9447f5882bc3186b6c7e255.tar.gz | |
image_types_ostree: make usrmerge mandatory
Make usrmerge a mandatory DISTRO feature when using the ostree class.
This will allow to remove the "manual" usrmerge implementation.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ostree.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index ff807a4..878587c 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | # OSTree deployment | 1 | # OSTree deployment |
| 2 | inherit distro_features_check | ||
| 2 | 3 | ||
| 3 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 4 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
| 4 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" | 5 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" |
| @@ -14,6 +15,7 @@ IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" | |||
| 14 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${OTA_IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 15 | CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}; ${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.tar -C ${OTA_IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
| 15 | CONVERSIONTYPES_append = " tar" | 16 | CONVERSIONTYPES_append = " tar" |
| 16 | 17 | ||
| 18 | REQUIRED_DISTRO_FEATURES = "usrmerge" | ||
| 17 | OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" | 19 | OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
| 18 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" | 20 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
| 19 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | 21 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" |