Patchwork image_types: fix squashfs-lzma image creation

login
register
mail settings
Submitter Saul Wold
Date Sept. 18, 2012, 8:30 p.m.
Message ID <1348000234-9879-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/36849/
State Accepted
Commit 8e82713724dfcb40f2ae24a166ec94f50f8b4cd0
Headers show

Comments

Saul Wold - Sept. 18, 2012, 8:30 p.m.
squashfs has the -comp option for lzma, so use it.

[YOCTO #3126]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/image_types.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - Sept. 19, 2012, 1:37 p.m.
On Tue, 2012-09-18 at 13:30 -0700, Saul Wold wrote:
> squashfs has the -comp option for lzma, so use it.

This says what the patch does but not why...

> [YOCTO #3126]
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>

Cheers,

Richard

Patch

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 8d76cc9..bdb67b4 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -166,7 +166,7 @@  IMAGE_CMD_btrfs () {
 }
 
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
-IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
+IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma"
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ."
 
 CPIO_TOUCH_INIT () {
@@ -225,7 +225,7 @@  IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native"
 IMAGE_DEPENDS_btrfs = "btrfs-tools-native"
 IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
-IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native"
+IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native"
 IMAGE_DEPENDS_elf = "virtual/kernel mkelfimage-native"
 IMAGE_DEPENDS_ubi = "mtd-utils-native"
 IMAGE_DEPENDS_ubifs = "mtd-utils-native"