diff options
| author |   Anton Gerasimov <anton@advancedtelematic.com> | 2016-09-12 17:14:09 +0200 |
|---|---|---|
| committer | Anton Gerasimov <anton@advancedtelematic.com> | 2016-09-12 17:14:09 +0200 |
| commit | af691608a20d121153fb17f558dde319114e4f72 (patch) | |
| tree | 72a42e618a3936606b1f0859ec7da3d74a5454be | |
| parent | 0d6d370cdebd3c27eace1f9c7104b01e8ee8402e (diff) | |
Change do_rootfs to do_image_* after respective change in poky.
Bug-AGL: SPEC-249
Change-Id: Ib5d725f203c0b0545b7c6b3196afb149ac8015c2
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
| -rw-r--r-- | meta-sota/classes/image_types_ostree.bbclass | 2 | ||||
| -rw-r--r-- | meta-sota/classes/image_types_ota.bbclass | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-sota/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass index b82bfb7..5b9ac97 100644 --- a/meta-sota/classes/image_types_ostree.bbclass +++ b/meta-sota/classes/image_types_ostree.bbclass @@ -4,7 +4,7 @@ inherit image_types IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ virtual/kernel:do_deploy \ - ${INITRAMFS_IMAGE}:do_rootfs" + ${INITRAMFS_IMAGE}:do_image_cpio" # Please redefine OSTREE_REPO in your local.conf in order to have a persistent # OSTree repo diff --git a/meta-sota/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass index cc526b6..bb55e61 100644 --- a/meta-sota/classes/image_types_ota.bbclass +++ b/meta-sota/classes/image_types_ota.bbclass @@ -13,8 +13,8 @@ do_otaimg[depends] += "e2fsprogs-native:do_populate_sysroot \ parted-native:do_populate_sysroot \ virtual/kernel:do_deploy \ virtual/bootloader:do_deploy \ - ${INITRD_IMAGE}:do_rootfs \ - ${PN}:do_rootfs" + ${INITRD_IMAGE}:do_image_cpio \ + ${PN}:do_image_ext4" ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext4" INITRD_IMAGE ?= "core-image-minimal-initramfs" @@ -45,7 +45,6 @@ do_otaimg () { rm -f $BOOTIMG build_bootfs $BOOTIMG - # ext4 image should be already here because of IMAGE_TYPEDEP_otaimg ROOTIMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 BOOTFSBLOCKS=`du -bks ${BOOTIMG} | cut -f 1` |