summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-02-29 05:41:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-29 12:56:45 (GMT)
commit7fee190f671369d1a4db9935c0f2639e696c5b75 (patch)
treeca9d20e2c6f3791042f4d4e2333c7e1939d15941
parentc97ebae788210c9d307ca823f63bb77d9029c6b0 (diff)
downloadpoky-7fee190f671369d1a4db9935c0f2639e696c5b75.tar.gz
image_types.bbclass: fix bzip2 and xz compression commands
We need to use -f (force) or the command fails in the image file already exists. (From OE-Core rev: 419ddab8266ecfd6da1841d38a451a9fc5be49b0) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index aeb69a4..a5f09fe 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -188,8 +188,8 @@ IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lz
188COMPRESSIONTYPES = "gz bz2 lzma xz" 188COMPRESSIONTYPES = "gz bz2 lzma xz"
189COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" 189COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}"
190COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.gz" 190COMPRESS_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}.rootfs.${type} > ${IMAGE_NAME}.rootfs.${type}.gz"
191COMPRESS_CMD_bz2 = "bzip2 -k ${IMAGE_NAME}.rootfs.${type}" 191COMPRESS_CMD_bz2 = "bzip2 -f -k ${IMAGE_NAME}.rootfs.${type}"
192COMPRESS_CMD_xz = "xz -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}" 192COMPRESS_CMD_xz = "xz -f -k -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} ${IMAGE_NAME}.rootfs.${type}"
193COMPRESS_DEPENDS_lzma = "xz-native" 193COMPRESS_DEPENDS_lzma = "xz-native"
194COMPRESS_DEPENDS_gz = "" 194COMPRESS_DEPENDS_gz = ""
195COMPRESS_DEPENDS_bz2 = "" 195COMPRESS_DEPENDS_bz2 = ""