diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-16 20:33:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:27 +0000 |
commit | 71ef3191938da772b07274165dd3a85c2ed011f1 (patch) | |
tree | fd830ada451fec669352cb0dfc1bb316ea9cefd8 /meta/classes/sstate.bbclass | |
parent | 5a3d6c7bda0f158473c82d1c38ae2df26192dccb (diff) | |
download | poky-71ef3191938da772b07274165dd3a85c2ed011f1.tar.gz |
meta/scripts: Automated conversion of OE renamed variables
(From OE-Core rev: aa52af4518604b5bf13f3c5e885113bf868d6c81)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 86bf0395d2..787172b408 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -50,21 +50,21 @@ SSTATE_EXTRAPATH[vardepvalue] = "" | |||
50 | SSTATE_EXTRAPATHWILDCARD[vardepvalue] = "" | 50 | SSTATE_EXTRAPATHWILDCARD[vardepvalue] = "" |
51 | 51 | ||
52 | # For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical) | 52 | # For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical) |
53 | SSTATE_DUPWHITELIST = "${DEPLOY_DIR}/licenses/" | 53 | SSTATE_ALLOW_OVERLAP_FILES = "${DEPLOY_DIR}/licenses/" |
54 | # Avoid docbook/sgml catalog warnings for now | 54 | # Avoid docbook/sgml catalog warnings for now |
55 | SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" | 55 | SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" |
56 | # sdk-provides-dummy-nativesdk and nativesdk-buildtools-perl-dummy overlap for different SDKMACHINE | 56 | # sdk-provides-dummy-nativesdk and nativesdk-buildtools-perl-dummy overlap for different SDKMACHINE |
57 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_RPM}/sdk_provides_dummy_nativesdk/ ${DEPLOY_DIR_IPK}/sdk-provides-dummy-nativesdk/" | 57 | SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_RPM}/sdk_provides_dummy_nativesdk/ ${DEPLOY_DIR_IPK}/sdk-provides-dummy-nativesdk/" |
58 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_RPM}/buildtools_dummy_nativesdk/ ${DEPLOY_DIR_IPK}/buildtools-dummy-nativesdk/" | 58 | SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_RPM}/buildtools_dummy_nativesdk/ ${DEPLOY_DIR_IPK}/buildtools-dummy-nativesdk/" |
59 | # target-sdk-provides-dummy overlaps that allarch is disabled when multilib is used | 59 | # target-sdk-provides-dummy overlaps that allarch is disabled when multilib is used |
60 | SSTATE_DUPWHITELIST += "${COMPONENTS_DIR}/sdk-provides-dummy-target/ ${DEPLOY_DIR_RPM}/sdk_provides_dummy_target/ ${DEPLOY_DIR_IPK}/sdk-provides-dummy-target/" | 60 | SSTATE_ALLOW_OVERLAP_FILES += "${COMPONENTS_DIR}/sdk-provides-dummy-target/ ${DEPLOY_DIR_RPM}/sdk_provides_dummy_target/ ${DEPLOY_DIR_IPK}/sdk-provides-dummy-target/" |
61 | # Archive the sources for many architectures in one deploy folder | 61 | # Archive the sources for many architectures in one deploy folder |
62 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" | 62 | SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_SRC}" |
63 | # ovmf/grub-efi/systemd-boot/intel-microcode multilib recipes can generate identical overlapping files | 63 | # ovmf/grub-efi/systemd-boot/intel-microcode multilib recipes can generate identical overlapping files |
64 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/ovmf" | 64 | SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/ovmf" |
65 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/grub-efi" | 65 | SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/grub-efi" |
66 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/systemd-boot" | 66 | SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/systemd-boot" |
67 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/microcode" | 67 | SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_IMAGE}/microcode" |
68 | 68 | ||
69 | SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*" | 69 | SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*" |
70 | SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' | 70 | SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' |
@@ -260,7 +260,7 @@ def sstate_install(ss, d): | |||
260 | shareddirs.append(dstdir) | 260 | shareddirs.append(dstdir) |
261 | 261 | ||
262 | # Check the file list for conflicts against files which already exist | 262 | # Check the file list for conflicts against files which already exist |
263 | whitelist = (d.getVar("SSTATE_DUPWHITELIST") or "").split() | 263 | whitelist = (d.getVar("SSTATE_ALLOW_OVERLAP_FILES") or "").split() |
264 | match = [] | 264 | match = [] |
265 | for f in sharedfiles: | 265 | for f in sharedfiles: |
266 | if os.path.exists(f) and not os.path.islink(f): | 266 | if os.path.exists(f) and not os.path.islink(f): |
@@ -296,7 +296,7 @@ def sstate_install(ss, d): | |||
296 | "DISTRO_FEATURES on an existing build directory is not supported - you " \ | 296 | "DISTRO_FEATURES on an existing build directory is not supported - you " \ |
297 | "should really clean out tmp and rebuild (reusing sstate should be safe). " \ | 297 | "should really clean out tmp and rebuild (reusing sstate should be safe). " \ |
298 | "It could be the overlapping files detected are harmless in which case " \ | 298 | "It could be the overlapping files detected are harmless in which case " \ |
299 | "adding them to SSTATE_DUPWHITELIST may be the correct solution. It could " \ | 299 | "adding them to SSTATE_ALLOW_OVERLAP_FILES may be the correct solution. It could " \ |
300 | "also be your build is including two different conflicting versions of " \ | 300 | "also be your build is including two different conflicting versions of " \ |
301 | "things (e.g. bluez 4 and bluez 5 and the correct solution for that would " \ | 301 | "things (e.g. bluez 4 and bluez 5 and the correct solution for that would " \ |
302 | "be to resolve the conflict. If in doubt, please ask on the mailing list, " \ | 302 | "be to resolve the conflict. If in doubt, please ask on the mailing list, " \ |
@@ -350,7 +350,7 @@ def sstate_install(ss, d): | |||
350 | for lock in locks: | 350 | for lock in locks: |
351 | bb.utils.unlockfile(lock) | 351 | bb.utils.unlockfile(lock) |
352 | 352 | ||
353 | sstate_install[vardepsexclude] += "SSTATE_DUPWHITELIST STATE_MANMACH SSTATE_MANFILEPREFIX" | 353 | sstate_install[vardepsexclude] += "SSTATE_ALLOW_OVERLAP_FILES STATE_MANMACH SSTATE_MANFILEPREFIX" |
354 | sstate_install[vardeps] += "${SSTATEPOSTINSTFUNCS}" | 354 | sstate_install[vardeps] += "${SSTATEPOSTINSTFUNCS}" |
355 | 355 | ||
356 | def sstate_installpkg(ss, d): | 356 | def sstate_installpkg(ss, d): |