diff options
Diffstat (limited to 'classes/image_types_ota.bbclass')
-rw-r--r-- | classes/image_types_ota.bbclass | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 99a2b63..0b2f7a1 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -7,13 +7,8 @@ | |||
7 | # boot scripts, kernel and initramfs images | 7 | # boot scripts, kernel and initramfs images |
8 | # | 8 | # |
9 | 9 | ||
10 | do_image_ota_ext4[depends] += "e2fsprogs-native:do_populate_sysroot \ | ||
11 | ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ | ||
12 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" | ||
13 | 10 | ||
14 | do_image_ota_tar[depends] += "e2fsprogs-native:do_populate_sysroot \ | 11 | do_image_ota_ext4[depends] += "e2fsprogs-native:do_populate_sysroot" |
15 | ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ | ||
16 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" | ||
17 | 12 | ||
18 | calculate_size () { | 13 | calculate_size () { |
19 | BASE=$1 | 14 | BASE=$1 |
@@ -152,6 +147,8 @@ create_ota () { | |||
152 | tar -cf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg.tar -C ${OTA_SYSROOT} . | 147 | tar -cf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg.tar -C ${OTA_SYSROOT} . |
153 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar | 148 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar |
154 | ln -s ${IMAGE_NAME}.otaimg.tar ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar | 149 | ln -s ${IMAGE_NAME}.otaimg.tar ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar |
150 | # To fit in with the rest of yocto's image utils, we create a rootfs.ota-tar in the deploy dir | ||
151 | cp ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ota-tar | ||
155 | else | 152 | else |
156 | rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg* | 153 | rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg* |
157 | bbfatal "create_ota Function called with unknown or unspecified FS_TYPE of ${FS_TYPE}. Failing!" | 154 | bbfatal "create_ota Function called with unknown or unspecified FS_TYPE of ${FS_TYPE}. Failing!" |
@@ -174,7 +171,9 @@ IMAGE_CMD_ota-tar () { | |||
174 | } | 171 | } |
175 | 172 | ||
176 | do_otasetup[doc] = "Sets up the base ota rootfs used for subsequent image generation" | 173 | do_otasetup[doc] = "Sets up the base ota rootfs used for subsequent image generation" |
177 | do_otasetup[depends] += "virtual/fakeroot-native:do_populate_sysroot" | 174 | do_otasetup[depends] += "virtual/fakeroot-native:do_populate_sysroot \ |
175 | ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ | ||
176 | ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" | ||
178 | 177 | ||
179 | addtask do_otasetup after do_image_ostree before do_image_ota_ext4 do_image_ota_tar | 178 | addtask do_otasetup after do_image_ostree before do_image_ota_ext4 do_image_ota_tar |
180 | 179 | ||