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 | |
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')
-rw-r--r-- | meta/classes/image-container.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/image-live.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/image.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/image_types.bbclass | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/image-container.bbclass b/meta/classes/image-container.bbclass index f002858bd2..3d1993576a 100644 --- a/meta/classes/image-container.bbclass +++ b/meta/classes/image-container.bbclass | |||
@@ -1,6 +1,6 @@ | |||
1 | ROOTFS_BOOTSTRAP_INSTALL = "" | 1 | ROOTFS_BOOTSTRAP_INSTALL = "" |
2 | IMAGE_TYPES_MASKED += "container" | 2 | IMAGE_TYPES_MASKED += "container" |
3 | IMAGE_TYPEDEP_container = "tar.bz2" | 3 | IMAGE_TYPEDEP:container = "tar.bz2" |
4 | 4 | ||
5 | python __anonymous() { | 5 | python __anonymous() { |
6 | if "container" in d.getVar("IMAGE_FSTYPES") and \ | 6 | if "container" in d.getVar("IMAGE_FSTYPES") and \ |
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index fd876ed8e1..2c948190cf 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass | |||
@@ -42,9 +42,9 @@ INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_ | |||
42 | LIVE_ROOTFS_TYPE ?= "ext4" | 42 | LIVE_ROOTFS_TYPE ?= "ext4" |
43 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" | 43 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" |
44 | 44 | ||
45 | IMAGE_TYPEDEP_live = "${LIVE_ROOTFS_TYPE}" | 45 | IMAGE_TYPEDEP:live = "${LIVE_ROOTFS_TYPE}" |
46 | IMAGE_TYPEDEP_iso = "${LIVE_ROOTFS_TYPE}" | 46 | IMAGE_TYPEDEP:iso = "${LIVE_ROOTFS_TYPE}" |
47 | IMAGE_TYPEDEP_hddimg = "${LIVE_ROOTFS_TYPE}" | 47 | IMAGE_TYPEDEP:hddimg = "${LIVE_ROOTFS_TYPE}" |
48 | IMAGE_TYPES_MASKED += "live hddimg iso" | 48 | IMAGE_TYPES_MASKED += "live hddimg iso" |
49 | 49 | ||
50 | python() { | 50 | python() { |
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 45dd56b544..0321b4f7ae 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -382,8 +382,8 @@ python () { | |||
382 | if t.startswith("debugfs_"): | 382 | if t.startswith("debugfs_"): |
383 | t = t[8:] | 383 | t = t[8:] |
384 | debug = "debugfs_" | 384 | debug = "debugfs_" |
385 | deps = (d.getVar('IMAGE_TYPEDEP_' + t) or "").split() | 385 | deps = (d.getVar('IMAGE_TYPEDEP:' + t) or "").split() |
386 | vardeps.add('IMAGE_TYPEDEP_' + t) | 386 | vardeps.add('IMAGE_TYPEDEP:' + t) |
387 | if baset not in typedeps: | 387 | if baset not in typedeps: |
388 | typedeps[baset] = set() | 388 | typedeps[baset] = set() |
389 | deps = [debug + dep for dep in deps] | 389 | deps = [debug + dep for dep in deps] |
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 | ||