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 <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chris Larson 2011-08-29 11:00:29 -07:00 committed by Richard Purdie
parent d15df2e6f7
commit d08f3f4856
1 changed files with 12 additions and 13 deletions

View File

@ -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"