3 files changed, 35 insertions, 14 deletions

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 7d5fc41535..76cbac6d6a 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -36,8 +36,6 @@ python multilib_virtclass_handler () {
     e.data.setVar("MLPREFIX", variant + "-")
     e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
     e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
-    if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
-            e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
     e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
 }
 
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index b76fd94162..f55e3a25aa 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -2,6 +2,11 @@ python multilib_virtclass_handler_global () {
     if not e.data:
         return
 
+    if isinstance(e, bb.event.RecipePreFinalise):
+        for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
+            if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
+               e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
+
     variant = e.data.getVar("BBEXTENDVARIANT", True)
 
     if isinstance(e, bb.event.RecipeParsed) and not variant:
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index 5f897ff31f..ce92a7ef8e 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -23,21 +23,39 @@ def read_pkgdatafile(fn):
 
     return pkgdata
 
+def all_pkgdatadirs(d):
+    archs = []
+    tos = []
+    tvs = []
+
+    archs.append(d.getVar("PACKAGE_ARCHS", True).split())
+    tos.append(d.getVar("TARGET_OS", True))
+    tvs.append(d.getVar("TARGET_VENDOR", True))
+
+    variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+    for item in variants.split():
+        localdata = bb.data.createCopy(d)
+        overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
+        localdata.setVar("OVERRIDES", overrides)
+        bb.data.update_data(localdata)
+
+        archs.append(localdata.getVar("PACKAGE_ARCHS", True).split())
+        tos.append(localdata.getVar("TARGET_OS", True))
+        tvs.append(localdata.getVar("TARGET_VENDOR", True))
+
+    dirs = []
+    for i in range(len(archs)):
+        for arch in archs[i]:
+            dirs.append(arch + tvs[i] + "-" + tos[i] + "/runtime/")
+    dirs.reverse()
+    return dirs 
+ 
 def get_subpkgedata_fn(pkg, d):
-    archs = d.expand("${PACKAGE_ARCHS}").split(" ")
-    mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None
+    dirs = all_pkgdatadirs(d)
 
-    if mlarchs:
-        for mlarch in mlarchs.split(" "):
-            if "_" in mlarch:
-                prefix, split, new_arch = mlarch.partition("_")
-                archs.append(new_arch)
-
-    archs.reverse()
     pkgdata = d.expand('${TMPDIR}/pkgdata/')
-    targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
-    for arch in archs:
-        fn = pkgdata + arch + targetdir + pkg
+    for dir in dirs:
+        fn = pkgdata + dir + pkg
         if os.path.exists(fn):
             return fn
     return d.expand('${PKGDATA_DIR}/runtime/%s' % pkg)