1 files changed, 10 insertions, 19 deletions
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
index 8d1081c00a..07837b566c 100644
--- a/meta/classes/image_types_uboot.bbclass
+++ b/meta/classes/image_types_uboot.bbclass
@@ -5,28 +5,19 @@ oe_mkimage () {
        -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
 }
-IMAGE_DEPENDS_ext2.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
-IMAGE_CMD_ext2.u-boot      = "${IMAGE_CMD_ext2} \
-                                 oe_mkimage ${IMAGE_NAME}.rootfs.ext2 none"
-IMAGE_DEPENDS_ext2.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+COMPRESS_DEPENDS_u-boot = "u-boot-mkimage-native"
-IMAGE_CMD_ext2.gz.u-boot      = "${IMAGE_CMD_ext2.gz} \
+COMPRESS_CMD_u-boot      = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
-                                 oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz gzip"
-IMAGE_DEPENDS_ext2.bz2.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+COMPRESS_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
-IMAGE_CMD_ext2.bz2.u-boot      = "${IMAGE_CMD_ext2.bz2} \
+COMPRESS_CMD_gz.u-boot      = "${COMPRESS_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip"
-                                 oe_mkimage ${IMAGE_NAME}.rootfs.ext2.bz2 bzip2"
-IMAGE_DEPENDS_ext2.lzma.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+COMPRESS_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
-IMAGE_CMD_ext2.lzma.u-boot      = "${IMAGE_CMD_ext2.lzma} \
+COMPRESS_CMD_bz2.u-boot      = "${COMPRESS_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2"
-                                 oe_mkimage ${IMAGE_NAME}.rootfs.ext2.lzma lzma"
-IMAGE_DEPENDS_ext3.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
+COMPRESS_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
-IMAGE_CMD_ext3.gz.u-boot      = "${IMAGE_CMD_ext3.gz} \
+COMPRESS_CMD_lzma.u-boot      = "${COMPRESS_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma"
-                                 oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz gzip"
-IMAGE_DEPENDS_ext4.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
-IMAGE_CMD_ext4.gz.u-boot      = "${IMAGE_CMD_ext4.gz} \
-                                 oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz gzip"
 IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot"

diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass index 8d1081c00a..07837b566c 100644 --- a/meta/classes/image_types_uboot.bbclass +++ b/meta/classes/image_types_uboot.bbclass
@@ -5,28 +5,19 @@ oe_mkimage () {
5	-d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot	5	-d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
6	}	6	}
7		7
8	IMAGE_DEPENDS_ext2.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"	8	COMPRESSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot"
9	IMAGE_CMD_ext2.u-boot = "${IMAGE_CMD_ext2} \
10	oe_mkimage ${IMAGE_NAME}.rootfs.ext2 none"
11		9
12	IMAGE_DEPENDS_ext2.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"	10	COMPRESS_DEPENDS_u-boot = "u-boot-mkimage-native"
13	IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz} \	11	COMPRESS_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
14	oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz gzip"
15		12
16	IMAGE_DEPENDS_ext2.bz2.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"	13	COMPRESS_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
17	IMAGE_CMD_ext2.bz2.u-boot = "${IMAGE_CMD_ext2.bz2} \	14	COMPRESS_CMD_gz.u-boot = "${COMPRESS_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip"
18	oe_mkimage ${IMAGE_NAME}.rootfs.ext2.bz2 bzip2"
19		15
20	IMAGE_DEPENDS_ext2.lzma.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"	16	COMPRESS_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
21	IMAGE_CMD_ext2.lzma.u-boot = "${IMAGE_CMD_ext2.lzma} \	17	COMPRESS_CMD_bz2.u-boot = "${COMPRESS_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2"
22	oe_mkimage ${IMAGE_NAME}.rootfs.ext2.lzma lzma"
23		18
24	IMAGE_DEPENDS_ext3.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"	19	COMPRESS_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
25	IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz} \	20	COMPRESS_CMD_lzma.u-boot = "${COMPRESS_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma"
26	oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz gzip"
27
28	IMAGE_DEPENDS_ext4.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
29	IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz} \
30	oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz gzip"
31		21
32	IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot"	22	IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot ext3.gz.u-boot ext4.gz.u-boot"
		23