From patchwork Wed Apr 25 13:58:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 134321 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp900465lji; Wed, 25 Apr 2018 06:58:27 -0700 (PDT) X-Google-Smtp-Source: AIpwx49K4kZz18VWnqfmlt7lmzJlkexYVFLMjgIGtu6GXvKVCt/2vWr1fDLgIJvR3I4k+5y2n06e X-Received: by 10.99.123.17 with SMTP id w17mr23712901pgc.8.1524664707185; Wed, 25 Apr 2018 06:58:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524664707; cv=none; d=google.com; s=arc-20160816; b=OHYZyTliweC30yJ3aCwhV5D7CkoYj1/6n7QEBwwH7OxtrZ/zA6mY5p4rG8i+lNjrC6 Vnmvg0mtG+bcCsHrOlydtSUDR0eYyp9FNhp81R35yj4epp420StsJ7R2K4RJlzNk2+lB GA7icgS07dkW0EAlhF+mf3emigfCqaHZPOTCYHWiARmKzds+Sj/mnw5VxrH78cCs3kca 4GaalkRwkWQmrMir3g4va8cUWeBqbcGBaQ5J71hdVqXn5Nv+/5M3Z9/0ok0dlfMEzKYl /Pguk51smEomahQezlUTamg6mDk5jlVuCT0M2pWn96F/JhM5mOfj26ysTP8dRUNE8VKK Ilow== 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=X5UtCNein2LIClyghGyX1re/X90lisPYye51/eaoB2U=; b=wmKqtHOIF4wmoJSR8emROB8x/P9/fuGEQh88Vz4dOaTlfUvSLpX5aZ3Rmud8zSD2dx M/tsONDi9q97RVmWcYikKoXzOuWorMN8PLtRnme9TawdTTUb/CFVRvIt7syhezRlbLmS bXPkHTINU5wQZHmHX9SWgrPNIwrM9R9tFy2dCpr5SwYt9N+WmyKYYLmkTmbU8v9CGQF7 8+sTH1voJbaVnc2z5q2SyH3YV61buLQziUKlSo2QfWtey/OTN2O8/r4CNs+7Owk+r8Q/ s1IaVFB/fAdy+iG2egOFQA9/As7F1iQ/Mx/rO5AZ3jF/4hVXTers23QycYtJqP8lBVlW 4/eg== 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=GyGOZSce; 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 q3si13680154pgs.516.2018.04.25.06.58.26; Wed, 25 Apr 2018 06:58:27 -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 header.s=20150623 header.b=GyGOZSce; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0E3A572EA5; Wed, 25 Apr 2018 13:58:25 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by mail.openembedded.org (Postfix) with ESMTP id 953C071C70 for ; Wed, 25 Apr 2018 13:58:23 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id o78so7025994wmg.0 for ; Wed, 25 Apr 2018 06:58:24 -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=yCO87R3UArfGqKNmF7NgAJ0C1ngYRtvKmErRBh2mwpg=; b=GyGOZSceV9f4ePyevp+CHnk6Gf0fXauuyc9r4tTA+BRauIYG3QRe4BBlT8C+lhoPjv 2Cez+gSpsHm7i30fncAtXp97O32NfmravCoKdd511eIvf74UyMLShBVOU+Mz21EGHmdf VRnHqBsK4tekowjcXjyiHCKbCBIXuvHytlOlxbYzJE20CZJMRwhGJYEPAV0fzY3cESlu GPHQ0/zf0wfYrzIjQ+qT+qEah1Z/Io3RI/8m0p/s1HdRNreJuZiGG1dw+kNXiQrJ4RNZ 4YpDy/YfzaDiuaAcCU0zNUM39xnmRHlzWZN4bOW+1ObHg1eXEz06J/aTxj2SMnWNeBYE cAeg== 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=yCO87R3UArfGqKNmF7NgAJ0C1ngYRtvKmErRBh2mwpg=; b=ssVqpXYuL5C2DRC9FgaxmnD6+QqGrXOIMgVb9UKi4WVT/d5HWmkxMFL8i23q1jgtBf Hf7YzHpYp73bSgVbUlr4wWwFJhB7J63Wqh9o13+L8WL8+haqcSivQcaXCtedjEbLRlCH SFSmPpnv39lI39fD4EgD3U5Y2ivOZvomDluhlCR6sZHFrGBdfXiDu8//zNWtB5Afqpbr kftszZG4kobDr/VbcDjDdYQfAoF//eMW9cgYbkdEc9oTiyMhfSniWekWK/DFUYtR2VXv Bi1KK+/SNOW1A25Y4XeNhDwU8Fo5jX/BKFfLDollu9aUxXqfdJYZe6pRH1qiv8w1QcBQ cEvw== X-Gm-Message-State: ALQs6tAuzu70uYcf7avjWWN0k91+LoI6oH627c+uC5lYVt7bAnxAmEd9 CuNiGQ7G9C5yXzbki3VCsgU3RoqR X-Received: by 10.80.182.226 with SMTP id f31mr38677101ede.23.1524664703719; Wed, 25 Apr 2018 06:58:23 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id l91sm10603543ede.50.2018.04.25.06.58.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Apr 2018 06:58:22 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 25 Apr 2018 14:58:18 +0100 Message-Id: <20180425135818.23345-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] base: improve do_unpack[cleandirs] logic 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 If a recipe sets S to ${WORKDIR}/ then the S != WORKDIR test doesn't work as expected. Use os.path.samefile() instead of string comparisons to do the right thing. Signed-off-by: Ross Burton --- meta/classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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/base.bbclass b/meta/classes/base.bbclass index bb1f4b75336..7ddf70414a1 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -152,7 +152,7 @@ python base_do_fetch() { addtask unpack after do_fetch do_unpack[dirs] = "${WORKDIR}" -do_unpack[cleandirs] = "${@d.getVar('S') if d.getVar('S') != d.getVar('WORKDIR') else os.path.join('${S}', 'patches')}" +do_unpack[cleandirs] = "${@os.path.join('${S}', 'patches') if os.path.samefile(d.getVar('S'), d.getVar('WORKDIR')) else d.getVar('S')}" python base_do_unpack() { src_uri = (d.getVar('SRC_URI') or "").split()