summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2011-08-29 11:00:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-30 22:12:56 +0100
commitd08f3f48564284b241727477d0f2be67470d4cad (patch)
tree1ee1cdf2bf6ea6eb76612aa3539de669718643f2 /meta
parentd15df2e6f7d2e3a0395cd3a9eb22ec1c17649680 (diff)
downloadpoky-d08f3f48564284b241727477d0f2be67470d4cad.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image_types_uboot.bbclass25
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 @@
1inherit image_types kernel-arch
2
1oe_mkimage () { 3oe_mkimage () {
2 mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} \ 4 mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C gzip -n ${IMAGE_NAME} \
3 -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot 5 -d ${DEPLOY_DIR_IMAGE}/$1 ${DEPLOY_DIR_IMAGE}/$1.u-boot
4} 6}
5 7
6UBOOT_IMAGE_DEPENDS = "genext2fs-native e2fsprogs-native u-boot-mkimage-native" 8IMAGE_DEPENDS_ext2.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
9IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz} \
10 oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz"
7 11
8IMAGE_DEPENDS_ext2.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}" 12IMAGE_DEPENDS_ext3.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
9IMAGE_CMD_ext2.gz.u-boot = "${IMAGE_CMD_ext2.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext2.gz" 13IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz} \
10IMAGE_DEPENDS_ext2.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}" 14 oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz"
11IMAGE_CMD_ext2.bz2.u-boot = "${IMAGE_CMD_ext2.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext2.bz2"
12 15
13IMAGE_DEPENDS_ext3.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}" 16IMAGE_DEPENDS_ext4.gz.u-boot = "genext2fs-native e2fsprogs-native u-boot-mkimage-native"
14IMAGE_CMD_ext3.gz.u-boot = "${IMAGE_CMD_ext3.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext3.gz" 17IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz} \
15IMAGE_DEPENDS_ext3.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}" 18 oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz"
16IMAGE_CMD_ext3.bz2.u-boot = "${IMAGE_CMD_ext3.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext3.bz2"
17 19
18IMAGE_DEPENDS_ext4.gz.u-boot = "${UBOOT_IMAGE_DEPENDS}" 20IMAGE_TYPES += "ext2.gz.u-boot ext3.gz.u-boot ext4.gz.u-boot"
19IMAGE_CMD_ext4.gz.u-boot = "${IMAGE_CMD_ext4.gz}; oe_mkimage ${IMAGE_NAME}.rootfs.ext4.gz"
20IMAGE_DEPENDS_ext4.bz2.u-boot = "${UBOOT_IMAGE_DEPENDS}"
21IMAGE_CMD_ext4.bz2.u-boot = "${IMAGE_CMD_ext4.bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.ext4.bz2"