From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 3 Jul 2018 11:06:37 +0000 (+0100)
Subject: staging: Always use the default sysroot for allarch recipes
X-Git-Tag: uninative-2.2~202
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8ae70703f68853a8714a4fb8fa5d959b5e21a02d;p=openembedded-core.git

staging: Always use the default sysroot for allarch recipes

Without this, recipes can't find allarch data files like autoconf-archive.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 91cbc2083d..939042eb44 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -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: