diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/image_types.bbclass | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
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 | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 6b28cdbb3c..3620931224 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -56,9 +56,9 @@ ZIP_COMPRESSION_LEVEL ?= "-9" | |||
56 | ZSTD_COMPRESSION_LEVEL ?= "-3" | 56 | ZSTD_COMPRESSION_LEVEL ?= "-3" |
57 | 57 | ||
58 | JFFS2_SUM_EXTRA_ARGS ?= "" | 58 | JFFS2_SUM_EXTRA_ARGS ?= "" |
59 | IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}" | 59 | IMAGE_CMD:jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.jffs2 ${EXTRA_IMAGECMD}" |
60 | 60 | ||
61 | IMAGE_CMD_cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cramfs ${EXTRA_IMAGECMD}" | 61 | IMAGE_CMD:cramfs = "mkfs.cramfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cramfs ${EXTRA_IMAGECMD}" |
62 | 62 | ||
63 | oe_mkext234fs () { | 63 | oe_mkext234fs () { |
64 | fstype=$1 | 64 | fstype=$1 |
@@ -88,12 +88,12 @@ oe_mkext234fs () { | |||
88 | fsck.$fstype -pvfD ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype || [ $? -le 3 ] | 88 | fsck.$fstype -pvfD ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype || [ $? -le 3 ] |
89 | } | 89 | } |
90 | 90 | ||
91 | IMAGE_CMD_ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" | 91 | IMAGE_CMD:ext2 = "oe_mkext234fs ext2 ${EXTRA_IMAGECMD}" |
92 | IMAGE_CMD_ext3 = "oe_mkext234fs ext3 ${EXTRA_IMAGECMD}" | 92 | IMAGE_CMD:ext3 = "oe_mkext234fs ext3 ${EXTRA_IMAGECMD}" |
93 | IMAGE_CMD_ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}" | 93 | IMAGE_CMD:ext4 = "oe_mkext234fs ext4 ${EXTRA_IMAGECMD}" |
94 | 94 | ||
95 | MIN_BTRFS_SIZE ?= "16384" | 95 | MIN_BTRFS_SIZE ?= "16384" |
96 | IMAGE_CMD_btrfs () { | 96 | IMAGE_CMD:btrfs () { |
97 | size=${ROOTFS_SIZE} | 97 | size=${ROOTFS_SIZE} |
98 | if [ ${size} -lt ${MIN_BTRFS_SIZE} ] ; then | 98 | if [ ${size} -lt ${MIN_BTRFS_SIZE} ] ; then |
99 | size=${MIN_BTRFS_SIZE} | 99 | size=${MIN_BTRFS_SIZE} |
@@ -103,22 +103,22 @@ IMAGE_CMD_btrfs () { | |||
103 | mkfs.btrfs ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.btrfs | 103 | mkfs.btrfs ${EXTRA_IMAGECMD} -r ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.btrfs |
104 | } | 104 | } |
105 | 105 | ||
106 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs ${EXTRA_IMAGECMD} -noappend" | 106 | IMAGE_CMD:squashfs = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs ${EXTRA_IMAGECMD} -noappend" |
107 | IMAGE_CMD_squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" | 107 | IMAGE_CMD:squashfs-xz = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-xz ${EXTRA_IMAGECMD} -noappend -comp xz" |
108 | IMAGE_CMD_squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-lzo ${EXTRA_IMAGECMD} -noappend -comp lzo" | 108 | IMAGE_CMD:squashfs-lzo = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-lzo ${EXTRA_IMAGECMD} -noappend -comp lzo" |
109 | IMAGE_CMD_squashfs-lz4 = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-lz4 ${EXTRA_IMAGECMD} -noappend -comp lz4" | 109 | IMAGE_CMD:squashfs-lz4 = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.squashfs-lz4 ${EXTRA_IMAGECMD} -noappend -comp lz4" |
110 | 110 | ||
111 | IMAGE_CMD_erofs = "mkfs.erofs ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.erofs ${IMAGE_ROOTFS}" | 111 | IMAGE_CMD:erofs = "mkfs.erofs ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.erofs ${IMAGE_ROOTFS}" |
112 | IMAGE_CMD_erofs-lz4 = "mkfs.erofs -zlz4 ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.erofs-lz4 ${IMAGE_ROOTFS}" | 112 | IMAGE_CMD:erofs-lz4 = "mkfs.erofs -zlz4 ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.erofs-lz4 ${IMAGE_ROOTFS}" |
113 | IMAGE_CMD_erofs-lz4hc = "mkfs.erofs -zlz4hc ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.erofs-lz4hc ${IMAGE_ROOTFS}" | 113 | IMAGE_CMD:erofs-lz4hc = "mkfs.erofs -zlz4hc ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.erofs-lz4hc ${IMAGE_ROOTFS}" |
114 | 114 | ||
115 | 115 | ||
116 | IMAGE_CMD_TAR ?= "tar" | 116 | IMAGE_CMD_TAR ?= "tar" |
117 | # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs | 117 | # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs |
118 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 118 | IMAGE_CMD:tar = "${IMAGE_CMD_TAR} --sort=name --format=posix --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
119 | 119 | ||
120 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" | 120 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" |
121 | IMAGE_CMD_cpio () { | 121 | IMAGE_CMD:cpio () { |
122 | (cd ${IMAGE_ROOTFS} && find . | sort | cpio --reproducible -o -H newc >${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio) | 122 | (cd ${IMAGE_ROOTFS} && find . | sort | cpio --reproducible -o -H newc >${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio) |
123 | # We only need the /init symlink if we're building the real | 123 | # We only need the /init symlink if we're building the real |
124 | # image. The -dbg image doesn't need it! By being clever | 124 | # image. The -dbg image doesn't need it! By being clever |
@@ -184,7 +184,7 @@ multiubi_mkfs() { | |||
184 | fi | 184 | fi |
185 | } | 185 | } |
186 | 186 | ||
187 | IMAGE_CMD_multiubi () { | 187 | IMAGE_CMD:multiubi () { |
188 | # Split MKUBIFS_ARGS_<name> and UBINIZE_ARGS_<name> | 188 | # Split MKUBIFS_ARGS_<name> and UBINIZE_ARGS_<name> |
189 | for name in ${MULTIUBI_BUILD}; do | 189 | for name in ${MULTIUBI_BUILD}; do |
190 | eval local mkubifs_args=\"\$MKUBIFS_ARGS_${name}\" | 190 | eval local mkubifs_args=\"\$MKUBIFS_ARGS_${name}\" |
@@ -194,15 +194,15 @@ IMAGE_CMD_multiubi () { | |||
194 | done | 194 | done |
195 | } | 195 | } |
196 | 196 | ||
197 | IMAGE_CMD_ubi () { | 197 | IMAGE_CMD:ubi () { |
198 | multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" | 198 | multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" |
199 | } | 199 | } |
200 | IMAGE_TYPEDEP_ubi = "ubifs" | 200 | IMAGE_TYPEDEP_ubi = "ubifs" |
201 | 201 | ||
202 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" | 202 | IMAGE_CMD:ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" |
203 | 203 | ||
204 | MIN_F2FS_SIZE ?= "524288" | 204 | MIN_F2FS_SIZE ?= "524288" |
205 | IMAGE_CMD_f2fs () { | 205 | IMAGE_CMD:f2fs () { |
206 | # We need to add additional smarts here form devices smaller than 1.5G | 206 | # We need to add additional smarts here form devices smaller than 1.5G |
207 | # Need to scale appropriately between 40M -> 1.5G as the "overprovision | 207 | # Need to scale appropriately between 40M -> 1.5G as the "overprovision |
208 | # ratio" goes down as the device gets bigger (70% -> 4.5%), below about | 208 | # ratio" goes down as the device gets bigger (70% -> 4.5%), below about |
@@ -224,14 +224,14 @@ inherit siteinfo kernel-arch image-artifact-names | |||
224 | 224 | ||
225 | JFFS2_ENDIANNESS ?= "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" | 225 | JFFS2_ENDIANNESS ?= "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-l', '-b', d)}" |
226 | JFFS2_ERASEBLOCK ?= "0x40000" | 226 | JFFS2_ERASEBLOCK ?= "0x40000" |
227 | EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" | 227 | EXTRA_IMAGECMD:jffs2 ?= "--pad ${JFFS2_ENDIANNESS} --eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers" |
228 | 228 | ||
229 | # Change these if you want default mkfs behavior (i.e. create minimal inode number) | 229 | # Change these if you want default mkfs behavior (i.e. create minimal inode number) |
230 | EXTRA_IMAGECMD_ext2 ?= "-i 4096" | 230 | EXTRA_IMAGECMD:ext2 ?= "-i 4096" |
231 | EXTRA_IMAGECMD_ext3 ?= "-i 4096" | 231 | EXTRA_IMAGECMD:ext3 ?= "-i 4096" |
232 | EXTRA_IMAGECMD_ext4 ?= "-i 4096" | 232 | EXTRA_IMAGECMD:ext4 ?= "-i 4096" |
233 | EXTRA_IMAGECMD_btrfs ?= "-n 4096 --shrink" | 233 | EXTRA_IMAGECMD:btrfs ?= "-n 4096 --shrink" |
234 | EXTRA_IMAGECMD_f2fs ?= "" | 234 | EXTRA_IMAGECMD:f2fs ?= "" |
235 | 235 | ||
236 | do_image_cpio[depends] += "cpio-native:do_populate_sysroot" | 236 | do_image_cpio[depends] += "cpio-native:do_populate_sysroot" |
237 | do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" | 237 | do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" |