From patchwork Mon Jan 7 16:38:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 154911 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3674253ljp; Mon, 7 Jan 2019 08:38:40 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vxh+dj2lkktD2sY0oqB2jomSPcTFsDnMejGj7Y0P5H8QDZPLHwtd6YrmuZA6y/B079JIw4 X-Received: by 2002:a62:1f53:: with SMTP id f80mr63586094pff.92.1546879120285; Mon, 07 Jan 2019 08:38:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546879120; cv=none; d=google.com; s=arc-20160816; b=u4C1C0iQKmzEv1bMbyQgnfZcxAH/ZnMc9fyiDBnXsFWzhowJg4oJVxVw8d2t5nHg45 UIk853G2Ixjr/NOixZ3kYvkbzh0jdwwE99vpUbrJaGRy6tw+3JI040W3ESIbsgijqmNC 1ZidqQiEjdruYQvMnhlHAqdWFl3txUsVRyv7KbMN2SPNjHZMasfGxaZsH9YzXUrzJK/d VVJTArSJwQzj9DZxTArYjPsYbwCum6p+cJxI4yBIVtqnVxvPKrDGME2GWSoAkhU7RD+h vgPPHx+JxiJZ5uor9C9EIAnh+WsRNfRKluMM+5czWA7kYGVQPH+Is7++lCYyxzSwIkK8 hACA== 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; bh=DOIylwE94+smpoOixEHWH1FWAmh9/xB3G49Bn8yRpYU=; b=NrtoCIuMxlNwR+aMUrZ5SiQrlPGlALypimJZoEz/eadjQBTnkRgK49W5jrhc+K1kHi lV6x4RJ3F6fkj+qU8kMemFEC5whzBNQlqieOGp+L9c0ciH3BY+MJZnCqx5Ne/08p070u bOxad0UepvWEgsbb99YxiFe12LrvHnk4BfAwGgojFIDgckGhLn2jzPd8QhcjF3PWUGXh 7IKNOJZUTueMOWJQqCiXGNajaDH+FWuLjGn3mJcyKFyXdaC2mJjD/G9cMGd498sCm8CH C6RxroiJYFUuHdKvw9RFSPuKdBfhrv7l2NNhH6eBbzFtFIG/g0vzhuoLkwh+WpTjPzJX gLjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=nNdvGDa7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 191si8416434pgf.41.2019.01.07.08.38.39; Mon, 07 Jan 2019 08:38:40 -0800 (PST) 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 header.s=20150623 header.b=nNdvGDa7; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id D9C307BEDE; Mon, 7 Jan 2019 16:38:35 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mail.openembedded.org (Postfix) with ESMTP id 81D727BEE1 for ; Mon, 7 Jan 2019 16:38:33 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id t200so1562322wmt.0 for ; Mon, 07 Jan 2019 08:38:34 -0800 (PST) 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=xOqOokdSA3G6gE6deJVc5BJTH8VrrgNcgc4ng4UA9q8=; b=nNdvGDa7Gh2qAhjMFhOoxsWG9T5OPoEoGyPSpKOR6+u2mBaKbGO3AyiCuXv8qnjNqE eEG/dQJ/h3PLTbatIc2Z+FxUwdEffrKpRf6296kPHARmdbOjNcNWdU8zHsEwCOHkMC78 Y7v7j/DHHpdYO/1MCd1gHqMlr9za9ibgvEehnm2PKzmP5wVI65hxB8shefwA4AFweYLx uV7Ems6QTd5bdRCsCY48mCMHYeA3eH6T+JmSXSA0YGbozcajmTCxUXwTmCgOpBfnflhr PxYbpw0Wj4Lw9PSMDt+rao38jmsGg9Z52YczMHmjtqpjdIaL3CX/ljoblaM+zkJpVU2d aisw== 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=xOqOokdSA3G6gE6deJVc5BJTH8VrrgNcgc4ng4UA9q8=; b=ru8I3Yw0w7dRYcwHgAobXHeP7z7SPJqU9TiQf+srvZ8ifXCelfGNep4gPjqCs9YXrv FtBXOpPwQPGyfks6+qf/P6hDi9mClhbopnCwHGJogEl+zZvm8zmkIXnybmm7FPLHUfiq u9mpSdIqooxE6g8RTAK1kUUB6CoGVp92XK11D9v5vZsLrPgtnckDo6okcKF2uCJ7t3of peDhmwnVjcT2h26j9bRm4oB3HQseFFETmQnOrSJZQU1BSblqXTwuIR/UXxcso++hq5BI q/usmlilamxt+00p82UsR5UP9G5ywuI2ce2g4oUdxggZ9LyjBLmO4s5NaBec02yvWIWg xcwg== X-Gm-Message-State: AJcUukfNSeBnhUH1POoEaqp4RD0GESb+rJ+3aGbXv32ygU2jbWFwrTc3 1Fm/CiecLhNkNUjufiH8ftC8SIRIEaA= X-Received: by 2002:a1c:7706:: with SMTP id t6mr8689601wmi.57.1546879113671; Mon, 07 Jan 2019 08:38:33 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id o5sm13918958wmg.25.2019.01.07.08.38.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Jan 2019 08:38:32 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 7 Jan 2019 16:38:17 +0000 Message-Id: <20190107163823.31816-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/7] toolchain-scripts: run post-relocate scripts for every environment 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 SDKs for multilib configurations have multiple environment scripts, so re-arrange the post-relocate hook invocation so that it runs the post-relocate hooks after sourcing each environment script. Signed-off-by: Ross Burton --- meta/classes/toolchain-scripts.bbclass | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index 6d1ba69473a..1a2ec4f3b29 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -128,30 +128,30 @@ toolchain_create_post_relocate_script() { touch $relocate_script cat >> $relocate_script <&2 - exit \$status - fi - done - rm -rf "${SDKPATHNATIVE}/post-relocate-setup.d" + # Source top-level SDK env scripts in case they are needed for the relocate + # scripts. + for env_setup_script in ${env_dir}/environment-setup-*; do + . \$env_setup_script + status=\$? + if [ \$status != 0 ]; then + echo "\$0: Failed to source \$env_setup_script with status \$status" + exit \$status + fi + + for s in ${SDKPATHNATIVE}/post-relocate-setup.d/*; do + if [ ! -x \$s ]; then + continue + fi + \$s "\$1" + status=\$? + if [ \$status != 0 ]; then + echo "post-relocate command \"\$s \$1\" failed with status \$status" >&2 + exit \$status + fi + done + done + rm -rf "${SDKPATHNATIVE}/post-relocate-setup.d" fi EOF }