Skip to contentSkip to conversation

sstate: Add rpm allarch to overwrite whitelist

PATCH New Richard Purdie 1 participant 1 message Sep 30, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

meta/classes/sstate.bbclass +2 -1
index 9160e7f..403d6a0 100644
@@ -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"