summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 9c9f14a99a..18564204af 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -145,15 +145,6 @@ inherit ${IMAGE_TYPE_vm}
145IMAGE_TYPE_container = '${@bb.utils.contains("IMAGE_FSTYPES", "container", "image-container", "", d)}' 145IMAGE_TYPE_container = '${@bb.utils.contains("IMAGE_FSTYPES", "container", "image-container", "", d)}'
146inherit ${IMAGE_TYPE_container} 146inherit ${IMAGE_TYPE_container}
147 147
148def build_uboot(d):
149 if 'u-boot' in (d.getVar('IMAGE_FSTYPES') or ''):
150 return "image_types_uboot"
151 else:
152 return ""
153
154IMAGE_TYPE_uboot = "${@build_uboot(d)}"
155inherit ${IMAGE_TYPE_uboot}
156
157IMAGE_TYPE_wic = "image_types_wic" 148IMAGE_TYPE_wic = "image_types_wic"
158inherit ${IMAGE_TYPE_wic} 149inherit ${IMAGE_TYPE_wic}
159 150
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
198EXTRA_IMAGECMD = "" 198EXTRA_IMAGECMD = ""
199 199
200inherit siteinfo 200inherit siteinfo kernel-arch
201JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" 201JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}"
202JFFS2_ERASEBLOCK ?= "0x40000" 202JFFS2_ERASEBLOCK ?= "0x40000"
203EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" 203EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers"
@@ -254,7 +254,7 @@ IMAGE_TYPES = " \
254# CONVERSION_CMD/DEPENDS. 254# CONVERSION_CMD/DEPENDS.
255COMPRESSIONTYPES ?= "" 255COMPRESSIONTYPES ?= ""
256 256
257CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap ${COMPRESSIONTYPES}" 257CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap u-boot ${COMPRESSIONTYPES}"
258CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" 258CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}"
259CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" 259CONVERSION_CMD_gz = "gzip -f -9 -c ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz"
260CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" 260CONVERSION_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}
271CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum" 271CONVERSION_CMD_sha384sum = "sha384sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha384sum"
272CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum" 272CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.sha512sum"
273CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" 273CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap"
274CONVERSION_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"
274CONVERSION_DEPENDS_lzma = "xz-native" 275CONVERSION_DEPENDS_lzma = "xz-native"
275CONVERSION_DEPENDS_gz = "pigz-native" 276CONVERSION_DEPENDS_gz = "pigz-native"
276CONVERSION_DEPENDS_bz2 = "pbzip2-native" 277CONVERSION_DEPENDS_bz2 = "pbzip2-native"
@@ -280,6 +281,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native"
280CONVERSION_DEPENDS_zip = "zip-native" 281CONVERSION_DEPENDS_zip = "zip-native"
281CONVERSION_DEPENDS_sum = "mtd-utils-native" 282CONVERSION_DEPENDS_sum = "mtd-utils-native"
282CONVERSION_DEPENDS_bmap = "bmap-tools-native" 283CONVERSION_DEPENDS_bmap = "bmap-tools-native"
284CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
283 285
284RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" 286RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4"
285RUNNABLE_MACHINE_PATTERNS ?= "qemu" 287RUNNABLE_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