From patchwork Tue Jun 6 15:03:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 103165 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1467905qgd; Tue, 6 Jun 2017 08:03:28 -0700 (PDT) X-Received: by 10.84.136.135 with SMTP id 7mr21606838pll.98.1496761408540; Tue, 06 Jun 2017 08:03:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496761408; cv=none; d=google.com; s=arc-20160816; b=EDpymI3dXLPmbuM0KEvAaZriBPYG+1BYz5ZvywFiyWeSAON8gH6ghjD4UaQ3oaqiv6 fcQ7to+HXITCeKbh4HitSg7XkTh6ha8TTQg43CqpScs3ZLo2BcX9akyckryT1J8O+5cE YL9V5t4t6C80YJKXj5s87akriqx0w07oY34JQxktIlWBOTilJWb4y7NPy3O/rHyALIaP b67xe+Qj8I59DsZLEZCEvB5S3kNnIjI3Kq04AJ1cNcg4DI4p+6Qv9OR02guZ1FHtkKSr 3Ar9x/WUP95+5QmremWhV3pjh5TXamHf8aRUQ3NkAaAJmThqwpZkgQMzgseVBgEB4zwE f77g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=FtSBT+hr3IGW+oUj8kMcORVVzUALw95ycltsWbZ5hfA=; b=VBJX7oIS8EDSt2PNmRFivWJ2kALBdhD6ogY7F0OV+xeWkFyXvm03wONxnlVp3J0qDF 72FTKoGScpa3NCqTS5QFRjehh2ZWX1aWQfLZ/+qgCt1kSM4/dQFd43D8JejVlpjSV2YE lxCIIFrCzRTuyy+0A65GRQsggJunxDUlHZ+KrnBggd7bg7+7sHtNZdPkbaXIDO2CayEa lrgGEBwsz7baYIYXnNuKYsJjtYAG3EVgbgvwKe5aNFyjYAif4YUBIWMwOeOHQdbm2y/o YES7edVSQa2K41fGntmFzB+B7Xt6RywfJXk60Ze+61fEycf/OraDZPP4WrbY3TkYdsxT kbiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id s126si8343007pgc.314.2017.06.06.08.03.28; Tue, 06 Jun 2017 08:03:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5E9AB78075; Tue, 6 Jun 2017 15:03:20 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by mail.openembedded.org (Postfix) with ESMTP id 0A51E77E40 for ; Tue, 6 Jun 2017 15:03:17 +0000 (UTC) Received: by mail-wr0-f178.google.com with SMTP id v111so48919207wrc.3 for ; Tue, 06 Jun 2017 08:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=Q3j3NdNOHpmCVoBrTlJdfvyw4FFq0S3W9FWlEFEQs9o=; b=1dKe5IKGrHo21MZ0cy4MtFaSM3z3fbUe8ZH7RQUEJeP9EPRD0kP6b0iWrgklgKRT9H bt4NB1B6GLbWpPJtBB0TjwezaEmKDWoeCJLKQoPUemYzr8h2q+eE8cuWsTzUenwGZykp wjMNeb35Zn4XDXFkHjAgox3pD+3YJhEVEW4BHSMVXUOoGJBkwl8PV79BUzelyTxibWgg rrPbZ+NCZH2JoFLIBdHdX/uia0OL6P/bQbLh1r3N3JyDcNVgpnD8aPYBMl1xEdrCWYBM +BXyx43YYRYclO8CXm6RKqE7q1WlL14W3/XC3TyBT1gomaz20am/oiBwbLx55Xs15q58 TRXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Q3j3NdNOHpmCVoBrTlJdfvyw4FFq0S3W9FWlEFEQs9o=; b=Fzt23WyZ0JrIAv5NLtMTvHpr3v0CdwHyxilTA6cGXNvF/f8VqcNNHV5TZyaVYKh6Rj C9jENVrmIh+1+SK0JgusUta07CkM21eSRMkEjuEqRNydkG1V5BNZzDUmWkOeBGIriAYX Byu0hVVaXBm7gpN3EbGKeOfGRSJ0THgPbf1DDUbbSc0FFurx1v+QnLc6bgrU2MmQAzjD lSR1zvXuaW79gjYW8VgWKfLKajOPiHxuXgbyxczfwK5NqxRzVHvVPOXzi8GAYH6MuFxu 78EsfLr9XldU9oxa/8Lg3RGqg5bHey/XtHUl55JFVMlCitgkaeWrs6QeV+tF/U85pIUA 9Dmw== X-Gm-Message-State: AODbwcB47PJY6DNvnQy+B/wsXwbQdnKmmdO8hLTQlAHJfObKr9dTDngg hYH2vDSuwvipEv67hgc= X-Received: by 10.223.138.188 with SMTP id y57mr17944700wry.93.1496761398227; Tue, 06 Jun 2017 08:03:18 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id f3sm27305015wrf.2.2017.06.06.08.03.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Jun 2017 08:03:17 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 6 Jun 2017 16:03:15 +0100 Message-Id: <1496761395-4499-1-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 Subject: [OE-core] [PATCH] archiver: preserve sysroot paths in configured mode X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org do_ar_configured alters WORKDIR but also expects to be able to run do_configure, so forcibly expand the paths to the sysroots as otherwise they'll point to a non-existant directory in the temporary WORKDIR. [ YOCTO #11584 ] Signed-off-by: Ross Burton --- meta/classes/archiver.bbclass | 4 ++++ 1 file changed, 4 insertions(+) -- 2.8.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 82f0b16..18c5b96 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -222,6 +222,10 @@ python do_ar_patched() { python do_ar_configured() { import shutil + # Forcibly expand the sysroot paths as we're about to change WORKDIR + d.setVar('RECIPE_SYSROOT', d.getVar('RECIPE_SYSROOT')) + d.setVar('RECIPE_SYSROOT_NATIVE', d.getVar('RECIPE_SYSROOT_NATIVE')) + ar_outdir = d.getVar('ARCHIVER_OUTDIR') if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured': bb.note('Archiving the configured source...')