diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2018-04-06 20:26:57 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-10 09:10:36 +0100 |
| commit | 91782cf429ff9b66f8c59e7d1517df8ef680c258 (patch) | |
| tree | a26873e30e028f9d3a348cdf4182a80ac9a28643 | |
| parent | 4ea831fb7f5d8b6863f432e325fea255e88461e4 (diff) | |
| download | poky-91782cf429ff9b66f8c59e7d1517df8ef680c258.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)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/license.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index d353110464..9ac7e0bef8 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) |
