diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-29 10:50:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-29 10:50:51 +0100 |
| commit | 0dd9c75b3f187acca3b4032ac2f1ae002b806275 (patch) | |
| tree | 895ab496983bba7e67bcf7c22c34d22c90a0a69f /classes | |
| parent | 2e1eb5bf5ff232dd197e7891aee6efd42b6c27a0 (diff) | |
| parent | d55d2dfa4f9fe96ffed95f95ccf3f24bded1c861 (diff) | |
| download | meta-updater-0dd9c75b3f187acca3b4032ac2f1ae002b806275.tar.gz | |
Merge pull request #441 from advancedtelematic/fix/more-curly-braces
aktualizr and image_types_ota: more curly braces.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_types_ota.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index 3165b54..9883a68 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
| @@ -96,17 +96,17 @@ IMAGE_CMD_ota-ext4 () { | |||
| 96 | # Calculate image type | 96 | # Calculate image type |
| 97 | OTA_ROOTFS_SIZE=$(calculate_size `du -ks ${OTA_SYSROOT} | cut -f 1` "${IMAGE_OVERHEAD_FACTOR}" "${IMAGE_ROOTFS_SIZE}" "${IMAGE_ROOTFS_MAXSIZE}" `expr ${IMAGE_ROOTFS_EXTRA_SPACE}` "${IMAGE_ROOTFS_ALIGNMENT}") | 97 | OTA_ROOTFS_SIZE=$(calculate_size `du -ks ${OTA_SYSROOT} | cut -f 1` "${IMAGE_OVERHEAD_FACTOR}" "${IMAGE_ROOTFS_SIZE}" "${IMAGE_ROOTFS_MAXSIZE}" `expr ${IMAGE_ROOTFS_EXTRA_SPACE}` "${IMAGE_ROOTFS_ALIGNMENT}") |
| 98 | 98 | ||
| 99 | if [ $OTA_ROOTFS_SIZE -lt 0 ]; then | 99 | if [ ${OTA_ROOTFS_SIZE} -lt 0 ]; then |
| 100 | bbfatal "create_ota failed to calculate OTA rootfs size!" | 100 | bbfatal "create_ota failed to calculate OTA rootfs size!" |
| 101 | fi | 101 | fi |
| 102 | 102 | ||
| 103 | eval local COUNT=\"0\" | 103 | eval local COUNT=\"0\" |
| 104 | eval local MIN_COUNT=\"60\" | 104 | eval local MIN_COUNT=\"60\" |
| 105 | if [ $OTA_ROOTFS_SIZE -lt $MIN_COUNT ]; then | 105 | if [ ${OTA_ROOTFS_SIZE} -lt ${MIN_COUNT} ]; then |
| 106 | eval COUNT=\"$MIN_COUNT\" | 106 | eval COUNT=\"${MIN_COUNT}\" |
| 107 | fi | 107 | fi |
| 108 | 108 | ||
| 109 | dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 seek=${OTA_ROOTFS_SIZE} count=$COUNT bs=1024 | 109 | dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 seek=${OTA_ROOTFS_SIZE} count=${COUNT} bs=1024 |
| 110 | mkfs.ext4 -O ^64bit ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 -L otaroot -d ${OTA_SYSROOT} | 110 | mkfs.ext4 -O ^64bit ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ota-ext4 -L otaroot -d ${OTA_SYSROOT} |
| 111 | } | 111 | } |
| 112 | 112 | ||