summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oe/packagedata.py26
1 files changed, 3 insertions, 23 deletions
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index ce92a7ef8e..62fd71898e 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -24,30 +24,10 @@ def read_pkgdatafile(fn):
24 return pkgdata 24 return pkgdata
25 25
26def all_pkgdatadirs(d): 26def all_pkgdatadirs(d):
27 archs = []
28 tos = []
29 tvs = []
30
31 archs.append(d.getVar("PACKAGE_ARCHS", True).split())
32 tos.append(d.getVar("TARGET_OS", True))
33 tvs.append(d.getVar("TARGET_VENDOR", True))
34
35 variants = d.getVar("MULTILIB_VARIANTS", True) or ""
36 for item in variants.split():
37 localdata = bb.data.createCopy(d)
38 overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
39 localdata.setVar("OVERRIDES", overrides)
40 bb.data.update_data(localdata)
41
42 archs.append(localdata.getVar("PACKAGE_ARCHS", True).split())
43 tos.append(localdata.getVar("TARGET_OS", True))
44 tvs.append(localdata.getVar("TARGET_VENDOR", True))
45
46 dirs = [] 27 dirs = []
47 for i in range(len(archs)): 28 triplets = (d.getVar("PKGMLTRIPLETS") or "").split()
48 for arch in archs[i]: 29 for t in triplets:
49 dirs.append(arch + tvs[i] + "-" + tos[i] + "/runtime/") 30 dirs.append(t + "/runtime/")
50 dirs.reverse()
51 return dirs 31 return dirs
52 32
53def get_subpkgedata_fn(pkg, d): 33def get_subpkgedata_fn(pkg, d):