summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-21 18:06:34 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-25 15:59:13 +0100
commite18cec750b51267d9c130b395c7a53585f4ae7ac (patch)
tree755fadffb385f6d088efc7cc9fce40d42d5585b4 /meta/classes
parent6fbbdc626a612826378ca979dab4455aed6f8332 (diff)
downloadpoky-e18cec750b51267d9c130b395c7a53585f4ae7ac.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: 65f27122950a35a67ce39ae4cfe93d0dca6b0dab) 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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass9
-rw-r--r--meta/classes/image_types.bbclass6
-rw-r--r--meta/classes/image_types_uboot.bbclass29
3 files changed, 4 insertions, 40 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index bd6a5b7b81..b095bca7c1 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -144,15 +144,6 @@ inherit ${IMAGE_TYPE_vm}
144IMAGE_TYPE_container = '${@bb.utils.contains("IMAGE_FSTYPES", "container", "image-container", "", d)}' 144IMAGE_TYPE_container = '${@bb.utils.contains("IMAGE_FSTYPES", "container", "image-container", "", d)}'
145inherit ${IMAGE_TYPE_container} 145inherit ${IMAGE_TYPE_container}
146 146
147def build_uboot(d):
148 if 'u-boot' in (d.getVar('IMAGE_FSTYPES') or ''):
149 return "image_types_uboot"
150 else:
151 return ""
152
153IMAGE_TYPE_uboot = "${@build_uboot(d)}"
154inherit ${IMAGE_TYPE_uboot}
155
156IMAGE_TYPE_wic = "image_types_wic" 147IMAGE_TYPE_wic = "image_types_wic"
157inherit ${IMAGE_TYPE_wic} 148inherit ${IMAGE_TYPE_wic}
158 149
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index a0a516ef6d..cf946a6874 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -214,7 +214,7 @@ IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME
214 214
215EXTRA_IMAGECMD = "" 215EXTRA_IMAGECMD = ""
216 216
217inherit siteinfo 217inherit siteinfo kernel-arch
218JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" 218JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}"
219JFFS2_ERASEBLOCK ?= "0x40000" 219JFFS2_ERASEBLOCK ?= "0x40000"
220EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" 220EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers"
@@ -269,7 +269,7 @@ IMAGE_TYPES = " \
269# CONVERSION_CMD/DEPENDS. 269# CONVERSION_CMD/DEPENDS.
270COMPRESSIONTYPES ?= "" 270COMPRESSIONTYPES ?= ""
271 271
272CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap ${COMPRESSIONTYPES}" 272CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap u-boot ${COMPRESSIONTYPES}"
273CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" 273CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
274CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" 274CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz"
275CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" 275CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
@@ -286,6 +286,7 @@ CONVERSION_CMD_sha256sum = "sha256sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}
286CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum" 286CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum"
287CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum" 287CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum"
288CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" 288CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap"
289CONVERSION_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"
289CONVERSION_DEPENDS_lzma = "xz-native" 290CONVERSION_DEPENDS_lzma = "xz-native"
290CONVERSION_DEPENDS_gz = "pigz-native" 291CONVERSION_DEPENDS_gz = "pigz-native"
291CONVERSION_DEPENDS_bz2 = "pbzip2-native" 292CONVERSION_DEPENDS_bz2 = "pbzip2-native"
@@ -295,6 +296,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native"
295CONVERSION_DEPENDS_zip = "zip-native" 296CONVERSION_DEPENDS_zip = "zip-native"
296CONVERSION_DEPENDS_sum = "mtd-utils-native" 297CONVERSION_DEPENDS_sum = "mtd-utils-native"
297CONVERSION_DEPENDS_bmap = "bmap-tools-native" 298CONVERSION_DEPENDS_bmap = "bmap-tools-native"
299CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
298 300
299RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" 301RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4"
300RUNNABLE_MACHINE_PATTERNS ?= "qemu" 302RUNNABLE_MACHINE_PATTERNS ?= "qemu"
diff --git a/meta/classes/image_types_uboot.bbclass b/meta/classes/image_types_uboot.bbclass
deleted file mode 100644
index 8db436efb1..0000000000
--- a/meta/classes/image_types_uboot.bbclass
+++ /dev/null
@@ -1,29 +0,0 @@
1inherit image_types kernel-arch
2
3oe_mkimage () {
4 mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
5 -d ${IMGDEPLOYDIR}/$1 ${IMGDEPLOYDIR}/$1.u-boot
6}
7
8CONVERSIONTYPES += "gz.u-boot bz2.u-boot lz4.u-boot lzma.u-boot lzo.u-boot u-boot"
9
10CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
11CONVERSION_CMD_u-boot = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
12
13CONVERSION_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
14CONVERSION_CMD_gz.u-boot = "${CONVERSION_CMD_gz}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.gz gzip"
15
16CONVERSION_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
17CONVERSION_CMD_bz2.u-boot = "${CONVERSION_CMD_bz2}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2"
18
19CONVERSION_DEPENDS_lz4.u-boot = "u-boot-mkimage-native"
20CONVERSION_CMD_lz4.u-boot = "${CONVERSION_CMD_lz4_legacy}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lz4 lz4"
21
22CONVERSION_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
23CONVERSION_CMD_lzma.u-boot = "${CONVERSION_CMD_lzma}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzma lzma"
24
25CONVERSION_DEPENDS_lzo.u-boot = "u-boot-mkimage-native"
26CONVERSION_CMD_lzo.u-boot = "${CONVERSION_CMD_lzo}; oe_mkimage ${IMAGE_NAME}.rootfs.${type}.lzo lzo"
27
28IMAGE_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"
29