diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2018-04-06 20:26:56 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-10 09:10:36 +0100 |
commit | 4ea831fb7f5d8b6863f432e325fea255e88461e4 (patch) | |
tree | a2a4cc589c02ead49ee110cb1d7f19c2dab467a4 | |
parent | 144faeb10c79cc50249143591c63e500cbb9849e (diff) | |
download | openembedded-core-contrib-4ea831fb7f5d8b6863f432e325fea255e88461e4.tar.gz |
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.
(From OE-Core rev: b959b3bd92aa2939d407800fc4167b0535fd4674)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/sstate.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 68089421f5..0b28850140 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): |