diff options
-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 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/containerimage.py | 2 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/image_typedep.py | 4 | ||||
-rwxr-xr-x | scripts/contrib/convert-overrides.py | 2 |
7 files changed, 12 insertions, 12 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 | ||
diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py b/meta/lib/oeqa/selftest/cases/containerimage.py index b92e520bc2..3068c9ba26 100644 --- a/meta/lib/oeqa/selftest/cases/containerimage.py +++ b/meta/lib/oeqa/selftest/cases/containerimage.py | |||
@@ -22,7 +22,7 @@ from oeqa.utils.commands import bitbake, get_bb_vars, runCmd | |||
22 | # | 22 | # |
23 | class ContainerImageTests(OESelftestTestCase): | 23 | class ContainerImageTests(OESelftestTestCase): |
24 | 24 | ||
25 | # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that | 25 | # Verify that when specifying a IMAGE_TYPEDEP: of the form "foo.bar" that |
26 | # the conversion type bar gets added as a dep as well | 26 | # the conversion type bar gets added as a dep as well |
27 | def test_expected_files(self): | 27 | def test_expected_files(self): |
28 | 28 | ||
diff --git a/meta/lib/oeqa/selftest/cases/image_typedep.py b/meta/lib/oeqa/selftest/cases/image_typedep.py index 52e1080f13..5b182a8f94 100644 --- a/meta/lib/oeqa/selftest/cases/image_typedep.py +++ b/meta/lib/oeqa/selftest/cases/image_typedep.py | |||
@@ -9,7 +9,7 @@ from oeqa.utils.commands import bitbake | |||
9 | 9 | ||
10 | class ImageTypeDepTests(OESelftestTestCase): | 10 | class ImageTypeDepTests(OESelftestTestCase): |
11 | 11 | ||
12 | # Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that | 12 | # Verify that when specifying a IMAGE_TYPEDEP: of the form "foo.bar" that |
13 | # the conversion type bar gets added as a dep as well | 13 | # the conversion type bar gets added as a dep as well |
14 | def test_conversion_typedep_added(self): | 14 | def test_conversion_typedep_added(self): |
15 | 15 | ||
@@ -22,7 +22,7 @@ LICENSE = "MIT" | |||
22 | IMAGE_FSTYPES = "testfstype" | 22 | IMAGE_FSTYPES = "testfstype" |
23 | 23 | ||
24 | IMAGE_TYPES_MASKED += "testfstype" | 24 | IMAGE_TYPES_MASKED += "testfstype" |
25 | IMAGE_TYPEDEP_testfstype = "tar.bz2" | 25 | IMAGE_TYPEDEP:testfstype = "tar.bz2" |
26 | 26 | ||
27 | inherit image | 27 | inherit image |
28 | 28 | ||
diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py index e3e271d32b..f7f1b79ca0 100755 --- a/scripts/contrib/convert-overrides.py +++ b/scripts/contrib/convert-overrides.py | |||
@@ -64,7 +64,7 @@ skips = skips + ["get_appends_for_files", "test_doubleref_remove", "test_bitbake | |||
64 | skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"] | 64 | skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"] |
65 | skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"] | 65 | skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"] |
66 | 66 | ||
67 | imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD"] | 67 | imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP"] |
68 | packagevars = packagevars + imagevars | 68 | packagevars = packagevars + imagevars |
69 | 69 | ||
70 | vars_re = {} | 70 | vars_re = {} |