diff options
| author | Marc Ferland <ferlandm@sonatest.com> | 2013-03-25 16:45:24 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-29 10:40:55 +0000 |
| commit | 8eb1fd4aa017822893442888469520688cfc0bcb (patch) | |
| tree | c160dcd11d0d5504ace4eee2162a897433d898fd /meta | |
| parent | 0051c32eab52b0938385d763bb487ff0b9a7c3f8 (diff) | |
| download | poky-8eb1fd4aa017822893442888469520688cfc0bcb.tar.gz | |
image_types.bbclass: Replace squashfs-lzma with squashfs-xz
Booting an image generated with squashfs-lzma results in a kernel
error: "Filesystem uses "lzma" compression. This is not supported".
Currently (well at least in Linux 3.8) the officially supported
decompressors are:
* LZO
* XZ
* ZLIB
This change makes sure we use a supported compression algorithm for
squashed root filesystems.
(From OE-Core rev: d915e2e084257830c43f7f21af3aec24b7e1a211)
Signed-off-by: Marc Ferland <ferlandm@sonatest.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image_types.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index f7b8314784..98d31f5bfb 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
| @@ -171,7 +171,7 @@ IMAGE_CMD_btrfs () { | |||
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" | 173 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" |
| 174 | IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma" | 174 | IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" |
| 175 | IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." | 175 | IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." |
| 176 | 176 | ||
| 177 | CPIO_TOUCH_INIT () { | 177 | CPIO_TOUCH_INIT () { |
| @@ -230,13 +230,13 @@ IMAGE_DEPENDS_ext3 = "genext2fs-native e2fsprogs-native" | |||
| 230 | IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native" | 230 | IMAGE_DEPENDS_ext4 = "genext2fs-native e2fsprogs-native" |
| 231 | IMAGE_DEPENDS_btrfs = "btrfs-tools-native" | 231 | IMAGE_DEPENDS_btrfs = "btrfs-tools-native" |
| 232 | IMAGE_DEPENDS_squashfs = "squashfs-tools-native" | 232 | IMAGE_DEPENDS_squashfs = "squashfs-tools-native" |
| 233 | IMAGE_DEPENDS_squashfs-lzma = "squashfs-tools-native" | 233 | IMAGE_DEPENDS_squashfs-xz = "squashfs-tools-native" |
| 234 | IMAGE_DEPENDS_elf = "virtual/kernel mkelfimage-native" | 234 | IMAGE_DEPENDS_elf = "virtual/kernel mkelfimage-native" |
| 235 | IMAGE_DEPENDS_ubi = "mtd-utils-native" | 235 | IMAGE_DEPENDS_ubi = "mtd-utils-native" |
| 236 | IMAGE_DEPENDS_ubifs = "mtd-utils-native" | 236 | IMAGE_DEPENDS_ubifs = "mtd-utils-native" |
| 237 | 237 | ||
| 238 | # This variable is available to request which values are suitable for IMAGE_FSTYPES | 238 | # This variable is available to request which values are suitable for IMAGE_FSTYPES |
| 239 | IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma vmdk elf" | 239 | IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-xz ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma vmdk elf" |
| 240 | 240 | ||
| 241 | COMPRESSIONTYPES = "gz bz2 lzma xz" | 241 | COMPRESSIONTYPES = "gz bz2 lzma xz" |
| 242 | COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" | 242 | COMPRESS_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}.rootfs.${type}" |