diff options
| author | Adrian <adrian.freihofer@gmail.com> | 2015-03-13 17:39:45 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-20 11:03:45 +0000 |
| commit | 6ad040a52271e6309e968908294a1d4a3338a980 (patch) | |
| tree | 1af491e7c11fd2426349756757f06903b1fe0c3a | |
| parent | 35fbb0f470fb9a6eac5cad7c82cb77cc372ba4b4 (diff) | |
| download | poky-6ad040a52271e6309e968908294a1d4a3338a980.tar.gz | |
Add archiver folder to SSTATE_DUPWHITELIST
Without this patch the source archiver class is not allowed to
archive the same source archive for different builds.
(From OE-Core rev: 37284185912d496a974d507bde7208d93eefc29d)
Signed-off-by: Adrian <adrian.freihofer@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sstate.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index ace6bdb57a..2f0632af89 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
| @@ -25,6 +25,8 @@ SSTATE_EXTRAPATH[vardepvalue] = "" | |||
| 25 | SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/all/" | 25 | SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/all/" |
| 26 | # Avoid docbook/sgml catalog warnings for now | 26 | # Avoid docbook/sgml catalog warnings for now |
| 27 | SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" | 27 | SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" |
| 28 | # Archive the sources for many architectures in one deploy folder | ||
| 29 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_SRC}" | ||
| 28 | 30 | ||
| 29 | SSTATE_SCAN_FILES ?= "*.la *-config *_config" | 31 | SSTATE_SCAN_FILES ?= "*.la *-config *_config" |
| 30 | SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f' | 32 | SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f' |