summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2019-11-24 22:14:17 +0100
committerMing Liu <liu.ming50@gmail.com>2019-11-24 22:14:17 +0100
commit63357135764fbf9694cd334d43d8215184114669 (patch)
treecdea27951d2f700c298685fbd49a44e067245bd4 /classes
parentb747f1b884fac2003cc57be9a3d6e302a24a126f (diff)
downloadmeta-updater-63357135764fbf9694cd334d43d8215184114669.tar.gz
image_types_ostree.bbclass: do not inherit distro_features_check
Change to inherit features_check, since distro_features_check has been deprecated in OE. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/image_types_ostree.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 0f0fd28..f3f9c08 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -1,5 +1,7 @@
1# OSTree deployment 1# OSTree deployment
2inherit distro_features_check 2inherit features_check
3
4REQUIRED_DISTRO_FEATURES = "usrmerge"
3 5
4OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" 6OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
5OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" 7OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs"
@@ -16,7 +18,6 @@ IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*"
16CONVERSION_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 ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" 18CONVERSION_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 ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]"
17CONVERSIONTYPES_append = " tar" 19CONVERSIONTYPES_append = " tar"
18 20
19REQUIRED_DISTRO_FEATURES = "usrmerge"
20TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" 21TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}"
21do_image_ostree[dirs] = "${OSTREE_ROOTFS}" 22do_image_ostree[dirs] = "${OSTREE_ROOTFS}"
22do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" 23do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}"