From patchwork Fri Apr 27 18:46:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 134632 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp1059905lji; Fri, 27 Apr 2018 11:46:41 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpYW+21iDTGNlfWFqEzD6B3yFbNEczLMAIoCQ8k/IMmR+FR2Fc8en6Ok5etDVqw3BTuSVg8 X-Received: by 2002:a17:902:ab93:: with SMTP id f19-v6mr2075126plr.392.1524854801549; Fri, 27 Apr 2018 11:46:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524854801; cv=none; d=google.com; s=arc-20160816; b=GMhemC/0wVBJ5KF9TLYMdKNcKoAWyoAyDT3fKBMEkbQDykyWJTcwtMtspbhut78mnc vUiJxkKy6diiI3O0MyDOU+8GALMv0MKooBkTZTZnTuxUrnh1NRJNvYXCpyUMrAlvfH6Z 2u9jwtkdXVgMKEe8nF1uHSBlLqoJ/ykc3riFMM0QyCzUb83BZvcrEpNIkGyaIvJoT/M4 wDMDZP5K24oHkXsA6nhKnkEYANJal1HubwIdHBLe2hapDvC/rwxvToIn5MQPrjqwLk6L FL2P+BCLw4lpBdefZQxf10WfxGWud/wCWlbk6co2/07uesXjB0mRdCylXrqsRJLqh48E azBw== 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=0TOU2agPnw3Xn/0SqLK3bpOuZCnecWzDcJs3GBXI5Qg=; b=Htu3JgOE7HS4Pk5neCaFpfvgDsZDUDE+CTeiy0yKDNyysY5ctKka/hdtVP6WarfjU0 e+JdtPh5h6VI2haF0Jwc1hQ1zTtBhy7RXhM7ANuELr1Hl8M2YcgTvA6PqE3oX/w2UDGU 9Kbdw1EL4mEPHcVdJHMjzZ4dq6YoPWPwVgPbVso+FXZBRAtlQdPc2ZS/IgPDRb5LJJ2z H/SqZmiUMnqkJhSwMwGU01xAu3PqpSLcE1Oerh+bPF16h+ixqByRLimYg8e6IBHLQ2V2 eOIw7osHLUUhj6LXYnIthW+DfGVV98FAIoLgf0fpBeJVEwjGu+19QxGqUVy8pSPRsJhr r1Yg== 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=bFgE+y+J; 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 31-v6si1722765plz.364.2018.04.27.11.46.41; Fri, 27 Apr 2018 11:46:41 -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=bFgE+y+J; 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 A64BF745A6; Fri, 27 Apr 2018 18:46:38 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id CB889745A6 for ; Fri, 27 Apr 2018 18:46:20 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id o15-v6so2647929wro.11 for ; Fri, 27 Apr 2018 11:46:21 -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=vhvoLhzC5WeTJ2jQB5RAlIhEFOVL+ofB0wP963TlWU8=; b=bFgE+y+Jfz5gDzd5Dxjd7M+yj0Da0wXD8ZhbKMX77ns9VC1AnUtpeiB2RR5OIqMBwp clJXoZPylKY/Ph2ftUXM6CBY8w1i83VHUartU4JVhQHqGsrHmTDBpZS0yC8mHuTxRuu/ myHr2GLUwEmuJD1rq/K7QNAE/4f3Ig1YKLSWjm6W/RRg5UDFkkRtRlatziZz0F0XsAoM bAnHtzNcLnX1elJuQHLSXZ9hSDkYigJOJO6WZTccjLoiK13MjP51zoRtwG8/qByQkPwV fukbH6hOtZTUebIJA3cxPQXgH/DrlsRFmKIwUZH51ieWM6ch5OAhzNP+cC7vNWDXLxxR YuzQ== 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=vhvoLhzC5WeTJ2jQB5RAlIhEFOVL+ofB0wP963TlWU8=; b=lnQ4AqUoeAy60XG0//sxJpx90rLauKdU6SUdMRfPWGf+csmvlSFZCLKIpcDnX0szhu CQ89dUrNSpUos3+zBYgdqjFezQOiHLoO4QbBQsZmYMqzkpSfpYpWv3k1myc7Mnbwmzlj tfhMptKxEmwwhugilXUafluPJMV+53ANJAJeWFwoc4wUwIz9zRFTV7RlfP83x6yo6871 XWlMpLgBu0QLmxCjlepQawRBETKwZVYbgmf5zlkpX+w3j98nAdw7m69WHFEGh3MDyL1n UAaZqmdRjP7Cc7OjVkIe5kgJGvQkXk5Y6uMdqwpWaNy2J2NiD0L2n7TH3Nc8xVFT6nqy hSxg== X-Gm-Message-State: ALQs6tB9gDhhUT0KEy+Fm+iJ9fWTS7cm4IVMpjoq83wmRxo4CfZi41BM /svXo3Npd68GdfbxOmgx0gUE8p4m X-Received: by 2002:adf:b839:: with SMTP id h54-v6mr2628802wrf.141.1524854780882; Fri, 27 Apr 2018 11:46:20 -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 w62sm1738410wmb.6.2018.04.27.11.46.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Apr 2018 11:46:19 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 27 Apr 2018 19:46:17 +0100 Message-Id: <20180427184617.19111-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.normpath() to normalise the paths so string comparison works. 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..d5798f9c48c 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] = "${@d.getVar('S') if os.path.normpath(d.getVar('S')) != os.path.normpath(d.getVar('WORKDIR')) else os.path.join('${S}', 'patches')}" python base_do_unpack() { src_uri = (d.getVar('SRC_URI') or "").split()