From patchwork Sat Feb 11 00:30:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/1] base.bbclass: look in layers for SRC_URI with MACHINE overrides too Date: Sat, 11 Feb 2012 00:30:07 -0000 From: Joshua Lock X-Patchwork-Id: 21155 Message-Id: To: openembedded-core@lists.openembedded.org The logic which looks for MACHINE overrides in SRC_URI and updates PACKAGE_ARCH accordingly doesn't account for SRC_URI overrides in layers. This patch may not be the cleanest approach to solving the issue but it works. Signed-off-by: Joshua Lock --- meta/classes/base.bbclass | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index a26ac94..8fd5e53 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -460,6 +460,16 @@ python () { path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d) if os.path.isdir(path): paths.append(path) + + # FILE is relative to the original recipe, for any bbappends in + # layers we need to look a little further + expaths = d.getVar('FILESEXTRAPATHS', True) or "" + for path in expaths.split(":"): + if len(path): + p = bb.data.expand(os.path.join(path, "${MACHINE}"), d) + if os.path.isdir(p): + paths.append(p) + if len(paths) != 0: for s in srcuri.split(): if not s.startswith("file://"):