summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-30 13:58:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-30 14:10:36 +0100
commit4572e4cdc7b39ddde6f98c06600fc728660e0986 (patch)
tree92b033a964e49eb49160f93e196f98d2089d43b8 /meta/classes
parentab2fcd223d2935d4cb86c4a39cf8df1d465eddf8 (diff)
downloadpoky-4572e4cdc7b39ddde6f98c06600fc728660e0986.tar.gz
sstate: Add rpm allarch to overwrite whitelist
The packagegroup allarch rpm files for multilib can overwrite each other since they are in theory indentical (in contrast to the other backends). We therefore need to whitelist this to avoid build failures now this overwrite failure is fatal. (From OE-Core rev: d59ade0ca2cf629937434fa423dfbf35ce1209fc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sstate.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 9160e7f6da..403d6a0439 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -21,7 +21,8 @@ SSTATE_PATHSPEC = "${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/${SSTATE_PKGSPEC
21# of the system, we let the sstate paths take care of this. 21# of the system, we let the sstate paths take care of this.
22SSTATE_EXTRAPATH[vardepvalue] = "" 22SSTATE_EXTRAPATH[vardepvalue] = ""
23 23
24SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/" 24# For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical)
25SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/all/"
25# Avoid docbook/sgml catalog warnings for now 26# Avoid docbook/sgml catalog warnings for now
26SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml" 27SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml"
27 28