diff options
-rw-r--r-- | classes/image_types_ostree.bbclass | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index d29d4c4..758ce00 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -20,14 +20,24 @@ CONVERSION_CMD_tar = "touch ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${ | |||
20 | CONVERSIONTYPES_append = " tar" | 20 | CONVERSIONTYPES_append = " tar" |
21 | 21 | ||
22 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" | 22 | TAR_IMAGE_ROOTFS_task-image-ostree = "${OSTREE_ROOTFS}" |
23 | |||
24 | python prepare_ostree_rootfs() { | ||
25 | import oe.path | ||
26 | import shutil | ||
27 | |||
28 | ostree_rootfs = d.getVar("OSTREE_ROOTFS") | ||
29 | if os.path.lexists(ostree_rootfs): | ||
30 | bb.utils.remove(ostree_rootfs, True) | ||
31 | |||
32 | # Copy required as we change permissions on some files. | ||
33 | image_rootfs = d.getVar("IMAGE_ROOTFS") | ||
34 | oe.path.copyhardlinktree(image_rootfs, ostree_rootfs) | ||
35 | } | ||
36 | |||
23 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" | 37 | do_image_ostree[dirs] = "${OSTREE_ROOTFS}" |
24 | do_image_ostree[cleandirs] = "${OSTREE_ROOTFS}" | 38 | do_image_ostree[prefuncs] += "prepare_ostree_rootfs" |
25 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" | 39 | do_image_ostree[depends] = "coreutils-native:do_populate_sysroot virtual/kernel:do_deploy ${INITRAMFS_IMAGE}:do_image_complete" |
26 | IMAGE_CMD_ostree () { | 40 | IMAGE_CMD_ostree () { |
27 | cp -a ${IMAGE_ROOTFS}/* ${OSTREE_ROOTFS} | ||
28 | chmod a+rx ${OSTREE_ROOTFS} | ||
29 | sync | ||
30 | |||
31 | for d in var/*; do | 41 | for d in var/*; do |
32 | if [ "${d}" != "var/local" ]; then | 42 | if [ "${d}" != "var/local" ]; then |
33 | rm -rf ${d} | 43 | rm -rf ${d} |