diff options
-rw-r--r-- | classes/image_types_ostree.bbclass | 2 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index b82bfb7..5b9ac97 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -4,7 +4,7 @@ inherit image_types | |||
4 | 4 | ||
5 | IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ | 5 | IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ |
6 | virtual/kernel:do_deploy \ | 6 | virtual/kernel:do_deploy \ |
7 | ${INITRAMFS_IMAGE}:do_rootfs" | 7 | ${INITRAMFS_IMAGE}:do_image_cpio" |
8 | 8 | ||
9 | # Please redefine OSTREE_REPO in your local.conf in order to have a persistent | 9 | # Please redefine OSTREE_REPO in your local.conf in order to have a persistent |
10 | # OSTree repo | 10 | # OSTree repo |
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index cc526b6..bb55e61 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -13,8 +13,8 @@ do_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ | |||
13 | parted-native:do_populate_sysroot \ | 13 | parted-native:do_populate_sysroot \ |
14 | virtual/kernel:do_deploy \ | 14 | virtual/kernel:do_deploy \ |
15 | virtual/bootloader:do_deploy \ | 15 | virtual/bootloader:do_deploy \ |
16 | ${INITRD_IMAGE}:do_rootfs \ | 16 | ${INITRD_IMAGE}:do_image_cpio \ |
17 | ${PN}:do_rootfs" | 17 | ${PN}:do_image_ext4" |
18 | 18 | ||
19 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4" | 19 | ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4" |
20 | INITRD_IMAGE ?= "core-image-minimal-initramfs" | 20 | INITRD_IMAGE ?= "core-image-minimal-initramfs" |
@@ -45,7 +45,6 @@ do_otaimg () { | |||
45 | rm -f $BOOTIMG | 45 | rm -f $BOOTIMG |
46 | build_bootfs $BOOTIMG | 46 | build_bootfs $BOOTIMG |
47 | 47 | ||
48 | # ext4 image should be already here because of IMAGE_TYPEDEP_otaimg | ||
49 | ROOTIMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 | 48 | ROOTIMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 |
50 | 49 | ||
51 | BOOTFSBLOCKS=`du -bks ${BOOTIMG} | cut -f 1` | 50 | BOOTFSBLOCKS=`du -bks ${BOOTIMG} | cut -f 1` |