summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-07-04 17:54:07 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2017-07-04 17:54:07 +0200
commit0c35f176862be36bf0f8b91614d97686d7619dd8 (patch)
treeb3664024f86ca7d344cb4acf6f0bd0cbe5a6210e
parent109b534b60eb63dfeb6a43a594fd96870699170b (diff)
downloadmeta-updater-0c35f176862be36bf0f8b91614d97686d7619dd8.tar.gz
Fix output directory in sdcard_image-rpi-ota
-rw-r--r--classes/sdcard_image-rpi-ota.bbclass8
1 files changed, 1 insertions, 7 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 = " \
61IMAGE_TYPEDEP_rpi-sdimg-ota = "otaimg" 61IMAGE_TYPEDEP_rpi-sdimg-ota = "otaimg"
62 62
63# SD card image name 63# SD card image name
64SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota" 64SDIMG_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
188ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " 182ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "