From 3eff72cc1f5989144f8d2cc93fab69e4d3d80f8c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 27 Feb 2018 17:22:32 +0000
Subject: sstatesig/staging/package_manager: Create common sstate manifest code

Create a common function for locating task manifest files rather than
several implementations with missing pieces.

(From OE-Core rev: 68150bac7444f089f19c789e9f6602d59f605d7a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oe/package_manager.py | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'meta/lib/oe/package_manager.py')

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index f59eaf7b85..8c567be0f4 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -507,37 +507,8 @@ def create_packages_dir(d, rpm_repo_dir, deploydir, taskname, filterbydependenci
 
     for dep in rpmdeps:
         c = taskdepdata[dep][0]
-
-        d2 = d
-        variant = ''
-        if taskdepdata[dep][2].startswith("virtual:multilib"):
-            variant = taskdepdata[dep][2].split(":")[2]
-            if variant not in multilibs:
-                multilibs[variant] = oe.utils.get_multilib_datastore(variant, d)
-            d2 = multilibs[variant]
-
-        if c.endswith("-native"):
-            pkgarchs = ["${BUILD_ARCH}"]
-        elif c.startswith("nativesdk-"):
-            pkgarchs = ["${SDK_ARCH}_${SDK_OS}", "allarch"]
-        elif "-cross-canadian" in c:
-            pkgarchs = ["${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}"]
-        elif "-cross-" in c:
-            pkgarchs = ["${BUILD_ARCH}_${TARGET_ARCH}"]
-        elif "-crosssdk" in c:
-            pkgarchs = ["${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}"]
-        else:
-            pkgarchs = ['${MACHINE_ARCH}']
-            pkgarchs = pkgarchs + list(reversed(d2.getVar("PACKAGE_EXTRA_ARCHS").split()))
-            pkgarchs.append('allarch')
-            pkgarchs.append('${SDK_ARCH}_${SDK_ARCH}-${SDKPKGSUFFIX}')
-
-        for pkgarch in pkgarchs:
-            manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-%s-%s.%s" % (pkgarch, c, taskname))
-            if os.path.exists(manifest):
-                break
+        manifest, d2 = oe.sstatesig.find_sstate_manifest(c, taskdepdata[dep][2], taskname, d, multilibs)
         if not os.path.exists(manifest):
-            bb.warn("Manifest %s not found in %s (variant '%s')?" % (manifest, d2.expand(" ".join(pkgarchs)), variant))
             continue
         with open(manifest, "r") as f:
             for l in f:
-- 
cgit v1.2.3-54-g00ecf