diff options
| author | Ming Liu <ming.liu@toradex.com> | 2019-09-18 09:49:26 +0800 |
|---|---|---|
| committer | Ming Liu <ming.liu@toradex.com> | 2019-10-06 18:41:02 +0200 |
| commit | 185dbf2fcfa5d0020bb853ce6b3f04c1b846a308 (patch) | |
| tree | 6da7c6ab60d18c452bb0d45218b56bb03c011839 /classes/image_type_tezi.bbclass | |
| parent | 40f50328ceab5f2b378923546b446749305847ee (diff) | |
Revert 'image_type_tezi.bbclass: add OTA provisioning support'
We might not go this way to support aktualizr provisioning, revert it
for now, it's to be decided how we are going to do the provisioning.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
Diffstat (limited to 'classes/image_type_tezi.bbclass')
| -rw-r--r-- | classes/image_type_tezi.bbclass | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 1bc0e9e..b26d27d 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -149,7 +149,6 @@ def rootfs_tezi_emmc(d): "filesystem_type": d.getVar('TEZI_ROOT_FSTYPE'), "mkfs_options": "-E nodiscard", "filename": imagename + "." + imagetype_suffix, - "ota_provisioning": True if d.getVar('SOTA_PACKED_CREDENTIALS') else False, "uncompressed_size": get_uncompressed_size(d) / 1024 } } @@ -194,7 +193,6 @@ def rootfs_tezi_rawnand(d, distro=False): "content": { "filesystem_type": "ubifs", "filename": imagename + "." + imagetype_suffix, - "ota_provisioning": True if distro and d.getVar('SOTA_PACKED_CREDENTIALS') else False, "uncompressed_size": get_uncompressed_size(d) / 1024 } } @@ -254,12 +252,11 @@ def rootfs_tezi_rawnand(d, distro=False): return [uboot1, uboot2, ubi] def rootfs_tezi_json(d, flash_type, flash_data, json_file, uenv_file): - import json, os + import json from collections import OrderedDict from datetime import datetime deploydir = d.getVar('DEPLOY_DIR_IMAGE') - ota_credentials = d.getVar('SOTA_PACKED_CREDENTIALS') data = OrderedDict({ "config_format": 2, "autoinstall": False }) # Use image recipes SUMMARY/DESCRIPTION/PV... @@ -298,11 +295,6 @@ def rootfs_tezi_json(d, flash_type, flash_data, json_file, uenv_file): elif flash_type == "emmc": data["blockdevs"] = flash_data - if ota_credentials: - data["ota_credentials"] = os.path.basename(ota_credentials) - else: - data["ota_credentials"] = "" - with open(os.path.join(deploydir, json_file), 'w') as outfile: json.dump(data, outfile, indent=4) bb.note("Toradex Easy Installer metadata file {0} written.".format(json_file)) @@ -420,7 +412,7 @@ IMAGE_CMD_teziimg-distro () { -chf ${IMGDEPLOYDIR}/${IMAGE_NAME}-Tezi_${PV}-${DATE}.tar \ ${TEZI_IMAGE_JSON_FILES} toradexlinux.png marketing.tar prepare.sh wrapup.sh \ ${TEZI_IMAGE_UBOOT_FILES} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.bootfs.tar.xz \ - ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} ${SOTA_PACKED_CREDENTIALS} + ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${TEZI_ROOT_SUFFIX} } do_image_teziimg_distro[vardepsexclude] = "DATE" |