summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2018-04-06 18:26:57 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-10-10 12:27:02 (GMT)
commitc5d9b77ba8ed6dc6cc05c7f7d79d344260709d64 (patch)
treeb5a81f4c8bdb8a2394c0b24988a701218db5246f
parent05711ba18587aaaf4a9c465a1dd4537f27ceda93 (diff)
downloadpoky-c5d9b77ba8ed6dc6cc05c7f7d79d344260709d64.tar.gz
license.bbclass: Minor simplification of get_deployed_dependencies()
Since ${SSTATE_ARCHS} now contains ${PACKAGE_EXTRA_ARCHS} there is no longer any need to add those extra architectures to the list of architectures handled in get_deployed_dependencies(). (From OE-Core rev: e55e6df4f1434458cdfa0e2d3610b48119e5a782) (From OE-Core rev: 64ca9e513eabc85db9648a6483bd3024c7fe8746) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 82fab9c..a8df329 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -226,9 +226,7 @@ def get_deployed_dependencies(d):
226 # The manifest file name contains the arch. Because we are not running 226 # The manifest file name contains the arch. Because we are not running
227 # in the recipe context it is necessary to check every arch used. 227 # in the recipe context it is necessary to check every arch used.
228 sstate_manifest_dir = d.getVar("SSTATE_MANIFESTS") 228 sstate_manifest_dir = d.getVar("SSTATE_MANIFESTS")
229 sstate_archs = d.getVar("SSTATE_ARCHS") 229 archs = list(set(d.getVar("SSTATE_ARCHS").split()))
230 extra_archs = d.getVar("PACKAGE_EXTRA_ARCHS")
231 archs = list(set(("%s %s" % (sstate_archs, extra_archs)).split()))
232 for dep in depends: 230 for dep in depends:
233 # Some recipes have an arch on their own, so we try that first. 231 # Some recipes have an arch on their own, so we try that first.
234 special_arch = d.getVar("PACKAGE_ARCH_pn-%s" % dep) 232 special_arch = d.getVar("PACKAGE_ARCH_pn-%s" % dep)