diff options
author | Tom Rini <trini@konsulko.com> | 2017-07-21 18:06:34 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:39:48 +0000 |
commit | d096d7e850f12d7440d285b4eaa6ed1c61558ef5 (patch) | |
tree | c176a852f5af35e7c65f3e0b67ae6b36dbba30fb /meta/classes/image_types.bbclass | |
parent | ebb625a140ef67d65dca1b262304377814eb8ed4 (diff) | |
download | poky-d096d7e850f12d7440d285b4eaa6ed1c61558ef5.tar.gz |
image_types.bbclass: Make u-boot signed images more versatile
With the introduction of chaining compression/conversion support we can
convert the old image_types_uboot.bbclass code that did a hand-chaining
of a set of ${filesystem}.${compression} into generic and arbitrary
support to sign whatever the user wants to sign for their image.
This, for the record, does remove setting a valid compression type in
the record in favour of just saying none. This is not a generally
useful feature in U-Boot and I believe being versatile in terms of being
able to pass in arbitrary compressions is more important.
(From OE-Core rev: 979ff606d8c4c6f66c6dc533a92212f18708089e)
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image_types.bbclass')
-rw-r--r-- | meta/classes/image_types.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 7749b00098..8db18ac5a9 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -197,7 +197,7 @@ IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME | |||
197 | 197 | ||
198 | EXTRA_IMAGECMD = "" | 198 | EXTRA_IMAGECMD = "" |
199 | 199 | ||
200 | inherit siteinfo | 200 | inherit siteinfo kernel-arch |
201 | JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" | 201 | JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" |
202 | JFFS2_ERASEBLOCK ?= "0x40000" | 202 | JFFS2_ERASEBLOCK ?= "0x40000" |
203 | EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" | 203 | EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" |
@@ -254,7 +254,7 @@ IMAGE_TYPES = " \ | |||
254 | # CONVERSION_CMD/DEPENDS. | 254 | # CONVERSION_CMD/DEPENDS. |
255 | COMPRESSIONTYPES ?= "" | 255 | COMPRESSIONTYPES ?= "" |
256 | 256 | ||
257 | CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap ${COMPRESSIONTYPES}" | 257 | CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap u-boot ${COMPRESSIONTYPES}" |
258 | CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" | 258 | CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" |
259 | CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" | 259 | CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" |
260 | CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" | 260 | CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" |
@@ -271,6 +271,7 @@ CONVERSION_CMD_sha256sum = "sha256sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} | |||
271 | CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum" | 271 | CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum" |
272 | CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum" | 272 | CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum" |
273 | CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" | 273 | CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" |
274 | CONVERSION_CMD_u-boot = "mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C none -n ${IMAGE_NAME} -d ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.u-boot" | ||
274 | CONVERSION_DEPENDS_lzma = "xz-native" | 275 | CONVERSION_DEPENDS_lzma = "xz-native" |
275 | CONVERSION_DEPENDS_gz = "pigz-native" | 276 | CONVERSION_DEPENDS_gz = "pigz-native" |
276 | CONVERSION_DEPENDS_bz2 = "pbzip2-native" | 277 | CONVERSION_DEPENDS_bz2 = "pbzip2-native" |
@@ -280,6 +281,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native" | |||
280 | CONVERSION_DEPENDS_zip = "zip-native" | 281 | CONVERSION_DEPENDS_zip = "zip-native" |
281 | CONVERSION_DEPENDS_sum = "mtd-utils-native" | 282 | CONVERSION_DEPENDS_sum = "mtd-utils-native" |
282 | CONVERSION_DEPENDS_bmap = "bmap-tools-native" | 283 | CONVERSION_DEPENDS_bmap = "bmap-tools-native" |
284 | CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native" | ||
283 | 285 | ||
284 | RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" | 286 | RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" |
285 | RUNNABLE_MACHINE_PATTERNS ?= "qemu" | 287 | RUNNABLE_MACHINE_PATTERNS ?= "qemu" |