From patchwork Tue Feb 25 06:48:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 57771 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 7A353C021B8 for ; Tue, 25 Feb 2025 06:49:29 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.2847.1740466159910199752 for ; Mon, 24 Feb 2025 22:49:20 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=41510c6688=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51P651WZ019708 for ; Tue, 25 Feb 2025 06:49:19 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 44y5j8b81e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Feb 2025 06:49:18 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x6KEByjdKS4BtN4Y5XF2LdEJdW/EimH72ckM23dxhsv4nof5v91DePAbqF9MqvGiAvnzr8OVl/1lKgqheGwQK/2vgOOAvJf1UJY55HU2270kaBzsBkIRJVkaUmlpUQulM8FMQyWEMSQBRrUduQ04J4/Eb0LyH2UYVyZIIOIWaWFkXd3XzSRvZwFgtjHwQ0Orcg0X5Ev3IQ3dLhH/jp78bNo7yTACQPzVpKjuVTWGp4VGCFe6azR/wQAgGZysvNsGm/xSyg2FWIfFGkUADSDxcYZB6frsqFeR3oT65UPmHtADvvnKDrR9PO34kdEgTQ2U1iHUy/15CZwmYgcsW+IH7g== 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=93LfKjqJXm+WXGaIUzldO/7ThlEZmVHyJPqISfh7z0o=; b=wMpdhlHh3ADDpFz4asKTMJCAQV2sgiNFPzDNxZSyjCoD7oysp1QzeVH13NxHvvOkf4fkUC4I1ni6yWJvcgWJqBhXiE+aZpVlTD26ZN/vkT2VPsBKDaENIHFaNZhIYZ/2MVj+Uo/Q/L1OfXn9YUvY7EJXWA/8T/LCyN0ZjIqE2vFokJ/WhIKwbTE54c9JJNLTwXmMgT+GedptW00bTogzF2uBMtdrZjWpYDSX9oqQTdMm/oqG/fiomOVTDrFfNZ/+F75ZHimf+hYKhWCAyw5ukcMAZBQ5JrjvDNuPglG1wOmEcBEA1ydPWuW9muy/aeiiCxUVgAQvi43YpXSLNJId/A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) by IA1PR11MB8829.namprd11.prod.outlook.com (2603:10b6:208:59b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Tue, 25 Feb 2025 06:49:10 +0000 Received: from SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9]) by SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9%5]) with mapi id 15.20.8489.018; Tue, 25 Feb 2025 06:49:07 +0000 From: Qi.Chen@windriver.com To: bitbake-devel@lists.openembedded.org Subject: [bitbake-devel][PATCH 1/4] data_smart.py: remove unnecessary ? from __expand_var_regexp__ Date: Mon, 24 Feb 2025 22:48:50 -0800 Message-Id: <20250225064853.2406575-1-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SJ0PR13CA0113.namprd13.prod.outlook.com (2603:10b6:a03:2c5::28) To SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5613:EE_|IA1PR11MB8829:EE_ X-MS-Office365-Filtering-Correlation-Id: cada3d9f-2990-4310-8aa5-08dd5568807a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: JIEEopRVSqjNRcayUzFtIlqQD8vBJS/U1HtIc9E0lDW4Z3VXcSQmef5GaHJQafG+tApG+zAk440/lFXUX/D8jb4n4cqbKhrBlio7amCHjzrWldl88//oiatrkSyI5VNs86BJHk83rHJ3uMATcJJcEfyHam5vThzF1snjLY7tM+pAjASUKX+j2aWFnJJPV3GeMH8i2QN9aQs6xdN7AWB2tStOVT5eqRJpa5DB6EbFVXk3yPY0IjR03gZtQ8VJZc4Abyv4VCsUk6XhWFu5gH4DMp+dRn/8W9RpuZH2EwQVQ2Mi2jPYKAu8/txSUeM7mm/FCNHu/kGbWYeV2XbfQ0hyuVR4vrMm31RaqIdiTG/ECu8bIGdcy/LXVLt4A02LxBLp8dKZceCavi4rLCKkbtBJkSqBmXgv9DeNVdZ5IKIF1KsWwVAzaOIzqaaSIjDIymn1Pk5rG+8dOlFM6IlBYMg4tZQ/9asf+HKJmfezwgEr9YmToab362kiQxZAa594dUB4uahmPuYrTyfiQZglSjPo7VhxayfKG96woc48E2DX0neTITOTH4Ydv7pJM0kT5Aw0Dl4cVim4m/3ZEJLoAO8OOHIFn/V93AIeMhSjfrldGdgjOnYT7Ggy/g3TvHJ8UYrBjgLaTO3KwU+KsRv/2cMIya4T3wE2hbkfLFkhG4o1/3w+YWTmC/3jMPO9lZbryIokm/D2kWrN9DvJCfGbC2MVTCqZeVjJSUNSffBbjVTvaB+4jRSXFDcxu8jU8ocYvxOtpOe7RbFmaBFT6TCdAnO9Wg09soAX30mD6ehqDdfsodRmg3qIHNVDlDfP5BEhmkvyHqYgbMcW9wvD1lZkceQ1OMXVwYGCT5YSwS9qJ/p3OsJP4G7oLhSjILOEHZtgRmgdanS2kUQvB7nZaUgn5vuXXdBXvFmNkgdIK1hgRdY8KISbZKosktU7AE+418VtgSaNASEljCKEM1sf9AFzT/6c7Do80rljZSn9Z1BtMsKXA2IYWI59yRSkvn1xMSOXzeJylQgJeF9lfPj9OpuoFyhoZqQ2Brwm99D23O7x9Z4tw23Dn2K972O8wDo6vBOH6O7PKbPLeV2ZGJp6jiD+vWx2rtiqKU8+o/e89aYPSfiCW3TfbqprdndasCH9I63QxaSzTQl9guSQ9PYQ5SLy6C08lSCpt6U07L91PCchclix3GINesxt99WG9KDOy80nAqmz0JKEnrudfowZyU3wE+DOS49577DZO0vgRSjffZdRXmcHCOgS+MAeFS7TlB+Ton9sw0HG2JqOcYUVEnt0qAkdBH6pqgIG3UK6+aE8HBnTVK5QbnOEAm88tHCaa5Ef9ZcTbihY8zHyW4cQGqYNllTLPApqVWl21zAcToK0DQnfVNPTQuGi8ewkjVriEMg2niQ5dpAbWBVigwtwMubdpwqdnHBlhWx3wPDKm0o0JKQRDPNwJHLo0cdO39r6GmWtiGpY X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5613.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(52116014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IJfnI4N/FHc0SPC30pmuAkNVab83aR41TfmQykkzKtDR1AY4tSR15J6LIXC0ocB2a0NQCodZUfLl2EoT/oxjvsSBpjI6bnb3cye+5im/cl3cfXuDYx7VBo/9GkyAJFHaeD+AcCN6fiLzMTzfJFnWSohhvNLzE45q6ZNeGHxXl4qwlAgcYqqDnpInXTYBFFtesYM+0EZ1A59D8Elwd2MXam2l8bE87FjWbyp8pQWx9IZA8xLo4NWknZDORKWEFktivIRYm7dXRKmISQG5gTfFA2flucnOikBqyOLAd61CPWC0OwDhrj9dSjs9XL7kMIHA4dFMllri3van9GDRrDRZyJJd925LoR8E339jM7f40Ew+83xg9EOLpqpSUruGWDq+MC/dmLexpZeuqmZUJsiIgeIgUTF2N2NnKi0BK6sXsBY7SS/J/VSNlEHUvj5R061OSClA6bJ8NJ8AakbIbG4s3yfdSZMmHOHJsZEippsoIhMe5+UiIeGruahrGwpnWm9YjjQkwbAmQ+rFHlWgumxU48Pm34rIZ8Kp7myTM668x3rYnhK9+66b17cnzmVIYfwQX4h6Z9+KgATZzQR5SnNe4b873KeyjQKk4SLQugFshQy79ysgkxNfhZP8RGTTx0iGmSsqGlkUum7efzvDTQlA/Is9ySARCSSFoyf2spbvFen1VQxGyJp0TbD/soEyyFBaEXiiKCLgrXY7kJc3BNsIzNv2NtsdtFiXYuY99FBlGah6ZnPG7SomcrrChd6CzSwracb2lVedklNoBUMb40pRR5oEjmNsvCQKRHpmE3qs/qNkLCJejHv6b7Y/AoVWxnqzOcDWEDCBcVXAhRp8R228mepOAXwLz2jRaUbKD4eAN0SsjsM7RTvSbaXrBOcRE4yzIaLAYX2g8o1cshwxeanJ8yiBgal2yEtw63VFO1fwaFoWaBBrTfNww15WceKOm98T0hOC4mzmbv0SIlB8oeVHN0VNrRyXCa4yM4ryeRKGYORlDy4sO6JnjeB3fKe+QcekYi6hKjWeG1N+MsthLqZqWZTyjdBbApG1udUppLCeXg8wMrR++2lfkiIUGHGgu79kBmP3r0zQsc8NLCPPlPAMhcHrW9ZSuq39hgxqcnp+HENnyBH1JqAxXH4I9o217LonE/lIjTc57ASk3/0m8s0nf8YlNSm4Q148JNjMH9BoKSEErokTT0TSijumdWnXq2Qnn/Wi8l0SqkkkhSfRpW5RJVh+ZIcfmQK9dbFVaWW3oiOHMO9rUuUnwZH4U47lJgjmW6hnzcbLwDN8iMAKWQdjDFrqNoAjqLYC9aVQbzU9NS8nwRsmsbjVLv5lsQYzjPLu4yYsnacdVwtw/dxA7RIpBeDVfYZnRY4dsMFNnlfM06ZGOP9UmVGxy0JRebonhVCXMzCLF4HYyAR9mpRNpMrotzYLExXBwel36ocDihVBXY6jEywJNztyuRa9EiESGsCZui53wWz2wq7BiFazQo3dGtQGz5FITH78F5p8ysGgti8bGMhKO0tUy5IhdOnFf0TFqWzk4bOr/EIU4B2XB6xPKmUpuXHECuDnaZKsdRCNQ+BIuFlooGrr+XrTt9iuBGML X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: cada3d9f-2990-4310-8aa5-08dd5568807a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5613.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2025 06:49:07.8425 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7qmxFCEjwzVg/kqUHxcwgvU+PJoyQmA2n/rOO5ZEHuhAcMi2i0z46rqbVeOdJqhkwjDjCNkKQDd6B82nV8Qc6Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB8829 X-Proofpoint-ORIG-GUID: LDyOv1LmE5ljjZLqKN8Yh6NxFMNWmhdI X-Proofpoint-GUID: LDyOv1LmE5ljjZLqKN8Yh6NxFMNWmhdI X-Authority-Analysis: v=2.4 cv=U+ZoDfru c=1 sm=1 tr=0 ts=67bd67ee cx=c_pps a=mXs27GP3B2XOU+bPH1EGlQ==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=T2h4t0Lz3GQA:10 a=t7CeM3EgAAAA:8 a=pXojlrJOueeHKX4IJ5IA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_02,2025-02-24_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 spamscore=0 impostorscore=0 mlxlogscore=999 clxscore=1015 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502100000 definitions=main-2502250043 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, 25 Feb 2025 06:49:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17298 From: Chen Qi The non-greedy modifier suffix ? is not necessary here because } is not in the character set [a-zA-Z0-9\-_+./~:]. Signed-off-by: Chen Qi --- bitbake/lib/bb/data_smart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 5412596566..922d3f5b1a 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -31,7 +31,7 @@ logger = logging.getLogger("BitBake.Data") __setvar_keyword__ = [":append", ":prepend", ":remove"] __setvar_regexp__ = re.compile(r'(?P.*?)(?P:append|:prepend|:remove)(:(?P[^A-Z]*))?$') -__expand_var_regexp__ = re.compile(r"\${[a-zA-Z0-9\-_+./~:]+?}") +__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]+') From patchwork Tue Feb 25 06:48:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 57770 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 79409C021B2 for ; Tue, 25 Feb 2025 06:49:29 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web11.2848.1740466160422759926 for ; Mon, 24 Feb 2025 22:49:20 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=41510c6688=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51P651Wa019708 for ; Tue, 25 Feb 2025 06:49:19 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 44y5j8b81e-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Feb 2025 06:49:19 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Uc4YGdy90hxQDk6PaSzVMnxmQmJufuDoCAwPUmT7HWRjejabjJ10WxjyUtOO+jYVL4AhsXIUqeQXpwbg+OGKcM9OWEzfAOURmI1yXStlgc3SIPVA3FSNyrC2I4I2Wsx586HYenmPa/i6VWfo2X9ROF8etJJctzxvyb3hgR393cPOUUxu+ltkepdlFdGbZI3S0exwF+cqbdAGGZh3WD7H65AjNJvDVdzfd0pZhnnHksR0S5RUBQy9iF0jCDH7dkIAL9ZYsS0fu2VkJJWZ3PGCrwsD2WC1G4aJx19JErKhY+DflX9PVkuGqgFHoTpScNPCLQ7uGdJ3QIjS/OWR14HbDw== 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=mHyvdj62eg7llvvqW2d6AsKD4IE/1gPG+kf0yDlaB+o=; b=uMMT7sYXG9HPEkVIZqxtQovYa3KHSyrLTEfzetuPwZ7c+DgC/tL81H3fmhJD13sC2SOTeeKTZJkrziZLrilwI242GGiRdqzstOUnooWHxxeg39WXJinAzx/Rhi6Tld2PKSvs57g3oHXyiVKXS40DEko74J/f4Uz9XpKBsiXk/Ids2zTpJlGrmWKezkfOwckXMDEKAeItcbeuFh2MsA6BGzj71nwae9T+DftpJ2vRwRQLrp/rjV3Ls4uXw5f5ILCxq+EqbJxJJWblqmCXBtCVXS0v1gwjU37uPJDjiJPBL2FXFtFTKZ1GG4QFKuZ65UyE+4X4ZATgBjzGVTTZN5TK2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) by IA1PR11MB8829.namprd11.prod.outlook.com (2603:10b6:208:59b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Tue, 25 Feb 2025 06:49:10 +0000 Received: from SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9]) by SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9%5]) with mapi id 15.20.8489.018; Tue, 25 Feb 2025 06:49:10 +0000 From: Qi.Chen@windriver.com To: bitbake-devel@lists.openembedded.org Subject: [bitbake-devel][PATCH 2/4] data_smart.py: fix indentation Date: Mon, 24 Feb 2025 22:48:51 -0800 Message-Id: <20250225064853.2406575-2-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250225064853.2406575-1-Qi.Chen@windriver.com> References: <20250225064853.2406575-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ0PR13CA0113.namprd13.prod.outlook.com (2603:10b6:a03:2c5::28) To SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5613:EE_|IA1PR11MB8829:EE_ X-MS-Office365-Filtering-Correlation-Id: 33d67230-d7df-4a45-95db-08dd556880a5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: dbZ1SJUPNLuNo1y0Mj4OQoxz9fE2tC4gkfJdgVCszXDU8Bu+QczESZ8NsVyOS98MLoecOxSCWXipZsIScCK4uc5xTZpdMYRXgAElCT0GnigDztd+TOmMbQuY+Ix9M/RWX/ORhPtZbtP/M1nsjB5klPuyIr+HWkUQeXhVND83pElcVIVGnb2cgw0uTRI1nGdLT/B0DkSfMnhRJZKrjQ/1Wbke40gbCZDUj6oTXcOhOIZwDYfkFo9aw52vch7zvSVDi+pbFaYUs41BK2/NuWTWoCgJcCBMbruxpwzz22opeKlINdxJmhigaPJo99ACELKpGm2yZzSE0I80j9xGEI7sJvxINOWBHJIuRDlvggFSUsqPHoiUSJXuUb15yFrPop5koZALUzH3hSYDqMAok1G5Ai8aDxe4MjowIe6nfGN5CB5ldo2OJ+eXv9F4DpxHIijmxQ0ULUql4GsnplgR6gPBfLGzI6EdxpT5B4lIMm4Llf0SkXdUAp6KUf4nkW59LT/Q/MwAaWyGkQa2u08PICztiyo0vgD//+s1inYfktJbmLgRAYT1hCIftyA5fyfcQ2ZhhiQcEE3ne0yaO/rzxapCEhtV10wsRKwPF/A3GuRYyfQ3E1DsEc3IZ+OukYGTZuaernFThLiepSvpJbvEbrc9g84agBDyOHb+MIHEAmsM0AcYpQhmc8szD5LNYXN2YO/wt+gZ4JFPB0ZBxsZroxpktS+aO+xxtkCqrHCSd/qGdTnwQnaSwXJsrbinlQcK4NJyDfllH77Y2+Ved2aoVaWfeZFjPM814YIXQjzacssauZq3dFy/oOnrw9pHPs22EnYv3OpmSiuyuO+eiw+jUNB8+klDvgfsxaWJ3uYwKiCJtTYlylzPWc5dvylRUDP611TosQ20OVY0Fw2VzNtQswqCSWC9jp000uTXJgrN0xqaFIozKz+HSwfjo7TRPf5I4wsBxY0qyJcEyPoCHu82EbZ6/7j9CtSz4TVB279lQdI0eR1r9S50SDx64oW4BHqy4+MhdvIV1zVNv+hZt6tHRYer7I82m1fCBz18he+EsQkox325rOrp124WMyKDLVHVxqfW/+Zy5MfrKdZ2L94DibzcrvzKsCVpFnBI+riTrlz5cKHo1Qo2f6X5HiKuvbBnz4zhAgRHjRsQOCoPMwshAWT7Kc0vu24HMFznzD4p1qcWPQHSfGvpq7t//CBx/5oJa7m/BRRTHAw1vOLDM5rZYNxmeH87vfQ32pZ3UuxAbJPU8KLECe93mibeKwGolpKEhTMEZCEnDumwqe+a9SAEYOGiXeJv/o0NYFXoqMq3/shoeRErIgOJa1oXweQtwWH69JGz7Ema7vSYch4RP7S753G8hXJnHc17We7RCs/e6baDOeiE451gDWw7ZxC6DC0+siyojEc56SlI2rO41ArQvHUgEvk4kh7H6JituB4QaamvFE/gn4wIGf8Q2SUShYoQuKgT X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5613.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(52116014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZM5qCc6li11KSKk+UAkhYvfYZqoSQqeiPG7q3KaoQBuUjkiMBcQrEVn13DyBWLhgigKfwBS3tiGIO0YcX4TIuNBZzQ7E22/PJbg40t9EzKX139l+O0ZQYgJj7S0QOwGvR4GecTidHQvwP6BQrLT0X1Yt7R2YOXRI7UiZv2jpJ4fSfb6n2REl3+tibsDWG+HEsqu6glWaPeI6TbJdOWpy0sMJwrzPHdRt/s/eTgCermlKGNpn3akNENcc4aS5pczvjkRQIE+aKuYpWg0BOpZ+Tbls3L9bwLrUgJench4/3IvPNK9wlqeTzKcb6JkV8CUEfF8ZHUmlPc81RAkTb33XFu01QmHpabL7835/cHaokht8NOOnx9grfczAqAIKNx78pjERtR4bQFszgfT9hJh9wcqXc+9Km7rW/sfEZEZeZWC4IxB9fPrZOB5o4rhV9bbVb7mmAbGgX/EbvnYowNTByneTkKsXOIU/+2IZUJPq2EXbiF701rWHquHSViZcb4K+8qax8iCXM065mryk7PORXa62V0Qw0Lx5DRHi3NES+XRrKBzvdSf/XFJK5oVbF7WETOKc6S7qsBiNqQcF8HAPkMrgH7zy+1sCPhTCRw34dZau3AuuqYmZm6BhNEiuq1qhr+bf6FP/aLvU//QNmaZLj+cEf9rrmdjVO+8LqtvfgtirQcr0cX2g78+AyZna63c1Cw05yhPCoXc0ysr/6k6YL5OutjezzqRC8oXLEq2vwnpamwUZTWHoDDEwiaRaDPkBBp3lpJlCeCrGa6ZD8DzgXJf5uUsOaRMAemxUQXeepe55KPIXgoNuUnW9sX29YVScGshVYKxpmhlxcfyKdL6T80HMBnYDp1P0JlhpF/OoHDu+bUAPx0mIItRseuy4cjF3jasWX0ORBUREq1QhA3SHIoFACMeETSu2JO/5EYtjdyih5PC0rd4pwgrxQtoxnnxpkW08ZDbiLoi3j/iCLPxCv9HrCDjhi2cGi5moXwB2I2XoJ57KCm4nuAKUvOXLLxAyaaGVzhxc1xZ7JWRdv1pfLZmMkHfPWK9M8FXHsmAwBv0q2TRHj4FFBa0ZcnTyjVyGsGYN9EABFaD3MV0yT/3d4zcCNyhoHRoZ20R4IShvz1kBOK0yu0bCAtP9L+jEirP+sjj6viyZdSp6AHTN2Wgt7jS5DNQ2WbremH1By5DyyM50/StY15/cNAZOKrL7+qy0BvDi6iUgV7ylGQgtQmqMym0B22tj+03PetTzs38PA/UyDkyqoejWPi3B+aSf+ka0LJp0H6z3opURgcVSXuL40sFYz9mt3rioTP83aG1FeroCVTuaWx80qXs92cKqs4MoK4Hkg7xGFwbna4Ep4rQf9RxwZrJ7p6vjNVJOhxgT8sJHgOkIFLYnKxFQnRaNCxxknrt9A8UquTZliRy52DEtzABjiKp+TBUsxUyY6MXZxSk0qX/6Ppy1CZ0lEj3em7A+jQyKuabsibNq9MB0Pg4fKp74gcWpQXq/nRoNhGpS+yer3XjHUvXOLx/4ISK9Iq0Q5n0w3ALa86B1QVHP+2+aVG7JT2nurn+2BJoKUyg8cJ+p2l5LeRqj0rm0mJOtfuNuhNmJL4hX4OhQJwmKf5EyPg== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33d67230-d7df-4a45-95db-08dd556880a5 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5613.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2025 06:49:08.1845 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dLnlaEjIWq7Pfh4dE9L63yUWDQmN04yjVw0SvThQ2jqrlAC7yU6mmeQfos+6LxyFRPjJZIicSJAkGnWJTq35SA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB8829 X-Proofpoint-ORIG-GUID: Uq8vsTSq_KaOWjuRfqpGEN_cjNjgJhjN X-Proofpoint-GUID: Uq8vsTSq_KaOWjuRfqpGEN_cjNjgJhjN X-Authority-Analysis: v=2.4 cv=U+ZoDfru c=1 sm=1 tr=0 ts=67bd67ef cx=c_pps a=mXs27GP3B2XOU+bPH1EGlQ==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=T2h4t0Lz3GQA:10 a=t7CeM3EgAAAA:8 a=Dms5D4AWm9y5Qyzj9lcA:9 a=JI9UvleF2b_vUXCkrjkF:22 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_02,2025-02-24_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 spamscore=0 impostorscore=0 mlxlogscore=999 clxscore=1015 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502100000 definitions=main-2502250043 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, 25 Feb 2025 06:49:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17299 From: Chen Qi Fix 8 spaces indentation to be 4 spaces. Signed-off-by: Chen Qi --- bitbake/lib/bb/data_smart.py | 80 ++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 922d3f5b1a..fa7ddef74a 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -106,52 +106,52 @@ class VariableParse: self.contains = {} def var_sub(self, match): - key = match.group()[2:-1] - if self.varname and key: - if self.varname == key: - raise Exception("variable %s references itself!" % self.varname) - var = self.d.getVarFlag(key, "_content") - self.references.add(key) - if var is not None: - return var - else: - return match.group() + key = match.group()[2:-1] + if self.varname and key: + if self.varname == key: + raise Exception("variable %s references itself!" % self.varname) + var = self.d.getVarFlag(key, "_content") + self.references.add(key) + if var is not None: + return var + else: + return match.group() def python_sub(self, match): - if isinstance(match, str): - code = match - else: - code = match.group()[3:-1] + if isinstance(match, str): + code = match + else: + code = match.group()[3:-1] - # Do not run code that contains one or more unexpanded variables - # instead return the code with the characters we removed put back - if __expand_var_regexp__.findall(code): - return "${@" + code + "}" + # Do not run code that contains one or more unexpanded variables + # instead return the code with the characters we removed put back + if __expand_var_regexp__.findall(code): + return "${@" + code + "}" - if self.varname: - varname = 'Var <%s>' % self.varname - else: - varname = '' - codeobj = compile(code.strip(), varname, "eval") - - parser = bb.codeparser.PythonParser(self.varname, logger) - parser.parse_python(code) - if self.varname: - vardeps = self.d.getVarFlag(self.varname, "vardeps") - if vardeps is None: - parser.log.flush() - else: + if self.varname: + varname = 'Var <%s>' % self.varname + else: + varname = '' + codeobj = compile(code.strip(), varname, "eval") + + parser = bb.codeparser.PythonParser(self.varname, logger) + parser.parse_python(code) + if self.varname: + vardeps = self.d.getVarFlag(self.varname, "vardeps") + if vardeps is None: parser.log.flush() - self.references |= parser.references - self.execs |= parser.execs + else: + parser.log.flush() + self.references |= parser.references + self.execs |= parser.execs - for k in parser.contains: - if k not in self.contains: - self.contains[k] = parser.contains[k].copy() - else: - self.contains[k].update(parser.contains[k]) - value = utils.better_eval(codeobj, DataContext(self.d), {'d' : self.d}) - return str(value) + for k in parser.contains: + if k not in self.contains: + self.contains[k] = parser.contains[k].copy() + else: + self.contains[k].update(parser.contains[k]) + value = utils.better_eval(codeobj, DataContext(self.d), {'d' : self.d}) + return str(value) class DataContext(dict): excluded = set([i for i in dir(builtins) if not i.startswith('_')] + ['oe']) From patchwork Tue Feb 25 06:48:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 57772 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 88AFEC021BC for ; Tue, 25 Feb 2025 06:49:29 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.2805.1740466161040233192 for ; Mon, 24 Feb 2025 22:49:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=41510c6688=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51P651Wb019708 for ; Tue, 25 Feb 2025 06:49:20 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 44y5j8b81e-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Feb 2025 06:49:20 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WzydqIJagdNCH1ty/fCRodzW0EJ5KBE3ScUz+Tc24Lko/6zbWOtAOZbUmwLU+7C7hJmb7t661tTGOtEhbetzg8zeD/oYnMSsdIQTP+9sLWFE58xvi2w0OaGl42WnJW7uP9TeawpgAl5/EWr9DiEhSULlAYb+jeOat80QcIW5/RcPtHV6bosIg6Bgojkns0GJSi0m2zOugkWtNtV33F5O1Rp3w8g/r3httUQxV2uCYYw7amWwFiUzsIgYqM6G3EcWyPmduLQaXvQRiLOM6pu+6WOdkDDt7o2h4bTK4u1JQwiamrJ88gxHogJd1gaI+yf2Dl8Vcu3h4cW40zXVEoPMGQ== 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=4WVVcsa+S9paJRTkhj4n11SLYLzOhWRhrBDkdiLEJWw=; b=wZew1LKGDVBrH4I9/vuKzaSG4/75xSBou73CV0Fkzhv1yPvY3Yyc5ERUZESTfQ0XBYByBJC70NjuEuB5G8/O+wU45OPqErPR/mKgbjqdVGk+W7wmL4yTckQTO3/CVh6XWM25R5uBwGJoclFklWXeAi4zv9c8MFudMSDL0L4Rk2TbS+d5Yl1dnIZpHb+I9+oBHt4fdKOJb/VhTjXA4xACBWq5Uo/sLChybEI4trp3DSAoCSVrXCGmmfaaDRWEe0Y9Qjnocj0FYR4tYy62Lrj5sA3ZkHN13m/UoQvKU7Er/wyTI2rpeudkds5SfXP9c6qYWK+NuIcVZMKbge2soSOZ9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) by IA1PR11MB8829.namprd11.prod.outlook.com (2603:10b6:208:59b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Tue, 25 Feb 2025 06:49:11 +0000 Received: from SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9]) by SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9%5]) with mapi id 15.20.8489.018; Tue, 25 Feb 2025 06:49:11 +0000 From: Qi.Chen@windriver.com To: bitbake-devel@lists.openembedded.org Subject: [bitbake-devel][PATCH 3/4] data_smart.py: simple clean up Date: Mon, 24 Feb 2025 22:48:52 -0800 Message-Id: <20250225064853.2406575-3-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250225064853.2406575-1-Qi.Chen@windriver.com> References: <20250225064853.2406575-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ0PR13CA0113.namprd13.prod.outlook.com (2603:10b6:a03:2c5::28) To SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5613:EE_|IA1PR11MB8829:EE_ X-MS-Office365-Filtering-Correlation-Id: a661ecfe-3229-4ad0-06ff-08dd556880dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: qvlD6o6gIVTqX3nkIQj1hIGU3Na/nO7cP0YP3RnQBfmb0kCU5XISMTOCOmfXD3J7IAdUbT6epkAKiS3dzw/LKTBqfcWPbOKjwZQoL1Asp5HJxaN/t+BcDJO6WPN1jMBQ2qE3j4NUHfqVjBqqQXNdloh+O/UwQSpQtq21n8zqf64KcyEPqXpVz0rtESFxiY1kXLuq721UBaOlNdBdISTwsts5MAexR6VoYZVIQuhH/SzJj6ayQqIHyv1ZrQSPL0dIz1NYM5ukEAlJNcPDac8/k3qxYuSn4Uygu9gsJ+rFz8YbObH0zC66OhLOrmy50C4W7fKiG6u5qtKR0BwMpiBtwLVta+rSaedYqD9+MFThBX4iJrN1W57Y6sQZwLAdyZrWu2XexHoUe/zMsAN2cNPMY3a+r9f11faa/7AjfNqFVR4UyI1sCbXq26K8fP82K1jG5JH8atmJ/vjdte3IYPM58dtbvTerDCrBRHeEPk+hTioRLbRXfNMxgDpTTw2IMcv8LtDCMsZmSIO0VAxYArc81R6NutmFT3YaddCXrDOlN/wBb70j9gIdvxVkwTRUbdWN+rxXsUowAkpZ0QLaICqPJ9Om/YmmLD+YAVbwjElwRh5nxPN0V5BVIIQAyVOAqkZVQkr1c19FPc2Drv4CD3ERp0BXeDzYvOd2kFfdcG/qTKiD3vtEym7EQTswRFiXIGxOPh8VvSW/cQnSIkdrGgq5M3r6wneFJex9w7sPpz9G48A8B2f+HJTgj0xrT2FVgs5JW8vU4xL+34dowNyacXIwLd1lf1AS4O28MN/OPhjCP5Rw18uf2Z8+6/SreKvVPNBVEEl6Myq8o06jAjWRVvw7rj/saWJWxMFUeXNPwRbQWwFJ93/tqALiAcAQstz7P7uK1wpSrayOrfklZHhjYrgCp/zfNTjVfmviF6mbYgIdt7iIc2FmPdki49KS4EUIzCUsinEdRII/k652APiMIOcHbL5UOEJ4klMuAXFtZeCk3lvB62qEC79C8E6RKWEDSwly2AMCFAyTIbUn4X+4/nqBxzYg0oMoCK41UsAogyQO7AgONjwYU7+HUoXILCo5XJLGuVLqq1fpgdpSWTCT1fYq7FVlMEzdwTBnlp9n7kl2RrukOwVdTnpRtGbfCHAVGXQJ6WGb8c5KckOR+WaiYBDgWD0bBTcccyXhAp5FFBPdl5l1TkIO8iyELNPtmK3n8+J0zdpolEaAbbKPeA7c0EmIVYTcL5r506+JjGqcoI1mpPehqt0MJzG84WB+HJLzLOICC0LZq9xSoYsLdxVoll6fJsofN5DnvLE5UHOFrjTTAiIn5WSnZL+7WRbW+s5jnc2fsrr0Kt8ETR6eap6FX1gfDHIaZZ8LvuSAyZTNHgTzoR2rpbdF9T4mi+6/ah8c6p5xiLIuCcIYn5X+IWA3T1odDPanc/IlWWfj85Z8Bk3ifpOVXHlGjtnyH/kqWj5GuToh X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5613.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(52116014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: PZeE1NLJN0TU3amC09VMxXfxyyV2ub/Am9IPSecqRmpbOycbj3irGpcvhBNjFx+WzFX5nc+xrgX6wfm7f1oBzt/GwGd1i1Qa8GD+Dy+8iBi7IGRaJl1imN8LIIJjOivf4eRmXd0K6QC0VXxQkXmjpYaZ0cpfo6+6pZ88ASKGfvsRMH+4RzcrOSIKyNFcYQ3zJg/JThVWnyRT2NQHv9pkdj+rqaSNennMBNznYDDLOyRCJ5Z/IxSDj++byuoIHZF4Lo/7x3JoNHO6ssjnuUBsooNNtu26YiBJgrKvtyTu4ZOwAtwfVS5FdrsXdYqJHHaO8CKQdeeD5og0Pjhz4Zw9P6W6pPZy4u8WmamnYBvhLQnIlGicAVHF/gcr6iZg1tOjGLe1GaRY4vFNq8PqnEvapb+BmPl2msJJjyek6CvCrwLzOY8OSkP/+fN4ldJoRVEKKzu32XbKNRbvEhLgcVilwr9q4RBwVwlKUezaPmRDqI456fI4EH/sUpzxA9I7VoyFWaLaFwn8t/QQOrvk92bHnnccssxk5dDX102m/O74UfmdsviOG4lZt8L1Jj9paAkHclpCAVst+Z8f8Wo/uZSTB761nML1nyaWxzca1NFlzpGSMwkZwv2mqgQv+pRyppqUr5V9nQokP5l5I1rT3ObU3Tkc3fP42reRB7SnLOjOyjoIpW0BWnWnm2bymXV+Nt1cvMJtR0AScYK7PooO7tcPBwTRZYU2aviwDSJSAot3RYSkyeYBrfqRJ9//wlqvFbbU9xJz9XtsV3egtShhKiW6489lPJrCJ57t3fxwo3wdWGrEOothLsOEumFa9l4ZtYPcXCD8plLGQvFIOEaiKxS4vmcto5UJLdTLUR/b46w8r6FnslSPC+kfcRk7yvdoidMYQEiHAtivhQRTGMWKDiaS22xIoA05FST1mhLoXMjuIllfXTC8JGNXrfKxuLCqrjMIVYL3BbUcl7spGpYmVtmf62693201ZfhdYMxGtiwNgtfzjl+YxminiXij5zmxP9pfnDaxrg0Zh9Dl1CS4zyNTUWCDiY0j131JXyuzJNe/kgeaRKcZSrs3Ov9KlSvdW9aMalMeLYfzEnhZ09XGSwEWdL7Ctc8rS+x4QgfY4gAYMtZCzSLXyQahdB4Nr7lNcp3aj5biDi5sgQAl/yobJo5p80L+AUFFyAaE8FtQdzxhFhjrv8kXKklKnw8iNltq5GwsVoNfzENDHtJvNnYyA7JG60MsyfkiXnthdCTnt3Xil84wTtTgUXJO3z/c+at8cdOKYW+KczhBjxT/E1RBAc6AmzlaR3YgbR0AqvP9udFgXF2NXbcghs5OHefX2DgtoA2TaVvBr+SFNHxGbje3gqODk4aMm3ehh2SBq5VwN0ixssSHSetn5QelOk2SsnCA8z1rSwHuXpsUVAqHWYqlDQwfJfoVPL0SwDG5g48qeuxf5qPBbsFFyFu2TttX04qFNRRIZHGgxD5KSRydDmIEquh7r2LopnN6TC1JwT2t5ve34FSsvJCTRTQHCI8fRhmuc/bOGyPVp9J4S6c3XVJHL05ZlqESRjeLzOtVoV9uPmTv2hP+Jx/zOqz7hE2XXuS/XgVeOYjuAfmXjQS3rputqbsIrw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a661ecfe-3229-4ad0-06ff-08dd556880dc X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5613.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2025 06:49:08.4864 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: saAkp6GxUbI34/ls8UMo37h1sDxxEl4F9DXyUWKLxrqCp5T26JcjQujb+6jQMqDZ2Bt02xPWylbZFcLOCHq0Bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB8829 X-Proofpoint-ORIG-GUID: i-s3ab4rdcmDyxeqoNdouLc-0Kj7_DMI X-Proofpoint-GUID: i-s3ab4rdcmDyxeqoNdouLc-0Kj7_DMI X-Authority-Analysis: v=2.4 cv=U+ZoDfru c=1 sm=1 tr=0 ts=67bd67f0 cx=c_pps a=mXs27GP3B2XOU+bPH1EGlQ==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=T2h4t0Lz3GQA:10 a=t7CeM3EgAAAA:8 a=XS0LdqdSyXoDj1xovJEA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_02,2025-02-24_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 spamscore=0 impostorscore=0 mlxlogscore=860 clxscore=1015 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502100000 definitions=main-2502250043 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, 25 Feb 2025 06:49:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17300 From: Chen Qi When var matches __setvar_regexp__, which has the value as below, __setvar_regexp__ = re.compile(r'(?P.*?)(?P:append|:prepend|:remove)(:(?P[^A-Z]*))?$') the keyword will not be __doc__ or __module__ and var will always contain ":". Signed-off-by: Chen Qi --- bitbake/lib/bb/data_smart.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index fa7ddef74a..caef93ff4f 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -580,12 +580,9 @@ class DataSmart(MutableMapping): else: loginfo['op'] = keyword self.varhistory.record(**loginfo) - # todo make sure keyword is not __doc__ or __module__ - # pay the cookie monster # more cookies for the cookie monster - if ':' in var: - self._setvar_update_overrides(base, **loginfo) + self._setvar_update_overrides(base, **loginfo) if base in self.overridevars: self._setvar_update_overridevars(var, value) From patchwork Tue Feb 25 06:48:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ChenQi X-Patchwork-Id: 57769 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 7B776C3DA4A for ; Tue, 25 Feb 2025 06:49:29 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.2807.1740466161736528842 for ; Mon, 24 Feb 2025 22:49:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=41510c6688=qi.chen@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51P651Wc019708 for ; Tue, 25 Feb 2025 06:49:21 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 44y5j8b81e-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Feb 2025 06:49:20 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f/iHWJ4kZ2xVpCmXqImNaSwgaRTne0G6LzMQP6Q9QKgDE5YKZk+poYGZaVWmG45ztxxZ6eFGdFFRevGUx/B+qTRl5+0Lk9Gpw8McXW7BkQq6atzAC0WTbN2mP4irL4U4be8fuA6xkhWEhwNqta5FBmB2FXwj7W/5P6g0r0xNI/xhP+7hKfwoOkzsDp9A6RhZeCfvqhfpnJO2xiFYYOOBRlcLo9uwOUx9zK/e0sdryBD/DQms9VXde0QHA5WXQ4QiIPiax9MfBUeMZ/vtOpXsYe5cVcOpPXtPuA3MdLrYE0PBkBWbNFe0A30sI3qq09KeRLYolnAK4FaMZjhT7mrqtg== 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=eO7j2NXlV9DxarkzMuKt/fpwGsAnkjNr69cvJF9H4zo=; b=zHhMjwndJVrGMTnWigB2fpbPYs81cUOR8+BLryTScUPznra1wKnb8Uy02B+pyoS5MooYjJ3A73DtNcXuapI/4wHNNHeO2H/aukx0y0QJPDQyTuZaVDEZBkacIHQiFLsGG6rf40JSkbQLjPPwVpJds/9JWCryGSZvlutpK6gQpeceKs/tl/CqsRP98I2uobBdsK4y2G4Dx3Xpmh3624hu2ZOqcJBr86xO0CfqkPpdTJO00T5qrVBadETBs6r9tUuFEGa93ck6e/NO/wP1EKtK5+aDhnht3fi+5KiDoHL3/UAdP6ZJwbgsURP96PYnC7oC2jxhrerRzhcv1VrepN08tA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) by IA1PR11MB8829.namprd11.prod.outlook.com (2603:10b6:208:59b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Tue, 25 Feb 2025 06:49:11 +0000 Received: from SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9]) by SJ0PR11MB5613.namprd11.prod.outlook.com ([fe80::615c:ca2f:d093:16a9%5]) with mapi id 15.20.8489.018; Tue, 25 Feb 2025 06:49:11 +0000 From: Qi.Chen@windriver.com To: bitbake-devel@lists.openembedded.org Subject: [bitbake-devel][PATCH 4/4] data_smart.py: clear expand_cache in _setvar_update_overridevars Date: Mon, 24 Feb 2025 22:48:53 -0800 Message-Id: <20250225064853.2406575-4-Qi.Chen@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250225064853.2406575-1-Qi.Chen@windriver.com> References: <20250225064853.2406575-1-Qi.Chen@windriver.com> X-ClientProxiedBy: SJ0PR13CA0113.namprd13.prod.outlook.com (2603:10b6:a03:2c5::28) To SJ0PR11MB5613.namprd11.prod.outlook.com (2603:10b6:a03:3ab::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR11MB5613:EE_|IA1PR11MB8829:EE_ X-MS-Office365-Filtering-Correlation-Id: e190fc94-4bcb-4feb-70e0-08dd55688100 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: t5wPTWz9RqMK7kTrJNl25Fme3puPq09wc3WTpIdf8gbShAH/8/7L+9+4HDHuNsyPDWvpizDCYgSqXePNyzH5kIJSl41dzLJC/4+bcInWtuPp7RUStBTZd00syg8IGucl/XTUpNFMSD4kYQMUS3LcBG65+yHBq/uP5TZxDGv8wRfvxkATxk1mA6GxcOxo3PUWzeBGcfbqRBUejIFkHN+ThSeTVI9g5duY95fh+EWLpVYqYe+gmdtKI8TuWEyydQNcnX0vZXLi+fopXumfIYGsCXdU51xc28KXlBMlVvBrgi0v6VIfQXW56zqdrSF4Eaczi+jTyiFVwxRNvuyOlo+vqbyszphmyLNyLorkAlbtIZMUsw5Ky/tsoDIc8uXllY5KRgD4ANLVKO1BM5ejtPup+QeECT5VThDu8jczqHczbK8wWMak1jBjLNwVRhx7D8+0//IcDiPlwY0pSvQRia7523s9I91mITvuc3NMb21tedfF9NokN9xLM6kEQNjf37/GxkmrN7p/JvpCA7ztt7KC2TOYKm1mly0mHY7ClrNtXyLFJKhqbUpw4WDAHP9r4w32OJArVydPt3SpPmw0wO/JwPMry6r+R3QC8lwqB+7XmBDeAYUUSqIQlNb+8jRFHkecKLnM2IapkChYRuGQcKBoMWBeApWOH+M3HfHj7aurk/ckxeQeE00VNvWgVLwhIq87lty0s4adKdl3ADElxhlXeyPjqiFBnMwRFcPk2xzuR0jugNguDOtv+N6a+Kc7v+2vDjauNMhNTETdNX0J5LytNpxhQbZUbIutPcvrlaNzcFuX1M6iFiP0Tojr/K5jAHAq9TTA1SnawqJE1VulkAxh6LWPUAPk5KRF+T8fE6p+NiGZ8mKqOgryCwoDH/inhp7hedw+escKFO9vRbUcyIVVvZz27RCTtJpvJXQhXlFjIJEAytthti8XTEQpWeMY0tLhNtrqbxbCYn+e0C3zG5tI7z9fwaNGT2sHRRr+aBVPyQ6ymMDGAZ/n9yIox5+moE9o8vzEHPIGSdGlAJCrH763DCYayiNjqCdoi78nyHFJaXiKuC7dV1gq+Szut9+E0+8e2ejt37BZ1r3U2ohIXABFaUmUitF40vYqDWNGN3j0HKOecv+/UdTJ/Zn2CDgf4fDZLmSXa26DkKSi+BIsu5TDh9mKK3TJzuPxl+kXAuHXBQeQddKDEedG3I+WVL18BQeqzieyKCpEfa7BlAICdDmm15KJ3x7zayNIDrPubu8njRbHta1X64nGcgNJJkbgFe+wYehC6Kps+j9jpxUlSDmA4prGqVOc0B1C23XHE23JTiI+ZIIkTF53O7zmePVRmirGnEqdTw6Vcb9wtnnNTqof74qofg6mDGK+o0NrUtqzsQNBu/1+998t3H9aGnjN0TXM35BMx05+5WjjJhYPyOyJjU/RBiiD2xAEXB387M2RYfu6mLhlPPhkh0aQtlC5B0A2 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5613.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(366016)(52116014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UJ7AGFfqJtJutOe3D/llQ0U04KlQNZJBeKJ7pRrwce9D/1McM/8FePhR/Bv3RzpKMcF8lEviqkhd7FUmPC3tpt0n1ty788a4V/5QHwnEuYgx09FrEysQyOsgZp0oCe5FxnsojEwyHqPlaQe7kM4pN4u7qEywkmlNwjhQc8r16UFE6I8/qZTKGemVO0g8ZCWdlwA/xnVKq0OZNlXJP9q0hVscnRtkK4hO58C/XXnPcZMsd1w+0gMfZgZk2SW1RxMPLN2OkBBnJlhkgsMJTrMlqN4naXHRSr0YGdkMfoIoVWPZ/8upsUUXRzxxp5q5Jg6d+wrNqjnNQWh4I+ixIidICh4Gr755cpSKw3AqoPIvEUIvkyMWFGdwXqMYZt+CbwpbwHss9A52Uko4zYskLtDBmo2KA1e1P13Orz4y5fRh7X6yY/v3qnE+svVseDmckBn1Mo4QOC5zKj6EbRVV4ejM6kY1Ko0rRODwoORqFW0atvSvmiVS6GuGtLF9jnijNjdoL1COnnkD+KWPVajE8O6FOaHo+WRNfwcw5rMfGTEEUq6WGfbK6J5dO6X8E6fnmGkW45AaO9TTALk65XmfJHdkHYaexzyAVYFNtwOb0B7rV3IctMPl8boHMBTaxATlTZ1CJPPhE3Yxovb5U7GuC8bH+iJb6Z+s+drGK4bqLr3MQkEsvZxp2GzrCnCcdFgsleN+M94LihMdSLqSXhVhzYqUPhWWiWxiS6XpPxllj+dsuke/y4jJMKLn4K8/JkZMnV6xl6Hmwhq7lJlnNnRmy1D7MtbHdNwJB1jF45+oHxsHWKCHCJgacZFxBxROvK61Ngd5uk3M+19W413cEzfhX451cx22TaiCGGM5ve2d4D4jVR1D6zsuVKxZvksw3b/EBQHTIvS2OrmHFiveLWsBPXE8V/aJ6AN02noNX+EQmsiVQddhjyEuuid3jxQSRFwP1zDUKkF4O4SbLeNvOIFJlfENOxnpjnplRZMIHRRmyDqnj2XHGjvBzJIfAcNoHjoiEEyTbd3DWZA4+TLcuVy6NtD2L/5jzrIx/x8Gy6Ml1droQBAUW4eMpxXR7OscUVd8KjaFj/BAhCxKwZu+p8tTtTaIN9s5s8hKBRBzJvU4zLJJcVPAE7v2NAOFaNbj1g+o0z4k2zEUf9nzKrxwTOrDQNoiFoIWgM2Cid2kcHqkxOKKzJ8x4JJsktDjzQZlY4oYEbBI7o2xs/u6lnsC57ea8L28/hd2ra3L1h5gfRrW9WcVdsqjgVjNAPczpdXSpGV8x2UskPzC8XcW23N/Ca5MZMoBcLQyOjLdPPsX+iJTFEMGrWkn5sMWZ/IArL+7YOgxizqwQn23RmqhqVO0MW91zDSnxZhqwPDkEvSvXfzxk8uiw+Jiqfl1+lrpKfyrcnD9T6buVq4TdeTJcHvb1tuI+TqOx9IsCPvukoLR+mtLC59HrE9mZYg5TuwhlCniQBaJRbj3MM6IpVax+ySU6BDFD9wbcS6HDIhUEu8ZOoufGW4vTdxcWUgOkaCRUOkSzWywMPbDlPJKP4pW711/sFn/xMIsf+GDszytHQFVLTeaSPIv4NdRC7bKfLysVe7Z8/W2O0/PHvjs7V0f5xUz/AtPCxweMw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e190fc94-4bcb-4feb-70e0-08dd55688100 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5613.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2025 06:49:08.6905 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FxlUukjDnATcUuShJLhlrxXLNPv75JPBkEeuAka72S3Ht5OyMEhywDZd5DIg4CclBclXM/0COwQl2cT9BhA3vQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB8829 X-Proofpoint-ORIG-GUID: BcUFtUPJRsTBWxkT6jT2BSqQFzhOFwSs X-Proofpoint-GUID: BcUFtUPJRsTBWxkT6jT2BSqQFzhOFwSs X-Authority-Analysis: v=2.4 cv=U+ZoDfru c=1 sm=1 tr=0 ts=67bd67f0 cx=c_pps a=mXs27GP3B2XOU+bPH1EGlQ==:117 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=T2h4t0Lz3GQA:10 a=t7CeM3EgAAAA:8 a=JXAwwj8Sm7eIh-r5mEAA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-25_02,2025-02-24_02,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 malwarescore=0 lowpriorityscore=0 mlxscore=0 spamscore=0 impostorscore=0 mlxlogscore=999 clxscore=1015 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.21.0-2502100000 definitions=main-2502250043 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, 25 Feb 2025 06:49:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/17301 From: Chen Qi At the end of this function, self.overrides is cleared, which means we'll construct a new self.overrides after this call. And a new self.overrides will give out different expand_cache, so the old expand_cache should also be cleared to avoid any wrong value. Currently, there's a problem revealed by recent recipe specific virtual provider patch. If we enable multilib and set "OVERRIDES:prepend" in local.conf, things don't work. Here's the error message: ERROR: Nothing PROVIDES 'lib32-gcc-cross-x86_64' Below are reproduce steps: 1. Add in local.conf the following lines: MACHINE ?= "qemux86-64" require conf/multilib.conf MULTILIBS ?= "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 ?= "core2-32" OVERRIDES:prepend = "some-override:" (Note that using :append and :remove also reproduces the issue.) 2. bitbake -n lib32-sysstat (bitbake -n core-image-minimal also reproduces the issue) The expandWithRefs calls getVar, which fills expand_cache. So when setting OVERRIDES:prepend, this will fill the expand_cache. When overridevars are updated, if we don't clear expand_cache, we'll retrieve wrong values. Previously, things happened to work because there's a call to expand PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc, which in turn expands TARGET_VENDOR. Now what we expand is PREFERRED_PROVIDER_ virtual/cross-cc, so the problem is revealed. Signed-off-by: Chen Qi --- bitbake/lib/bb/data_smart.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index caef93ff4f..1c867653f3 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -635,6 +635,7 @@ class DataSmart(MutableMapping): nextnew.update(vardata.contains.keys()) new = nextnew self.overrides = None + self.expand_cache = {} def _setvar_update_overrides(self, var, **loginfo): # aka pay the cookie monster