From d08f3f48564284b241727477d0f2be67470d4cad Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 29 Aug 2011 11:00:29 -0700 Subject: image_types_uboot: fix a number of issues - Don't use a variable reference in the IMAGE_DEPENDS - Inherit kernel-arch to get UBOOT_ARCH - Don't include the .bz2 variants, since the base types aren't in oe-core - Add the new types to IMAGE_TYPES - Inherit image_types, to be certain we load after it (From OE-Core rev: f67789b83599b86be052b3f2d686791cbf24f540) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- meta/classes/image_types_uboot.bbclass | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'meta/classes/image_types_uboot.bbclass') diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass index f08ad8ddb4..10fa2f7f8e 100644 --- a/meta/classes/image_types_uboot.bbclass +++ b/meta/classes/image_types_uboot.bbclass @@ -1,21 +1,20 @@ +inherit image_types kernel-arch + oe_mkimage () { mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} \ -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot } -UBOOT_IMAGE_DEPENDS = "genext2fs-native e2fsprogs-native u-boot-mkimage-native" +IMAGE_DEPENDS_ext2.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native" +IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz} \ + oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz" -IMAGE_DEPENDS_ext2.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}" -IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz" -IMAGE_DEPENDS_ext2.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}" -IMAGE_CMD_ext2.bz2.u-boot = "${IMAGE_CMD_ext2.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext2.bz2" +IMAGE_DEPENDS_ext3.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native" +IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz} \ + oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz" -IMAGE_DEPENDS_ext3.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}" -IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz" -IMAGE_DEPENDS_ext3.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}" -IMAGE_CMD_ext3.bz2.u-boot = "${IMAGE_CMD_ext3.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext3.bz2" +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" -IMAGE_DEPENDS_ext4.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}" -IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz" -IMAGE_DEPENDS_ext4.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}" -IMAGE_CMD_ext4.bz2.u-boot = "${IMAGE_CMD_ext4.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext4.bz2" +IMAGE_TYPES += "ext2.gz.u-boot ext3.gz.u-boot ext4.gz.u-boot" -- cgit v1.2.3-54-g00ecf