summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2018-11-16 09:27:44 +0100
committerStefan Agner <stefan.agner@toradex.com>2018-11-28 16:30:23 +0100
commit9d6cf7300d6d7cc6f9447f5882bc3186b6c7e255 (patch)
tree540ded0b717e206c8578b3c30406a545925f7907 /classes
parent8f08a3b489206a2137600941eb45198cf15cecc9 (diff)
downloadmeta-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.bbclass2
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
2inherit distro_features_check
2 3
3OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" 4OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
4OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" 5OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs"
@@ -14,6 +15,7 @@ IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
14CONVERSION_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 ]" 15CONVERSION_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 ]"
15CONVERSIONTYPES_append = " tar" 16CONVERSIONTYPES_append = " tar"
16 17
18REQUIRED_DISTRO_FEATURES = "usrmerge"
17OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" 19OTA_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}"
18do_image_ostree[dirs] = "${OSTREE_ROOTFS}" 20do_image_ostree[dirs] = "${OSTREE_ROOTFS}"
19do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" 21do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}"