diff options
author | OYTIS <tossel@gmail.com> | 2017-07-05 12:18:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-05 12:18:18 +0200 |
commit | b56329a3745c93060888492db8e5762ba2628783 (patch) | |
tree | f92ed43b7ba31f945101903d2c6f8adfd3c2f41b | |
parent | 4b3275136d0198006dc36e9786e9dc8018d84950 (diff) | |
parent | 0c35f176862be36bf0f8b91614d97686d7619dd8 (diff) | |
download | meta-updater-b56329a3745c93060888492db8e5762ba2628783.tar.gz |
Merge pull request #99 from advancedtelematic/bugfix/rpixz
Compress rpi-sdimg-ota
-rw-r--r-- | classes/sdcard_image-rpi-ota.bbclass | 8 | ||||
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/classes/sdcard_image-rpi-ota.bbclass b/classes/sdcard_image-rpi-ota.bbclass index 9022aaf..81d71e9 100644 --- a/classes/sdcard_image-rpi-ota.bbclass +++ b/classes/sdcard_image-rpi-ota.bbclass | |||
@@ -61,7 +61,7 @@ IMAGE_DEPENDS_rpi-sdimg-ota = " \ | |||
61 | IMAGE_TYPEDEP_rpi-sdimg-ota = "otaimg" | 61 | IMAGE_TYPEDEP_rpi-sdimg-ota = "otaimg" |
62 | 62 | ||
63 | # SD card image name | 63 | # SD card image name |
64 | SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota" | 64 | SDIMG_OTA = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota" |
65 | 65 | ||
66 | # Compression method to apply to SDIMG_OTA after it has been created. Supported | 66 | # Compression method to apply to SDIMG_OTA after it has been created. Supported |
67 | # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg-ota file | 67 | # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg-ota file |
@@ -165,9 +165,6 @@ IMAGE_CMD_rpi-sdimg-ota () { | |||
165 | dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync | 165 | dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync |
166 | fi | 166 | fi |
167 | 167 | ||
168 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rpi-sdimg-ota | ||
169 | ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rpi-sdimg-ota | ||
170 | |||
171 | # Optionally apply compression | 168 | # Optionally apply compression |
172 | case "${SDIMG_OTA_COMPRESSION}" in | 169 | case "${SDIMG_OTA_COMPRESSION}" in |
173 | "gzip") | 170 | "gzip") |
@@ -180,9 +177,6 @@ IMAGE_CMD_rpi-sdimg-ota () { | |||
180 | xz -k "${SDIMG_OTA}" | 177 | xz -k "${SDIMG_OTA}" |
181 | ;; | 178 | ;; |
182 | esac | 179 | esac |
183 | |||
184 | rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota | ||
185 | ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota | ||
186 | } | 180 | } |
187 | 181 | ||
188 | ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " | 182 | ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " |
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index 9b103ff..cc6b666 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass | |||
@@ -1,5 +1,5 @@ | |||
1 | IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}" | 1 | IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}" |
2 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}" | 2 | IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota.xz', 'rpi-sdimg.xz', d)}" |
3 | 3 | ||
4 | IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg rpi-sdimg.xz', '', d)}" | 4 | IMAGE_FSTYPES_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'wic rpi-sdimg rpi-sdimg.xz', '', d)}" |
5 | 5 | ||