diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-04 11:34:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-04 20:45:41 +0100 |
commit | ea984415f6ae5f6ad3f5b0900ace683027818a32 (patch) | |
tree | 5fb909530723d3e7afcc242a6a69d20a26fad5e6 /meta/classes/image_types.bbclass | |
parent | 866d0756d0cfec78d88037ba6c71ec58af9b215f (diff) | |
download | poky-ea984415f6ae5f6ad3f5b0900ace683027818a32.tar.gz |
meta: Convert IMAGE_TYPEDEP to use override syntax
The IMAGE_TYPEDEP variable would make more sense to match the form of the
other image override variables, convert it to use the overrides format.
(From OE-Core rev: 8573f6b2a7af9867da0b21936ffd2cd2a417de1d)
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 3620931224..6a88ac85ad 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -29,7 +29,7 @@ def imagetypes_getdepends(d): | |||
29 | if d.getVar(var) is not None: | 29 | if d.getVar(var) is not None: |
30 | deprecated.add(var) | 30 | deprecated.add(var) |
31 | 31 | ||
32 | for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split(): | 32 | for typedepends in (d.getVar("IMAGE_TYPEDEP:%s" % basetype) or "").split(): |
33 | base, rest = split_types(typedepends) | 33 | base, rest = split_types(typedepends) |
34 | resttypes += rest | 34 | resttypes += rest |
35 | 35 | ||
@@ -197,7 +197,7 @@ IMAGE_CMD:multiubi () { | |||
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 | ||