diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2019-11-25 11:34:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 11:34:35 +0100 |
| commit | 71ed2523ea915bbd4c3e9be53429c79084fcb3ea (patch) | |
| tree | cdea27951d2f700c298685fbd49a44e067245bd4 | |
| parent | b747f1b884fac2003cc57be9a3d6e302a24a126f (diff) | |
| parent | 63357135764fbf9694cd334d43d8215184114669 (diff) | |
| download | meta-updater-71ed2523ea915bbd4c3e9be53429c79084fcb3ea.tar.gz | |
Merge pull request #636 from liuming50/drop-distro_features_check
image_types_ostree.bbclass: do not inherit distro_features_check
| -rw-r--r-- | classes/image_types_ostree.bbclass | 5 |
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 |
| 2 | inherit distro_features_check | 2 | inherit features_check |
| 3 | |||
| 4 | REQUIRED_DISTRO_FEATURES = "usrmerge" | ||
| 3 | 5 | ||
| 4 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" | 6 | OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" |
| 5 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" | 7 | OSTREE_ROOTFS ??= "${WORKDIR}/ostree-rootfs" |
| @@ -16,7 +18,6 @@ IMAGE_CMD_TAR = "tar --xattrs --xattrs-include=*" | |||
| 16 | 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 ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 18 | 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 ${TAR_IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
| 17 | CONVERSIONTYPES_append = " tar" | 19 | CONVERSIONTYPES_append = " tar" |
| 18 | 20 | ||
| 19 | REQUIRED_DISTRO_FEATURES = "usrmerge" | ||
| 20 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" | 21 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
| 21 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" | 22 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
| 22 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | 23 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" |