summaryrefslogtreecommitdiffstats
path: root/meta/classes/staging.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-27 17:22:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-27 22:54:24 +0000
commit68150bac7444f089f19c789e9f6602d59f605d7a (patch)
tree033c95bb277e452923441c7235a6dcf9775a354d /meta/classes/staging.bbclass
parent85e72e129362db896b0d368077033e4a2e373cf9 (diff)
downloadopenembedded-core-68150bac7444f089f19c789e9f6602d59f605d7a.tar.gz
openembedded-core-68150bac7444f089f19c789e9f6602d59f605d7a.tar.bz2
openembedded-core-68150bac7444f089f19c789e9f6602d59f605d7a.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r--meta/classes/staging.bbclass36
1 files changed, 5 insertions, 31 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 1b9e84d97e..3fcbc9f15d 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -470,40 +470,14 @@ python extend_recipe_sysroot() {
os.symlink(c + "." + taskhash, depdir + "/" + c)
- d2 = d
- destsysroot = recipesysroot
- variant = ''
- if setscenedeps[dep][2].startswith("virtual:multilib"):
- variant = setscenedeps[dep][2].split(":")[2]
- if variant != current_variant:
- if variant not in multilibs:
- multilibs[variant] = get_multilib_datastore(variant, d)
- d2 = multilibs[variant]
- destsysroot = d2.getVar("RECIPE_SYSROOT")
+ manifest, d2 = oe.sstatesig.find_sstate_manifest(c, setscenedeps[dep][2], "populate_sysroot", d, multilibs)
+ destsysroot = d2.getVar("RECIPE_SYSROOT")
native = False
- if c.endswith("-native"):
- manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}-%s.populate_sysroot" % c)
+ if c.endswith("-native") or "-cross-" in c or "-crosssdk" in c:
native = True
- elif c.startswith("nativesdk-"):
- manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
- elif "-cross-" in c:
- manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}_${TARGET_ARCH}-%s.populate_sysroot" % c)
- native = True
- elif "-crosssdk" in c:
- manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}_${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
- native = True
- else:
- pkgarchs = ['${MACHINE_ARCH}']
- pkgarchs = pkgarchs + list(reversed(d2.getVar("PACKAGE_EXTRA_ARCHS").split()))
- pkgarchs.append('allarch')
- for pkgarch in pkgarchs:
- manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-%s-%s.populate_sysroot" % (pkgarch, c))
- if os.path.exists(manifest):
- break
- if not os.path.exists(manifest):
- bb.warn("Manifest %s not found?" % manifest)
- else:
+
+ if manifest:
newmanifest = collections.OrderedDict()
if native:
fm = fixme['native']