From patchwork Tue Apr 12 11:35:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 6587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58C9BC54F3B for ; Tue, 12 Apr 2022 16:46:43 +0000 (UTC) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.groups.io with SMTP id smtpd.web08.9549.1649763348472347802 for ; Tue, 12 Apr 2022 04:35:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=LkCbDZFs; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.41, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f41.google.com with SMTP id e8so10882169wra.7 for ; Tue, 12 Apr 2022 04:35:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ubqnyeNI74K8mbHQIjpqJyBqX6JLP1llMJEj7cEb0g0=; b=LkCbDZFsGFuK+u7pfV9efFUfQP3nVDVjmbQ47PjYM4yTUaPpiuojtcZ8YeWmY6lOBU jtAwaGQZhF0Q96WpopURqAK3QmdT7Xnn6dhXisGVKMsfTgtevZNcvQqWvN/MukxOzVtP Bxjn8o1hhNVSSty6WVe4FmyllRK2IFe5MC7sI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=ubqnyeNI74K8mbHQIjpqJyBqX6JLP1llMJEj7cEb0g0=; b=BExHyuVn7FzjuYtqGNKcLQuxkUdM6Qy/J6z8qeoVtMwd88sqztIN2Yo7ZuHgzTggVM l+JvNyeM8QrdKhAC8tTcbzmg1AI0WS8+KSfXl+NFj59flu3NYnp+Arc3XaSZrXi4aaKV 968/AkaokF9JnxYdDXtRiL/mMpVrnWeNtB21EIpRdKpNYb3ahJU4oO8Wtz1E3ebnneD1 b9uP16vDiZLLwAjCB62iLbS8J050qFOsldg3IHVkjJoKkpaT1FwqGTGoFXUUX97iP7h9 UKtPVMji6tA1Kg6B0d3nOgXqFqFQCFlnsB3B03ovfZCR8uDaHUFnrU4XM9QNNdSF/xLP RN5Q== X-Gm-Message-State: AOAM532ZBTh3vrvsXU9JFxUHN9ZcZWpUxsIQcODtQarRm5V/7AneCRnm wCyv+JsDyhGLe1Ad62W1R+qYF+2XbyA1XA== X-Google-Smtp-Source: ABdhPJwanumVXOoqV0G+/uv5X7vIS9jyrlqXOHzPT29q6ZuZB5nwjUM9+ZxxLQ4dqh4JqV3du45Zng== X-Received: by 2002:a05:6000:1541:b0:207:8ee6:1417 with SMTP id 1-20020a056000154100b002078ee61417mr18283712wry.504.1649763346506; Tue, 12 Apr 2022 04:35:46 -0700 (PDT) Received: from hex.int.rpsys.net ([2001:8b0:aba:5f3c:b168:4a11:27d6:cd01]) by smtp.gmail.com with ESMTPSA id b3-20020adfd1c3000000b00205820686dasm32964524wrd.5.2022.04.12.04.35.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 04:35:46 -0700 (PDT) From: Richard Purdie To: bitbake-devel@lists.openembedded.org Subject: [PATCH] ast: Improve function flags handling for EXPORT_FUNCTIONS Date: Tue, 12 Apr 2022 12:35:45 +0100 Message-Id: <20220412113545.2126562-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 12 Apr 2022 16:46:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/13607 Currently, if you use one of the functions from EXPORT_FUNCTIONS, the meaning of cleandirs and fakeroot are lost. This leads to the function changing in behaviour depending upon it's caller context. This isn't intended so add mapping for the cleandirs and fakeroot flags too. This does break devtool in OE-Core and there is a separate fix for that. [YOCTO #8621] Signed-off-by: Richard Purdie --- lib/bb/parse/ast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/parse/ast.py b/lib/bb/parse/ast.py index 4b1b44ce19..9e0a0f5c98 100644 --- a/lib/bb/parse/ast.py +++ b/lib/bb/parse/ast.py @@ -223,7 +223,7 @@ class ExportFuncsNode(AstNode): for flag in [ "func", "python" ]: if data.getVarFlag(calledfunc, flag, False): data.setVarFlag(func, flag, data.getVarFlag(calledfunc, flag, False)) - for flag in [ "dirs" ]: + for flag in ["dirs", "cleandirs", "fakeroot"]: if data.getVarFlag(func, flag, False): data.setVarFlag(calledfunc, flag, data.getVarFlag(func, flag, False)) data.setVarFlag(func, "filename", "autogenerated")