From patchwork Thu Oct 3 08:13:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Weihmann X-Patchwork-Id: 49913 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 539B4CF856C for ; Thu, 3 Oct 2024 08:13:22 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.92.90.49]) by mx.groups.io with SMTP id smtpd.web11.6436.1727943199626435709 for ; Thu, 03 Oct 2024 01:13:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@outlook.com header.s=selector1 header.b=CulAiMlC; spf=pass (domain: outlook.com, ip: 40.92.90.49, mailfrom: kweihmann@outlook.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DP2hwfVuKw+IiqhGDH8hMUCknb4CqsfMG2ycBspYT/d4gBNPoMoTEklxZXfVbpDYeMFSBv+RvrBhHk3woplk2x41moroFsNpeNo9e4ZSChqG0yihAWF3I0EbekXYAQdSIhooiVFM8nwkf5/0tCsTsvTn3YC0JxUccfAliclD7p9FBSg+mbQaYdc6Fm0EjoX4n7tcDtU90BLnP9JvJS5ZWQ2gpmoaos/AuvwwTHF3Q9KT2SnV01XNaT91hGe9pLmE0KaQ3nujrUubeQ5JxXEQc/4Hx47kilOmpXm5DXhinMROTxjw9KMVQ2IAjXHr493HiUuhB8+O55P/W84XQOSCLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DCFiEG0iaLqVjodD4Nk+bz2bKtczZeRwXL4mxX7RZ6M=; b=IIjBey8JgeEtpUMdETTkCGeBGqsSx8mgDvnLfXZWfchS6ZuEPcLiae5tTohyxWLn8LdBSW7+Kg4QSKRkkBx2BAYH7d59BPbnMm62yqztMzNNneXh6N4JMe6o0fVyt+56skRNBLSt4oRQy95yEk5MhMiWRCNBCesY1fBc3Ta1uQ8cgQiwENnpJnoKe0wS1e1rbfCDSlm5pX0Zv/BmtifD+lr0M8JBacFlbSqmuXwv1UfH2die0y5HIyL1M1hMNXRL3VHjG4b9jVaRJdR7oVpOfH+JC+SWw8WwJOAfEdPnyirdAFUwpQdrA15WwTTqY1Xr6YiIIt7D+0dAZ+S+tKZITg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DCFiEG0iaLqVjodD4Nk+bz2bKtczZeRwXL4mxX7RZ6M=; b=CulAiMlCbMGLeGmUGNI6bQ8bfam/As5lq11Zgx6gS9wiS+Yf4HHQ/M/egb2RM08g6+CKzIq/ppb8aCDvy136fD24zy64gk29MVdOKNokP6uIsSlEqmZCyCmpG8rKOBz7hp36Bcgx76PAkSixF2qVazP4zrgyAjCAH2hqcormHZCQSaCO7e84Wzs10cEsojfFfn6n7FLHrk0jzE96pcw3N/1/PKuGsl+heT/K8bJBIgLgYiTzviJ89biUJOqXxX0vjvAX3SBYzGPqSGXxlFr1hcWzr673VfJoRFdQivYgY724zZx69E04UnkYdwd27Nhzm91sbbzmjNRZTASJfHaqqQ== Received: from GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) by PA4PR07MB7615.eurprd07.prod.outlook.com (2603:10a6:102:cd::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7982.16; Thu, 3 Oct 2024 08:13:15 +0000 Received: from GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a]) by GV1PR07MB9120.eurprd07.prod.outlook.com ([fe80::a630:7019:63e4:a48a%6]) with mapi id 15.20.8026.016; Thu, 3 Oct 2024 08:13:14 +0000 Message-ID: Date: Thu, 3 Oct 2024 10:13:13 +0200 User-Agent: Mozilla Thunderbird From: Konrad Weihmann Subject: [PATCH v4 2/3] bb/data_smart: fix override syntax warning To: bitbake-devel@lists.openembedded.org Content-Language: en-US X-ClientProxiedBy: BE1P281CA0327.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:87::6) To GV1PR07MB9120.eurprd07.prod.outlook.com (2603:10a6:150:80::7) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1PR07MB9120:EE_|PA4PR07MB7615:EE_ X-MS-Office365-Filtering-Correlation-Id: efcb8c18-f3c0-4eaf-0a34-08dce3833a8b X-Microsoft-Antispam: BCL:0;ARA:14566002|461199028|6090799003|5062599005|7092599003|8060799006|5072599009|15080799006|19110799003|3412199025|440099028; X-Microsoft-Antispam-Message-Info: UE6Y4z/ed78rqLykYDGozWq8C9lrGPMFBo8LL3k7TeJD0Zu+byfsNsaZgTPeRL/Qd4aehjR3l55kIw/k2i86ImmVHctavGFcrUd6UWc+myh7plQZT+ESnjt6pBkJ8yw90neKxjP/DFePwTzTn8193Z8EfM21uyY4H6lkCU+zAZH0INiiOVZnTEiclw7S80X/8jOMwx2mOFBPBJpULktyRJWd/TKVQMiZej7yEWXHbKcMB6/a1KmPLQSz8Nbg9sRsNTIKvBYwM6bo9T2zMPWUkbhmGjw91/mMVmbxps7+CvqFoH+6Z4lZDir98+xu2VQDccx9cLKvAmZklCxIuXDSTrxwiNn8Z5jDFONE5a59GnYn/nY0PPwz9TcnFxnM/Isu1XQZP0k5HI5GjpwthZOaTrlrdAJaegGoFkalz/1vCpLHNjo1xGA1ya7PKFl6y5hI8847Ext49awJEfZjaRXPuY0LW0wYdke3JqaPt/k40eOtnV5Vf7vWZlJx+Gu8cNe/wwzE1cKJ6turU/cu56gh3f/3CBE2MKXm340SJzqACJHSpUZB/q0BQ0LIsBn28cMMQR0CNdyoYQPa+s/nUU/HB+1feoIgYK6e2nsyi7lXeu6yqxu7xTPnsMxdXVeEKnZiIQFHzL5m+tvphUi/ubs5fxfw7UC3/A7NNbiVPE5bZWrjQLh2h0r7Mfjmv//iztmYHBakz/oJCDkjgTCpET0yohz4/4QwA6iWkKOA1pi5OyXtvT4z4BTctFHlmgNOBaokXp4W2cubP/ECvR8B3rZu1MqX4Ax0gud/n6dczMgaHgo= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?JbF3Ow+H3F7NI6WPZ/b4RESKH6IY?= =?utf-8?q?Z8Ktk9jWxqenRl7cBoR3J00svLGkA68X2mIzZk8Z9HX2mMDl6hbhxaNv06u9wmFKh?= =?utf-8?q?3Y8bWEWsecuLFpeAAdfD7s0VDcA8gl+txv3pLwUQ0BOvCFfRzFkOEXDUNcQLmSl17?= =?utf-8?q?WRfNVfksifrQ+K7nTX1HqSNtPNEvw7xqsy8rFldjqdlUqDn4rT2QPz5dyNXIfVbkV?= =?utf-8?q?6/tqf7e446zXWdTu81W4E7pQWXGdJCDLEP9egUkpcC3gYp3+LX5sm/VuFUVxed7P2?= =?utf-8?q?XcaknwaKvOH4HUE/iFHCC1gY4MAvDHWLwfFEHNROO5zPvBmI6+/ncwDj/deFb70lS?= =?utf-8?q?ViLIVqPh9QgRoy39JWAcuTrJS1mGZ4VBGrA+cn2NVYgcPL9rpjhsMOTC9yPvj9cGt?= =?utf-8?q?ciZKy7V0ybQkz0Gn3IwyrwhGhCYGU4ampdlD0IBlhHIjFTYVtgjUX0PFLo8R8Ngmt?= =?utf-8?q?/RlJN6MU5V3nWAvXoWs2ke0YVOObIA0Vqn+0aKhvcRkazOK8r/0aPFRfYxp1Z0CG+?= =?utf-8?q?14LeMZ4rJp0lnwMEoBtrhrqQkPAdm89DUQpKUlZVCCuEUc+nO5TuwB4c8J81qSnBB?= =?utf-8?q?wqKGbPLE8BN4XBiNqfHi8YIBS68rAuR0oQeRikcNBD6K4tQNL34aKBZrJsqGYd3tH?= =?utf-8?q?o8FQgm/VNte8YwLSKMEmuC7iS0qN1ds1nkd7Ajs9Ic7olwyU4/OXXyzjndQR+ExLl?= =?utf-8?q?NC5EElL+RWgK62Z2/g+4HKjBQKSTftkCTRSXykJbjDU12rGaZoEwuf/n5vPvZJ6OQ?= =?utf-8?q?dP6SoiKI/fDaAkKWjj/1d0j6i+op7SUWU/04P53GCFfTJLQoZJQE91voKRcPWUjSY?= =?utf-8?q?XuPCP6k7N2ZD97+J31e9OEdEO12PFSc0fn7IeWBivqMQU0KrBl66l5c+AIgjDiEWs?= =?utf-8?q?BjK1JlAzGlnRaXNn2D2r/TlDhO6cO0h1r4kEy/qy2gUCC76wejqnqeMwIP4ad3Fk6?= =?utf-8?q?y74vbfq9w/fdhpuNqcGE39rSghdcRRJin4a1LwV6EcFXSjYiF2n7VjeFRlNx6voLm?= =?utf-8?q?LSUWLpYLTDBQnCesz5NGm268oKUlir0EK8gIIxO2bNKr+xIjAARKX9RGyR6BNfPJJ?= =?utf-8?q?c+UXQKmgxZL6VyBI7LhLJt7J7J/uMek/U61xPmX4CrMpNhvWh2GfdlFLTgLMMDS/K?= =?utf-8?q?ggegsHuKa7ChjLoKQWPKHaFUrWS2PhbTYkwcL/5J5/MLZlqL/n1vzxt33QTsVYiiU?= =?utf-8?q?ck5yCI8nrp7asoOkKSY19BUYuV1kih2tFrkfDFROQmSHOGbaGgjn33+hqTF8=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: efcb8c18-f3c0-4eaf-0a34-08dce3833a8b X-MS-Exchange-CrossTenant-AuthSource: GV1PR07MB9120.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2024 08:13:14.3399 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR07MB7615 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 ; Thu, 03 Oct 2024 08:13:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/16628 when defining a function do_removesomething, the parser warned about Variable do_removesomething contains an operation using the old override syntax. Please convert this layer/metadata before attempting to use with a newer bitbake correct it would be to search for a override operator at the end of the string or for the next operator. To avoid running the expensive regex search on every setVar call the current "cheap" check would be have to be triggered, before the more precise check is run. Signed-off-by: Konrad Weihmann --- lib/bb/data_smart.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index 4e15a43c2..bd2716b2b 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -35,6 +35,7 @@ __expand_var_regexp__ = re.compile(r"\${[a-zA-Z0-9\-_+./~:]+?}") __expand_python_regexp__ = re.compile(r"\${@(?:{.*?}|.)+?}") __whitespace_split__ = re.compile(r'(\s)') __override_regexp__ = re.compile(r'[a-z0-9]+') +__old_override_detailed_regexp__ = re.compile(r"(_append|_prepend|_remove)(_|$)") bitbake_renamed_vars = { "BB_ENV_WHITELIST": "BB_ENV_PASSTHROUGH", @@ -539,14 +540,14 @@ class DataSmart(MutableMapping): return var in self.overridedata def setVar(self, var, value, **loginfo): - if not var.startswith("__anon_") and ("_append" in var or "_prepend" in var or "_remove" in var): - info = "%s" % var - if "file" in loginfo: - info += " file: %s" % loginfo["file"] - if "line" in loginfo: - info += " line: %s" % loginfo["line"] - bb.fatal("Variable %s contains an operation using the old override syntax. Please convert this layer/metadata before attempting to use with a newer bitbake." % info) + if re.search(__old_override_detailed_regexp__, var) is not None: + info = "%s" % var + if "file" in loginfo: + info += " file: %s" % loginfo["file"] + if "line" in loginfo: + info += " line: %s" % loginfo["line"] + bb.fatal("Variable %s contains an operation using the old override syntax. Please convert this layer/metadata before attempting to use with a newer bitbake." % info) shortvar = var.split(":", 1)[0] if shortvar in self._var_renames: