]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate: Add rpm allarch to overwrite whitelist
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 30 Sep 2014 12:58:03 +0000 (13:58 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 30 Sep 2014 13:09:32 +0000 (14:09 +0100)
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/sstate.bbclass

index 9160e7f6dad0f43d0bcab67b9ecea72959ac3dc0..403d6a0439fc6ae2fe9949ba7160d7b80908e49f 100644 (file)
@@ -21,7 +21,8 @@ SSTATE_PATHSPEC   = "${SSTATE_DIR}/${SSTATE_EXTRAPATHWILDCARD}*/${SSTATE_PKGSPEC
 # of the system, we let the sstate paths take care of this.
 SSTATE_EXTRAPATH[vardepvalue] = ""
 
-SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/"
+# For multilib rpm the allarch packagegroup files can overwrite (in theory they're identical)
+SSTATE_DUPWHITELIST = "${DEPLOY_DIR_IMAGE}/ ${DEPLOY_DIR}/licenses/ ${DEPLOY_DIR_RPM}/all/"
 # Avoid docbook/sgml catalog warnings for now
 SSTATE_DUPWHITELIST += "${STAGING_ETCDIR_NATIVE}/sgml ${STAGING_DATADIR_NATIVE}/sgml"