diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-09-19 08:28:05 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-19 18:16:16 +0100 |
commit | 8ebed883d45ee952bd89d2143e0b0ab8736049b0 (patch) | |
tree | d513d1fbba8c1045f525ebf27505a7b64f79aed6 | |
parent | 1c0f73b0712e68934fb9efb317860fe7e72145c9 (diff) | |
download | poky-8ebed883d45ee952bd89d2143e0b0ab8736049b0.tar.gz |
image_types: fix squashfs-lzma image creation1.3_M5.rc1
This removes the dependency on a seperate binary which we
don't seem to have. So, use mksquashfs's -comp lzma to
replace that functionality
[YOCTO #3126]
(From OE-Core rev: 8e82713724dfcb40f2ae24a166ec94f50f8b4cd0)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image_types.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 8d76cc907e..bdb67b41e8 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -166,7 +166,7 @@ IMAGE_CMD_btrfs () { | |||
166 | } | 166 | } |
167 | 167 | ||
168 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" | 168 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" |
169 | IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" | 169 | IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma" |
170 | IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." | 170 | IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." |
171 | 171 | ||
172 | CPIO_TOUCH_INIT () { | 172 | CPIO_TOUCH_INIT () { |
@@ -225,7 +225,7 @@ IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" | |||
225 | IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native" | 225 | IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native" |
226 | IMAGE_DEPENDS_btrfs = "btrfs-tools-native" | 226 | IMAGE_DEPENDS_btrfs = "btrfs-tools-native" |
227 | IMAGE_DEPENDS_squashfs = "squashfs-tools-native" | 227 | IMAGE_DEPENDS_squashfs = "squashfs-tools-native" |
228 | IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" | 228 | IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native" |
229 | IMAGE_DEPENDS_elf = "virtual/kernel mkelfimage-native" | 229 | IMAGE_DEPENDS_elf = "virtual/kernel mkelfimage-native" |
230 | IMAGE_DEPENDS_ubi = "mtd-utils-native" | 230 | IMAGE_DEPENDS_ubi = "mtd-utils-native" |
231 | IMAGE_DEPENDS_ubifs = "mtd-utils-native" | 231 | IMAGE_DEPENDS_ubifs = "mtd-utils-native" |