[oe-commits] [openembedded-core] 02/03: sstate.bbclass: Add ${PACKAGE_EXTRA_ARCHS} to SSTATE_ARCHS

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo-next
in repository openembedded-core.

commit b959b3bd92aa2939d407800fc4167b0535fd4674
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Fri Apr 6 20:26:56 2018 +0200

    sstate.bbclass: Add ${PACKAGE_EXTRA_ARCHS} to SSTATE_ARCHS
    
    This makes sure files provided by packages that use any of the extra
    architectures defined using ${PACKAGE_EXTRA_ARCHS} are cleaned from
    tmp/sysroot-components when sstate_eventhandler2() executes.
    
    Without this, changing a package from using one of the extra
    architectures to another architecture would lead to files being
    leftover in tmp/sysroot-components, which could later be picked up
    when creating the RSS for another package rather than the files that
    belonged to the updated package.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/sstate.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 6808942..0b28850 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -48,7 +48,8 @@ SSTATE_ARCHS = " \
     ${SDK_ARCH}_${PACKAGE_ARCH} \
     allarch \
     ${PACKAGE_ARCH} \
-    ${MACHINE}"
+    ${PACKAGE_EXTRA_ARCHS} \
+    ${MACHINE_ARCH}"
 
 SSTATE_MANMACH ?= "${SSTATE_PKGARCH}"
 
@@ -1026,7 +1027,7 @@ python sstate_eventhandler2() {
         with open(preservestampfile, 'r') as f:
             preservestamps = f.readlines()
     seen = []
-    for a in d.getVar("SSTATE_ARCHS").split():
+    for a in sorted(list(set(d.getVar("SSTATE_ARCHS").split()))):
         toremove = []
         i = d.expand("${SSTATE_MANIFESTS}/index-" + a)
         if not os.path.exists(i):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.