diff options
author | Iurii Lunev <koolkhel@mail.ru> | 2018-12-11 13:16:27 +0300 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2018-12-12 16:23:32 +0000 |
commit | 7f10b74dc8ecb71671c60e8cdc14674519399a90 (patch) | |
tree | dd6b4d25c88513d7d60a07f32a5d372cef31b0cc | |
parent | b25228fcb3b2ec7b835f6f583f06fdf25b76aed9 (diff) | |
download | meta-raspberrypi-7f10b74dc8ecb71671c60e8cdc14674519399a90.tar.gz |
sdcard_image-rpi.bbclass: Remove SDIMG_COMPRESSION
Using SDIMG_COMPRESSION variable to choose compression type for
produced images is deprecated. IMAGE_FSTYPES should be used instead.
This patch removes any response to SDIMG_COMPRESSION within
sdcard_image-rpi.bbclass
Signed-off-by: Iurii Lunev <koolkhel@mail.ru>
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 6244ee5..62fb491 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -64,13 +64,6 @@ do_image_rpi_sdimg[recrdeps] = "do_build" | |||
64 | # SD card image name | 64 | # SD card image name |
65 | SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg" | 65 | SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg" |
66 | 66 | ||
67 | # Compression method to apply to SDIMG after it has been created. Supported | ||
68 | # compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg file | ||
69 | # is kept and a new compressed file is created if one of these compression | ||
70 | # formats is chosen. If SDIMG_COMPRESSION is set to any other value it is | ||
71 | # silently ignored. | ||
72 | #SDIMG_COMPRESSION ?= "" | ||
73 | |||
74 | # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. | 67 | # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. |
75 | FATPAYLOAD ?= "" | 68 | FATPAYLOAD ?= "" |
76 | 69 | ||
@@ -177,19 +170,6 @@ IMAGE_CMD_rpi-sdimg () { | |||
177 | else | 170 | else |
178 | dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) | 171 | dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) |
179 | fi | 172 | fi |
180 | |||
181 | # Optionally apply compression | ||
182 | case "${SDIMG_COMPRESSION}" in | ||
183 | "gzip") | ||
184 | gzip -k9 "${SDIMG}" | ||
185 | ;; | ||
186 | "bzip2") | ||
187 | bzip2 -k9 "${SDIMG}" | ||
188 | ;; | ||
189 | "xz") | ||
190 | xz -k "${SDIMG}" | ||
191 | ;; | ||
192 | esac | ||
193 | } | 173 | } |
194 | 174 | ||
195 | ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " | 175 | ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; " |