diff options
| author | Chris Larson <chris_larson@mentor.com> | 2011-08-29 11:00:29 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-30 22:05:20 +0100 |
| commit | f67789b83599b86be052b3f2d686791cbf24f540 (patch) | |
| tree | a4061d90cf38eb1aaa8c9cea103f4514c8597097 /meta | |
| parent | c407d31a42786230062f21c8cf8dc8700dbc6f54 (diff) | |
| download | openembedded-core-f67789b83599b86be052b3f2d686791cbf24f540.tar.gz openembedded-core-f67789b83599b86be052b3f2d686791cbf24f540.tar.bz2 openembedded-core-f67789b83599b86be052b3f2d686791cbf24f540.zip | |
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
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image_types_uboot.bbclass | 25 |
1 files changed, 12 insertions, 13 deletions
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" |