summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-04-06 20:26:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-10 09:10:36 +0100
commit4ea831fb7f5d8b6863f432e325fea255e88461e4 (patch)
treea2a4cc589c02ead49ee110cb1d7f19c2dab467a4 /meta
parent144faeb10c79cc50249143591c63e500cbb9849e (diff)
downloadpoky-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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass5
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 = " \
48 ${SDK_ARCH}_${PACKAGE_ARCH} \ 48 ${SDK_ARCH}_${PACKAGE_ARCH} \
49 allarch \ 49 allarch \
50 ${PACKAGE_ARCH} \ 50 ${PACKAGE_ARCH} \
51 ${MACHINE}" 51 ${PACKAGE_EXTRA_ARCHS} \
52 ${MACHINE_ARCH}"
52 53
53SSTATE_MANMACH ?= "${SSTATE_PKGARCH}" 54SSTATE_MANMACH ?= "${SSTATE_PKGARCH}"
54 55
@@ -1026,7 +1027,7 @@ python sstate_eventhandler2() {
1026 with open(preservestampfile, 'r') as f: 1027 with open(preservestampfile, 'r') as f:
1027 preservestamps = f.readlines() 1028 preservestamps = f.readlines()
1028 seen = [] 1029 seen = []
1029 for a in d.getVar("SSTATE_ARCHS").split(): 1030 for a in sorted(list(set(d.getVar("SSTATE_ARCHS").split()))):
1030 toremove = [] 1031 toremove = []
1031 i = d.expand("${SSTATE_MANIFESTS}/index-" + a) 1032 i = d.expand("${SSTATE_MANIFESTS}/index-" + a)
1032 if not os.path.exists(i): 1033 if not os.path.exists(i):