From fef98227e6ff5c97593697fe6c382ddd3ee8dfa8 Mon Sep 17 00:00:00 2001 From: Ben Clouser Date: Tue, 10 Jul 2018 17:27:57 -0700 Subject: Add support for building ota-tar.xz, and fixes from review comments --- classes/image_types_ota.bbclass | 13 ++++++------- classes/sota.bbclass | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'classes') 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 @@ # boot scripts, kernel and initramfs images # -do_image_ota_ext4[depends] += "e2fsprogs-native:do_populate_sysroot \ - ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ - ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" -do_image_ota_tar[depends] += "e2fsprogs-native:do_populate_sysroot \ - ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ - ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" +do_image_ota_ext4[depends] += "e2fsprogs-native:do_populate_sysroot" calculate_size () { BASE=$1 @@ -152,6 +147,8 @@ create_ota () { tar -cf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg.tar -C ${OTA_SYSROOT} . rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar ln -s ${IMAGE_NAME}.otaimg.tar ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar + # To fit in with the rest of yocto's image utils, we create a rootfs.ota-tar in the deploy dir + cp ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg.tar ${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ota-tar else rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg* bbfatal "create_ota Function called with unknown or unspecified FS_TYPE of ${FS_TYPE}. Failing!" @@ -174,7 +171,9 @@ IMAGE_CMD_ota-tar () { } do_otasetup[doc] = "Sets up the base ota rootfs used for subsequent image generation" -do_otasetup[depends] += "virtual/fakeroot-native:do_populate_sysroot" +do_otasetup[depends] += "virtual/fakeroot-native:do_populate_sysroot \ + ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ + ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" addtask do_otasetup after do_image_ostree before do_image_ota_ext4 do_image_ota_tar diff --git a/classes/sota.bbclass b/classes/sota.bbclass index f86a589..3aca92c 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -14,7 +14,7 @@ IMAGE_INSTALL_append_sota = " ostree os-release ${SOTA_CLIENT} ${SOTA_CLIENT_PRO IMAGE_CLASSES += " image_types_ostree image_types_ota" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}" -IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OTA_TARBALL', '1', 'ota-tar', ' ', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OTA_TARBALL', '1', 'ota-tar ota-tar.xz', ' ', d)}" PACKAGECONFIG_append_pn-curl = " ssl" PACKAGECONFIG_remove_pn-curl = "gnutls" -- cgit v1.2.3-54-g00ecf