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.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.bbclass')
-rw-r--r-- | meta/classes/image.bbclass | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 67603d958d..45dd56b544 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -26,7 +26,7 @@ PACKAGES = "" | |||
26 | DEPENDS += "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross cross-localedef-native" | 26 | DEPENDS += "${@' '.join(["%s-qemuwrapper-cross" % m for m in d.getVar("MULTILIB_VARIANTS").split()])} qemuwrapper-cross depmodwrapper-cross cross-localedef-native" |
27 | RDEPENDS += "${PACKAGE_INSTALL} ${LINGUAS_INSTALL} ${IMAGE_INSTALL_DEBUGFS}" | 27 | RDEPENDS += "${PACKAGE_INSTALL} ${LINGUAS_INSTALL} ${IMAGE_INSTALL_DEBUGFS}" |
28 | RRECOMMENDS += "${PACKAGE_INSTALL_ATTEMPTONLY}" | 28 | RRECOMMENDS += "${PACKAGE_INSTALL_ATTEMPTONLY}" |
29 | PATH_prepend = "${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" | 29 | PATH:prepend = "${@":".join(all_multilib_tune_values(d, 'STAGING_BINDIR_CROSS').split())}:" |
30 | 30 | ||
31 | INHIBIT_DEFAULT_DEPS = "1" | 31 | INHIBIT_DEFAULT_DEPS = "1" |
32 | 32 | ||
@@ -92,7 +92,7 @@ PID = "${@os.getpid()}" | |||
92 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 92 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
93 | 93 | ||
94 | LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot" | 94 | LDCONFIGDEPEND ?= "ldconfig-native:do_populate_sysroot" |
95 | LDCONFIGDEPEND_libc-musl = "" | 95 | LDCONFIGDEPEND:libc-musl = "" |
96 | 96 | ||
97 | # This is needed to have depmod data in PKGDATA_DIR, | 97 | # This is needed to have depmod data in PKGDATA_DIR, |
98 | # but if you're building small initramfs image | 98 | # but if you're building small initramfs image |
@@ -273,7 +273,7 @@ fakeroot python do_image_complete () { | |||
273 | } | 273 | } |
274 | do_image_complete[dirs] = "${TOPDIR}" | 274 | do_image_complete[dirs] = "${TOPDIR}" |
275 | SSTATETASKS += "do_image_complete" | 275 | SSTATETASKS += "do_image_complete" |
276 | SSTATE_SKIP_CREATION_task-image-complete = '1' | 276 | SSTATE_SKIP_CREATION:task-image-complete = '1' |
277 | do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" | 277 | do_image_complete[sstate-inputdirs] = "${IMGDEPLOYDIR}" |
278 | do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" | 278 | do_image_complete[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}" |
279 | do_image_complete[stamp-extra-info] = "${MACHINE_ARCH}" | 279 | do_image_complete[stamp-extra-info] = "${MACHINE_ARCH}" |
@@ -314,7 +314,7 @@ fakeroot python do_image_qa () { | |||
314 | addtask do_image_qa after do_rootfs before do_image | 314 | addtask do_image_qa after do_rootfs before do_image |
315 | 315 | ||
316 | SSTATETASKS += "do_image_qa" | 316 | SSTATETASKS += "do_image_qa" |
317 | SSTATE_SKIP_CREATION_task-image-qa = '1' | 317 | SSTATE_SKIP_CREATION:task-image-qa = '1' |
318 | do_image_qa[sstate-inputdirs] = "" | 318 | do_image_qa[sstate-inputdirs] = "" |
319 | do_image_qa[sstate-outputdirs] = "" | 319 | do_image_qa[sstate-outputdirs] = "" |
320 | python do_image_qa_setscene () { | 320 | python do_image_qa_setscene () { |
@@ -431,21 +431,21 @@ python () { | |||
431 | localdata.delVar('DATETIME') | 431 | localdata.delVar('DATETIME') |
432 | localdata.delVar('DATE') | 432 | localdata.delVar('DATE') |
433 | localdata.delVar('TMPDIR') | 433 | localdata.delVar('TMPDIR') |
434 | vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + realt, 'vardepsexclude', True) or '').split() | 434 | vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() |
435 | for dep in vardepsexclude: | 435 | for dep in vardepsexclude: |
436 | localdata.delVar(dep) | 436 | localdata.delVar(dep) |
437 | 437 | ||
438 | image_cmd = localdata.getVar("IMAGE_CMD") | 438 | image_cmd = localdata.getVar("IMAGE_CMD") |
439 | vardeps.add('IMAGE_CMD_' + realt) | 439 | vardeps.add('IMAGE_CMD:' + realt) |
440 | if image_cmd: | 440 | if image_cmd: |
441 | cmds.append("\t" + image_cmd) | 441 | cmds.append("\t" + image_cmd) |
442 | else: | 442 | else: |
443 | bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t) | 443 | bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - possibly invalid type name or missing support class" % t) |
444 | cmds.append(localdata.expand("\tcd ${IMGDEPLOYDIR}")) | 444 | cmds.append(localdata.expand("\tcd ${IMGDEPLOYDIR}")) |
445 | 445 | ||
446 | # Since a copy of IMAGE_CMD_xxx will be inlined within do_image_xxx, | 446 | # Since a copy of IMAGE_CMD:xxx will be inlined within do_image_xxx, |
447 | # prevent a redundant copy of IMAGE_CMD_xxx being emitted as a function. | 447 | # prevent a redundant copy of IMAGE_CMD:xxx being emitted as a function. |
448 | d.delVarFlag('IMAGE_CMD_' + realt, 'func') | 448 | d.delVarFlag('IMAGE_CMD:' + realt, 'func') |
449 | 449 | ||
450 | rm_tmp_images = set() | 450 | rm_tmp_images = set() |
451 | def gen_conversion_cmds(bt): | 451 | def gen_conversion_cmds(bt): |
@@ -667,6 +667,6 @@ systemd_preset_all () { | |||
667 | fi | 667 | fi |
668 | } | 668 | } |
669 | 669 | ||
670 | IMAGE_PREPROCESS_COMMAND_append = " ${@ 'systemd_preset_all;' if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and not bb.utils.contains('IMAGE_FEATURES', 'stateless-rootfs', True, False, d) else ''} reproducible_final_image_task; " | 670 | IMAGE_PREPROCESS_COMMAND:append = " ${@ 'systemd_preset_all;' if bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and not bb.utils.contains('IMAGE_FEATURES', 'stateless-rootfs', True, False, d) else ''} reproducible_final_image_task; " |
671 | 671 | ||
672 | CVE_PRODUCT = "" | 672 | CVE_PRODUCT = "" |