mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

meta: Convert IMAGE_TYPEDEP to use override syntax

Browse Source 
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>
This commit is contained in:
Richard Purdie
2021-08-04 11:34:00 +01:00
parent 866d0756d0
commit ea984415f6
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/image-container.bbclass
+1 -1
View File
@@ -1,6 +1,6 @@
ROOTFS_BOOTSTRAP_INSTALL = "" ROOTFS_BOOTSTRAP_INSTALL = ""
IMAGE_TYPES_MASKED += "container" IMAGE_TYPES_MASKED += "container"
IMAGE_TYPEDEP_container = "tar.bz2" IMAGE_TYPEDEP:container = "tar.bz2"
python __anonymous() { python __anonymous() {
if "container" in d.getVar("IMAGE_FSTYPES") and \ if "container" in d.getVar("IMAGE_FSTYPES") and \
meta/classes/image-live.bbclass
+3 -3
View File
@@ -42,9 +42,9 @@ INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_
LIVE_ROOTFS_TYPE ?= "ext4" LIVE_ROOTFS_TYPE ?= "ext4"
ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}"
IMAGE_TYPEDEP_live = "${LIVE_ROOTFS_TYPE}" IMAGE_TYPEDEP:live = "${LIVE_ROOTFS_TYPE}"
IMAGE_TYPEDEP_iso = "${LIVE_ROOTFS_TYPE}" IMAGE_TYPEDEP:iso = "${LIVE_ROOTFS_TYPE}"
IMAGE_TYPEDEP_hddimg = "${LIVE_ROOTFS_TYPE}" IMAGE_TYPEDEP:hddimg = "${LIVE_ROOTFS_TYPE}"
IMAGE_TYPES_MASKED += "live hddimg iso" IMAGE_TYPES_MASKED += "live hddimg iso"
python() { python() {
meta/classes/image.bbclass
+2 -2
View File
@@ -382,8 +382,8 @@ python () {
if t.startswith("debugfs_"): if t.startswith("debugfs_"):
t = t[8:] t = t[8:]
debug = "debugfs_" debug = "debugfs_"
deps = (d.getVar('IMAGE_TYPEDEP_' + t) or "").split() deps = (d.getVar('IMAGE_TYPEDEP:' + t) or "").split()
vardeps.add('IMAGE_TYPEDEP_' + t) vardeps.add('IMAGE_TYPEDEP:' + t)
if baset not in typedeps: if baset not in typedeps:
typedeps[baset] = set() typedeps[baset] = set()
deps = [debug + dep for dep in deps] deps = [debug + dep for dep in deps]
meta/classes/image_types.bbclass
+2 -2
View File
@@ -29,7 +29,7 @@ def imagetypes_getdepends(d):
if d.getVar(var) is not None: if d.getVar(var) is not None:
deprecated.add(var) deprecated.add(var)
for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype) or "").split(): for typedepends in (d.getVar("IMAGE_TYPEDEP:%s" % basetype) or "").split():
base, rest = split_types(typedepends) base, rest = split_types(typedepends)
resttypes += rest resttypes += rest
@@ -197,7 +197,7 @@ IMAGE_CMD:multiubi () {
IMAGE_CMD:ubi () { IMAGE_CMD:ubi () {
multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}" multiubi_mkfs "${MKUBIFS_ARGS}" "${UBINIZE_ARGS}"
} }
IMAGE_TYPEDEP_ubi = "ubifs" IMAGE_TYPEDEP:ubi = "ubifs"
IMAGE_CMD:ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}" IMAGE_CMD:ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.ubifs ${MKUBIFS_ARGS}"
meta/lib/oeqa/selftest/cases/containerimage.py
+1 -1
View File
@@ -22,7 +22,7 @@ from oeqa.utils.commands import bitbake, get_bb_vars, runCmd
# #
class ContainerImageTests(OESelftestTestCase): class ContainerImageTests(OESelftestTestCase):
# Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that # Verify that when specifying a IMAGE_TYPEDEP: of the form "foo.bar" that
# the conversion type bar gets added as a dep as well # the conversion type bar gets added as a dep as well
def test_expected_files(self): def test_expected_files(self):
meta/lib/oeqa/selftest/cases/image_typedep.py
+2 -2
View File
@@ -9,7 +9,7 @@ from oeqa.utils.commands import bitbake
class ImageTypeDepTests(OESelftestTestCase): class ImageTypeDepTests(OESelftestTestCase):
# Verify that when specifying a IMAGE_TYPEDEP_ of the form "foo.bar" that # Verify that when specifying a IMAGE_TYPEDEP: of the form "foo.bar" that
# the conversion type bar gets added as a dep as well # the conversion type bar gets added as a dep as well
def test_conversion_typedep_added(self): def test_conversion_typedep_added(self):
@@ -22,7 +22,7 @@ LICENSE = "MIT"
IMAGE_FSTYPES = "testfstype" IMAGE_FSTYPES = "testfstype"
IMAGE_TYPES_MASKED += "testfstype" IMAGE_TYPES_MASKED += "testfstype"
IMAGE_TYPEDEP_testfstype = "tar.bz2" IMAGE_TYPEDEP:testfstype = "tar.bz2"
inherit image inherit image
scripts/contrib/convert-overrides.py
+1 -1
View File
@@ -64,7 +64,7 @@ skips = skips + ["get_appends_for_files", "test_doubleref_remove", "test_bitbake
skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"] skips = skips + ["test_rpm_remove", "test_bitbakelayers_add_remove", "recipe_append_file", "log_data_removed", "recipe_append", "systemd_machine_unit_append"]
skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"] skips = skips + ["recipetool_append", "changetype_remove", "try_appendfile_wc", "test_qemux86_directdisk", "test_layer_appends", "tgz_removed"]
imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD"] imagevars = ["IMAGE_CMD", "EXTRA_IMAGECMD", "IMAGE_TYPEDEP"]
packagevars = packagevars + imagevars packagevars = packagevars + imagevars
vars_re = {} vars_re = {}