]> code.ossystems Code Review - openembedded-core.git/commitdiff
staging: Always use the default sysroot for allarch recipes
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 3 Jul 2018 11:06:37 +0000 (12:06 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 3 Jul 2018 23:01:37 +0000 (00:01 +0100)
Without this, recipes can't find allarch data files like autoconf-archive.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/staging.bbclass

index 91cbc2083d7a01173254cff59f6180977e7b9776..939042eb4423a7c1ebc60934ee943164f66c3dd8 100644 (file)
@@ -474,6 +474,9 @@ python extend_recipe_sysroot() {
             # We need a consistent WORKDIR for the image
             d2.setVar("WORKDIR", d.getVar("WORKDIR"))
         destsysroot = d2.getVar("RECIPE_SYSROOT")
+        # We put allarch recipes into the default sysroot
+        if manifest and "allarch" in manifest:
+            destsysroot = d.getVar("RECIPE_SYSROOT")
 
         native = False
         if c.endswith("-native") or "-cross-" in c or "-crosssdk" in c: