diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-09 16:58:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-14 11:36:31 +0100 |
| commit | 79457a3e2b30202d3f000d87661e9d60d28f1d0b (patch) | |
| tree | 77513e2b5512455f8ca0705879ba8083567e0418 | |
| parent | b5970ab6511ad8ca3004315830d8fd6ed66bcd89 (diff) | |
| download | poky-79457a3e2b30202d3f000d87661e9d60d28f1d0b.tar.gz | |
sstate: Remove DEPLOY_DIR_IMAGE from SSTATE_DUPWHITELIST
Replace the generic whitelist entry with entries for the three specific
'problem' cases in OE-Core. This means the general DEPLOY_DIR_IMAGE entry
doesn't mask problems for others as was recently encoutered by users
reported on irc. In the whitelisted cases they occur only in multilib builds
and the files are identical.
(From OE-Core rev: 05f6042a40bb772f7ce8d6819c5b2937d8c9808d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sstate.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 6743becf07..9927c76596 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -25,7 +25,7 @@ PV[vardepvalue] = "${PV}" | |||
| 25 | SSTATE_EXTRAPATH[vardepvalue] = "" | 25 | SSTATE_EXTRAPATH[vardepvalue] = "" |
| 26 | 26 | ||
| 27 | # For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical) | 27 | # For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical) |
| 28 | SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/noarch/" | 28 | SSTATE_DUPWHITELIST = "${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/noarch/" |
| 29 | # Avoid docbook/sgml catalog warnings for now | 29 | # Avoid docbook/sgml catalog warnings for now |
| 30 | SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" | 30 | SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" |
| 31 | # sdk-provides-dummy-nativesdk and nativesdk-buildtools-perl-dummy overlap for different SDKMACHINE | 31 | # sdk-provides-dummy-nativesdk and nativesdk-buildtools-perl-dummy overlap for different SDKMACHINE |
| @@ -33,6 +33,10 @@ SSTATE_DUPWHITELIST += "${DEPLOY_DIR_RPM}/sdk_provides_dummy_nativesdk/ ${DEPLOY | |||
| 33 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_RPM}/buildtools_dummy_nativesdk/ ${DEPLOY_DIR_IPK}/buildtools-dummy-nativesdk/" | 33 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_RPM}/buildtools_dummy_nativesdk/ ${DEPLOY_DIR_IPK}/buildtools-dummy-nativesdk/" |
| 34 | # Archive the sources for many architectures in one deploy folder | 34 | # Archive the sources for many architectures in one deploy folder |
| 35 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" | 35 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" |
| 36 | # ovmf/grub-efi/systemd-boot multilib recipes can generate identical overlapping files | ||
| 37 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/ovmf" | ||
| 38 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/grub-efi" | ||
| 39 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/systemd-boot" | ||
| 36 | 40 | ||
| 37 | SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*" | 41 | SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*" |
| 38 | SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' | 42 | SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' |