diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/image_types_uboot.bbclass | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6111f6d266..cf38d2a117 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -457,7 +457,7 @@ python () { | |||
457 | rm_tmp_images = set() | 457 | rm_tmp_images = set() |
458 | def gen_conversion_cmds(bt): | 458 | def gen_conversion_cmds(bt): |
459 | for ctype in ctypes: | 459 | for ctype in ctypes: |
460 | if bt[bt.find('.') + 1:] == ctype: | 460 | if bt.endswith("." + ctype): |
461 | type = bt[0:-len(ctype) - 1] | 461 | type = bt[0:-len(ctype) - 1] |
462 | if type.startswith("debugfs_"): | 462 | if type.startswith("debugfs_"): |
463 | type = type[8:] | 463 | type = type[8:] |
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass index 6c8c1ff60e..933fa4d9c2 100644 --- a/meta/classes/image_types_uboot.bbclass +++ b/meta/classes/image_types_uboot.bbclass | |||
@@ -3,9 +3,6 @@ inherit image_types kernel-arch | |||
3 | oe_mkimage () { | 3 | oe_mkimage () { |
4 | mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \ | 4 | mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \ |
5 | -d ${IMGDEPLOYDIR}/$1 ${IMGDEPLOYDIR}/$1.u-boot | 5 | -d ${IMGDEPLOYDIR}/$1 ${IMGDEPLOYDIR}/$1.u-boot |
6 | if [ x$3 = x"clean" ]; then | ||
7 | rm $1 | ||
8 | fi | ||
9 | } | 6 | } |
10 | 7 | ||
11 | CONVERSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot" | 8 | CONVERSIONTYPES += "gz.u-boot bz2.u-boot lzma.u-boot u-boot" |
@@ -14,13 +11,13 @@ CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native" | |||
14 | CONVERSION_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none" | 11 | CONVERSION_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none" |
15 | 12 | ||
16 | CONVERSION_DEPENDS_gz.u-boot = "u-boot-mkimage-native" | 13 | CONVERSION_DEPENDS_gz.u-boot = "u-boot-mkimage-native" |
17 | CONVERSION_CMD_gz.u-boot = "${CONVERSION_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip clean" | 14 | CONVERSION_CMD_gz.u-boot = "${CONVERSION_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip" |
18 | 15 | ||
19 | CONVERSION_DEPENDS_bz2.u-boot = "u-boot-mkimage-native" | 16 | CONVERSION_DEPENDS_bz2.u-boot = "u-boot-mkimage-native" |
20 | CONVERSION_CMD_bz2.u-boot = "${CONVERSION_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2 clean" | 17 | CONVERSION_CMD_bz2.u-boot = "${CONVERSION_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2" |
21 | 18 | ||
22 | CONVERSION_DEPENDS_lzma.u-boot = "u-boot-mkimage-native" | 19 | CONVERSION_DEPENDS_lzma.u-boot = "u-boot-mkimage-native" |
23 | CONVERSION_CMD_lzma.u-boot = "${CONVERSION_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma clean" | 20 | CONVERSION_CMD_lzma.u-boot = "${CONVERSION_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma" |
24 | 21 | ||
25 | 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 cpio.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 cpio.gz.u-boot" |
26 | 23 | ||