diff options
| author | Yongxin Liu <yongxin.liu@windriver.com> | 2018-08-22 17:24:36 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 07:50:00 +0100 |
| commit | 4a95d573c3bf2c0d5e9c4b7a452b54a2f88ff52f (patch) | |
| tree | 87c42a6d5c63916aec611c31d1f86ffead69e574 /meta | |
| parent | 4253bded02b77c50554a25f11a427e3bb351f081 (diff) | |
| download | poky-4a95d573c3bf2c0d5e9c4b7a452b54a2f88ff52f.tar.gz | |
sstate: add intel-microcode to SSTATE_DUPWHITELIST
intel-microcode multilib recipes can generate identical overlapping
files: microcode.cpio.
(From OE-Core rev: 4b27da3334aff7f9f03ae934bbab7e7af07df3f6)
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/sstate.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index c0e54a398d..084d631523 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -33,10 +33,11 @@ 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 | 36 | # ovmf/grub-efi/systemd-boot/intel-microcode multilib recipes can generate identical overlapping files |
| 37 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/ovmf" | 37 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/ovmf" |
| 38 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/grub-efi" | 38 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/grub-efi" |
| 39 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/systemd-boot" | 39 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/systemd-boot" |
| 40 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/microcode" | ||
| 40 | 41 | ||
| 41 | SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*" | 42 | SSTATE_SCAN_FILES ?= "*.la *-config *_config postinst-*" |
| 42 | SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' | 43 | SSTATE_SCAN_CMD ??= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES").split())}" \) -type f' |