From patchwork Fri Feb 9 17:32:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Ripple X-Patchwork-Id: 1897172 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=j5Jued8O; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::440; helo=mail-pf1-x440.google.com; envelope-from=swupdate+bncbaabbnodtgxamgqeqvuryha@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-pf1-x440.google.com (mail-pf1-x440.google.com [IPv6:2607:f8b0:4864:20::440]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TWgsk2lJYz23j0 for ; Sat, 10 Feb 2024 04:32:40 +1100 (AEDT) Received: by mail-pf1-x440.google.com with SMTP id d2e1a72fcca58-6e09685112esf588859b3a.0 for ; Fri, 09 Feb 2024 09:32:40 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1707499958; cv=pass; d=google.com; s=arc-20160816; b=ZWIuHvh4HisR8wzzqnc0/LIec+ZdKPuKKJJREXyLzZKZ9lUdj/i8e3XKEjY2Fl8ZCu 8diKsQ+20ClO8LIYaSQVfYcuDHKN6WL6fzNUjko0003deE0HCHnPOU02Jhw+8BsZsovA 7BROxq1A+onur75qoE5ekg6yOIiGcB5Gk5TivywHoMA7UWHFJ/xDu8+O3EHMSP7fY6/z raPubuONfb+3ztiPo1GiCNa+KNG5G43ZGzcOylgpedptqMFG7GTxg5zSpeHslcCZNt3E jPKh9aRID+OJ4nVYqSyONQPkX3fNydNHzdd3ESejdeQXQw4rvzAaSti6PaNT1qIe4Uh3 Zl0Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:msip_labels :content-language:accept-language:message-id:date:thread-index :thread-topic:subject:to:from:dkim-signature; bh=MERvNmFwLLfss19EXkyiuGYVC7VZPIGSrg+LvUmoN9k=; fh=262T970yE3bqnMshdE4s95nQ21s3ybbkQZYvqrj76C8=; b=a9mh2DM9MP0Qj5fTseBOHPYUhnm8cgiCKlooFU04tZI0pQs+XyVgUjpGxFdjIpfnLi W3sqVxROQ60+w3j4SvRT5PpYzg22/1zEjaYJ9E0/7RDjJU7wiAMgisbsAKOiYDe2E5fo zMraFJRHDKCbUCS9y6ukxGV8F6nzdYo3L4LXbF579jbLMcgJw71SOu/zkZNw8MKkurwX nCFMTWzBnk6ZBtScAXarA/0dhfvlGVnTfF77eRyeJsnndIR8bvVSrEdKd6nNxOsFsMLQ wJEu71aqJLTbPksiUA+2iEHtEJIbP3MQXIA+Epk89bCcNMtMPNImLfAXanX3BQw13iZD WdFw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@keysight.com header.s=ppfeb2020 header.b=d4Zd3t1Z; dkim=pass header.i=@keysight.com header.s=selector1 header.b="k/ntA2f7"; arc=pass (i=1 spf=pass spfdomain=keysight.com dkim=pass dkdomain=keysight.com dmarc=pass fromdomain=keysight.com); spf=pass (google.com: domain of john.ripple@keysight.com designates 205.220.173.93 as permitted sender) smtp.mailfrom=john.ripple@keysight.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=keysight.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1707499958; x=1708104758; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :msip_labels:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MERvNmFwLLfss19EXkyiuGYVC7VZPIGSrg+LvUmoN9k=; b=j5Jued8OTPbli8+FF/KmFZF4i0fCKsTDlx+RyCHupH2oJRpH70y4IW1CRqdLk0Ux/Y krgrRcfPwbU4WgriyMlpwa6av0PVk9EDBZKl8y/SCxb3i38+aqK+jI1VP3VdDkICSiNO 08ZtnjGJtNeOysTHZybRKG1kXh3pmAmNb4naY0wCjrUal0GGDExdBHYa7OCywIhcpbQU yuPriEuaYRFSl1ScS92lcwgMoOj8i6Ltep1VRW+t+BZjpWrJjNOfBPQflUmU9HG52lfQ NPcFORSTmu240aWDfPwsJ6QlAA95LCMQNC22xcVSD92/VbZoTfbHnMMeqewoUJkOTHC8 ZsLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707499958; x=1708104758; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :msip_labels:content-language:accept-language:message-id:date :thread-index:thread-topic:subject:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MERvNmFwLLfss19EXkyiuGYVC7VZPIGSrg+LvUmoN9k=; b=I1TBqxfADWXw8mpIUQy9VnLbLZUCLvQxIixUdJ53Djm53+8wRVjiSVxJOpf87wrABO HlJBFFf3n2Zv5bT1WAavqXzDKVV0aQpvkWcG7jKz9a0UXB9b27GZYtG8qLYXdbhAesZu O6VPGzJrTOXsPfkS6WoVCYRPXpD2TBnKYIVffKd18ogd4PRTZ+7pdTBMGJCpmVNGUA0K LzsbQhzJDjGUOuMQYnsqsJ4OZ5JJtZ3VBdB0JEZyKw6dAMfv8d1LhLIdRcT2DATBiaQi N7O2QGHjNVp2TY4SdsMGIbXGgDkuqUlbDJpI80jkGW8mB3gSLRrewE0e/sfmifxpztM8 2gpw== X-Gm-Message-State: AOJu0Yz9zud8Gp2OoXSs22TNgFw3RZ9xiVchXIHqT6Jf6p+bbuFHwRJm bXXVpT1qNOFTMkyz2E0sY50HJWq+kTloQc+GCEio/0BFlbSDnYEx X-Google-Smtp-Source: AGHT+IFDd1KvSHy7gVG25n2yQ56N+FklvLzMM5VSXZFGXfPnJP4J28R9GzPVcpuR50XR8g9wcJLODA== X-Received: by 2002:a05:6a21:168c:b0:19e:9b9c:fc2f with SMTP id np12-20020a056a21168c00b0019e9b9cfc2fmr2376012pzb.32.1707499958264; Fri, 09 Feb 2024 09:32:38 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6a00:4c16:b0:6e0:a33c:74ff with SMTP id ea22-20020a056a004c1600b006e0a33c74ffls25760pfb.2.-pod-prod-03-us; Fri, 09 Feb 2024 09:32:37 -0800 (PST) X-Received: by 2002:a05:6a21:680b:b0:19c:a0f0:b0ea with SMTP id wr11-20020a056a21680b00b0019ca0f0b0eamr2851792pzb.19.1707499956798; Fri, 09 Feb 2024 09:32:36 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707499956; cv=pass; d=google.com; s=arc-20160816; b=eSg3jGsN3IE/iTFPDeKHapBpV4zx4lCimWvvjOP6UP6aKrMMYZkLXyu8a7x1+6j4M3 lzFO2YcPN0zDPleEHzFohdSQfZmRRLX9nDlFr1dQivt/mvb3UuriHYJzxm1t7P+uUHZ5 bANsEAeGclSzZPiwoUj51o4vkHaf1TdBlwaL5JstaHgvKflg8yltvuOpiKQgRknELkcC 4dMXf3D3E+4yvRC7gk3itnFTuKMDDjk+1FyuaEZod5UTJh8CFExeM5M5yjf+1Lznt5ZW TFLiy1L1+w4kjzZ8jCWlNWT7Ezukf3mvHEaEXjwePmpljSi3z7IGtoY8+lN6MgV7lUBJ Am0w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:msip_labels:content-language:accept-language :message-id:date:thread-index:thread-topic:subject:to:from :dkim-signature:dkim-signature; bh=87ht5nzV4adeh+qNtOo+wZBd8WcczhPgu5TDLtAsuJw=; fh=262T970yE3bqnMshdE4s95nQ21s3ybbkQZYvqrj76C8=; b=iTjXaa41qb+tp1jDRBTRxR2iatgAOmZ4C7+lc78vJqnnezcM8/zUxnW68SiMuo+seB 55HLEBHn7ye0DU5I7D7D13JueMY2ZeO44cHe7j1+fSZjisypoOUf35r5qfK+2tbUlETY 11+cs5g/j2UQM3dP8iJyXzO+zuSy40R6QHXLGoUjtMmMoIMi1OOQumQk+ShvnHa3lmCM 4N9iEbvjS6S6JErQ5yxNj0kMyqPXq6uy8uFNYJhEQqRdT1mgn3ZmxDiL9GFT5sx4KNs2 96LEawiXZ6vHSckXoJ2xthPETlSQYspvV/Z9VH5D9MlbaW5EU2jq1jko2ALeeLZVRy9Z SPDA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@keysight.com header.s=ppfeb2020 header.b=d4Zd3t1Z; dkim=pass header.i=@keysight.com header.s=selector1 header.b="k/ntA2f7"; arc=pass (i=1 spf=pass spfdomain=keysight.com dkim=pass dkdomain=keysight.com dmarc=pass fromdomain=keysight.com); spf=pass (google.com: domain of john.ripple@keysight.com designates 205.220.173.93 as permitted sender) smtp.mailfrom=john.ripple@keysight.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=keysight.com Received: from mx0b-003cac01.pphosted.com (mx0b-003cac01.pphosted.com. [205.220.173.93]) by gmr-mx.google.com with ESMTPS id p6-20020a625b06000000b006e06c8a8c7esi151896pfb.1.2024.02.09.09.32.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2024 09:32:36 -0800 (PST) Received-SPF: pass (google.com: domain of john.ripple@keysight.com designates 205.220.173.93 as permitted sender) client-ip=205.220.173.93; Received: from pps.filterd (m0187216.ppops.net [127.0.0.1]) by mx0b-003cac01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 419GE9K8025756 for ; Fri, 9 Feb 2024 09:32:35 -0800 Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2041.outbound.protection.outlook.com [104.47.66.41]) by mx0b-003cac01.pphosted.com (PPS) with ESMTPS id 3w45qw6ekg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 09 Feb 2024 09:32:35 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lQ1DLLVxoGpUkQ5StHZN66sXbjqF5077Qgm1lZD1wDmRRlmr/4mdJPooX99cWXPBpEJ7y/y4d3aUG6KQxTklMlqs8Jmzo0RbGlqBRmQ1VpXu/nPmFP+wiQuhIuefXRFMhpISsOYwBSRHpt7lVeaipNswFQmSlFhDwjU5Au9cqJufP7nrVBzCJq2aCVdXwKHzS+8pnWfzGf3UAh5t/DW+jmCaPh7LBiZElZjKVamdGfBNUS2bX3pqaydFSeNabOWmNeZp5VuPI/bqJISyaDFXmsCP5yDw6+vqVb8sKuVwo+RABTdSPusQyjar6iVXxnBEgLfuuZmSFDNwVzfi/p0JfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=87ht5nzV4adeh+qNtOo+wZBd8WcczhPgu5TDLtAsuJw=; b=XNetk4qpqcWO6JG43Ebn7Oi2m+nCrH0YLCt6m8KEv/HAQwfb/YMczXV/lP6FRBLIGUAOkB9ZRPzxMV3BkbR6yMWrW5b9wrAoOL8BhAh7Lam3URlyFwSvjVYJProhFVbbL2kunG5yeGVwvHoCx8X05chZelzVnc/oqR8llu6JJoyaFcICOfOo1EEsktx47jiX7Qm4Bg5HivPsPoMEai8KCxo40yPRpj98ZZDvYbY67jGhU9XI5CskwaQYg09jqrqxMHTfIi9Vi7MrdcmgYg4fKOhArEmfIEvKE9s7O05fBVv0dTiAo2UnAanX0gufp4PyA8eKnBYDDcPaUw91HrDdww== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=keysight.com; dmarc=pass action=none header.from=keysight.com; dkim=pass header.d=keysight.com; arc=none Received: from PH7PR17MB6130.namprd17.prod.outlook.com (2603:10b6:510:1f5::17) by PH0PR17MB4906.namprd17.prod.outlook.com (2603:10b6:510:e5::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.27; Fri, 9 Feb 2024 17:32:33 +0000 Received: from PH7PR17MB6130.namprd17.prod.outlook.com ([fe80::1935:a83c:b774:c0d6]) by PH7PR17MB6130.namprd17.prod.outlook.com ([fe80::1935:a83c:b774:c0d6%7]) with mapi id 15.20.7270.025; Fri, 9 Feb 2024 17:32:33 +0000 X-Patchwork-Original-From: "'John Ripple' via swupdate" From: John Ripple To: "swupdate@googlegroups.com" Subject: [swupdate] [meta-swupdate][PATCH] swupdate-common.bbclass: Update regex for variable matching Thread-Topic: [meta-swupdate][PATCH] swupdate-common.bbclass: Update regex for variable matching Thread-Index: AQHaW32ykmKQuWUDAk6LKxNW/RDqlA== Date: Fri, 9 Feb 2024 17:32:33 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH7PR17MB6130:EE_|PH0PR17MB4906:EE_ x-ms-office365-filtering-correlation-id: 2e6bf2df-dbaa-4117-6ad5-08dc2995195f x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UtHHGVrlXKpE3aFnZWAkN9XjIe2jlDe8nKoZzpSyW4OhfghO09gseCkeBAf2whz137IyKeEepWwa/jYwIbKF7oUZwTegKGElFdHy0bf9BBj8wqmFWjtQvlnN8UnQoHIuTAFmwAL6aNtNpveE0hnSSs95gaXk1iq+vmoJ0a+1ekfP2wPvHiAvvTUYd1JGhX/3EdBMHJOUPVgOXlG4UlHnbh7woEa/AwcGAH5GKkKqzN7x5VSmKdxCOcBW+SHW5e7mc3f20E9QjA3YKuL8LnxfOL+bpDG2jVHnHPJRJeQ76bHtJbJrkBJkDJt8Xsi4kkHdxbul6c6vpgH4QYq6j9FEfNrHPK5jlQcCrd1Vi6It5VModTW90Pv2IP87sU4H9/hNgi/oh+0HDVmQ1akuMFsT7zfYbsjAlukcRoBat01uOIX50RnoIusHhND7jVVjX+8KbuPivjoCHiS9GR6TUG0RbCP/B8zMyTv33S2e8gPbkfUUX0HtXKT4zR8InXLgwIlM8Osn52sfZibVVg+BJCojN8j0xUEyLpBA2UG35Dj16FkySfd5tnZHPqdBUGVpw2TmeVBZCFmGUtq6i2UthG6X+olkUozFzzhGfXXRmHdUiBOT2+JN/tQdmV1PwEyP+K+K x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR17MB6130.namprd17.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(366004)(346002)(396003)(136003)(230922051799003)(451199024)(1800799012)(64100799003)(186009)(122000001)(33656002)(38100700002)(38070700009)(55016003)(41300700001)(19627405001)(9686003)(2906002)(6916009)(71200400001)(91956017)(66446008)(478600001)(76116006)(316002)(66476007)(66946007)(7696005)(66556008)(64756008)(6506007)(83380400001)(86362001)(5660300002)(8676002)(8936002)(52536014)(44832011);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?uY3dvRMtqQcS5YcF3QnXiEA?= =?iso-8859-1?q?a+tV99T4YL4pRVCCgieNGrP4eFcE/RgEbRNX0cTP20GzZmkT1KwwgbNUSIR+?= =?iso-8859-1?q?01nt9RRgAzoGMSyD/o1XHvK8y9qXnAe1M29oiXtTTduyOOJ7VrCIIywkQoM8?= =?iso-8859-1?q?LdPOWSHkg1L4gbN3wUxsv0ZFVEQJxofsO5wdDE+uW+YI0+gW7WMw5i3RUa9B?= =?iso-8859-1?q?6fegK1H7mRoCvzWaOJ8qPIocJY0NZGfiIQrSi8gyyjkh3JlXbPP5axlunT1O?= =?iso-8859-1?q?0j6WAdwYHtZ3I4pT0+9yHXiMYOW9T37ix5CpevJ+yer82BjcMuU4I58//OhZ?= =?iso-8859-1?q?lMz21KnDR0gbj+cbmPGN1DLbWKxJY0KdwLUi+fBml2gnpQU98aV+MsfqVkqJ?= =?iso-8859-1?q?OhvFkdr+6uEixo8ifyYZYxzc3x5JHJ7OjF60nADwpYJSdOwqQlCpeMisXjo3?= =?iso-8859-1?q?04q49UTXgAe3W4/7qbdAVUIvE6bH6Lr9Tu/psKrdNBUJ534vB4+8KoyGXZqo?= =?iso-8859-1?q?agFXrMrHYLMoxIVzo1Sr/OVLMXTEzA5Yne9aa5c4cIehKiWdU3hpnnxxrhvY?= =?iso-8859-1?q?E1YBQOGxBQqGuMA26S9aRv/diEEgX7+7Kkz5rdG6f3SIyMrNZtbhQSWTMgAs?= =?iso-8859-1?q?s2KVb81YcBFMvms9w29CLcDMncffZ31txqVdPzRu5Dt6TILFf+Cwc44j0Kyr?= =?iso-8859-1?q?oFfPYILLlbp4tveKUP2ez9CyNav+IEwf+P7+4pgGB4aowx5QoJ8r1N7ps+Ah?= =?iso-8859-1?q?+YpYF1J1aamBQGIoCP6Kl66uoH1J3hWsIINqvG+YsY1s0N9mM6nJIEVmx6nc?= =?iso-8859-1?q?3Gxy/mWfjuz91oB51Sk/+/FhRIxhxMFxz/80qq25cmivZbA2KV1D+1i80JcU?= =?iso-8859-1?q?iRFjfKltO2CiheUKatudQ3LIMv2qcPYz+RA1FBaagAOQUloSDi/JrRBgE9nA?= =?iso-8859-1?q?BjDpYi7vz4xppfMbBVGZUl7WTubba/f2xPxJvPmXtiV21P7X6SZ9mI5nH9b9?= =?iso-8859-1?q?vkF/727et31oOik3aJw0mHHTSAkokJeh4bjvsseM8U4PlOGhhNZvWocASw6h?= =?iso-8859-1?q?MnVR0/XGviNWAx7mENOmBW1R6cS2r93ZX3EhxaAWeqO4NCkDpED1rxrvYVC5?= =?iso-8859-1?q?q+cKJGWKo0hKVREgWbqM5vJ1NPyJyHT+FzLeIVhi3PQUx8/lkVG9Wq/CvuTx?= =?iso-8859-1?q?e7hcVtTtf8yQPW6zz8jahsvgJwsbW1QtnOFbZ1AXzgw5/G04/U8uAHZfgBj4?= =?iso-8859-1?q?3VzsCsLv+7fm4JLALKRcrkcOFk6jvfaguzBopB6oQji4Q39QGuO9LX3HeinK?= =?iso-8859-1?q?QZexqYax/KBBh/8YZ7EYmiKaOJN4Sc9gezQcYfqsvu+EyBf0MF2A21TcmMsp?= =?iso-8859-1?q?HKfPBsTN9jS9wp+q5KUSaVHrE/PUK3W0TlTFzBB3wVL6PxvOugobCdJxh1M/?= =?iso-8859-1?q?wZuozH41VdCxHkzsdpmwu6PfjjnV+46hPXMm48po2k8UZAoz/DNr7UamPwHF?= =?iso-8859-1?q?vkD4VCfTN7AkRPpjXQLaS6wB3EoEKGkvGWL2K++xlEP8B4VVbsDigueUmqbH?= =?iso-8859-1?q?iLYLtDRgLywpVOKTCr2xowTPBcTOoqzgMSp/allXgfBUXB+6TipMEW/tbTnT?= =?iso-8859-1?q?vEjaRvB/RzbPqbu5hoha8PPMSMXxLd19oLkutsCX6ovNe2J4K736LtNPkndw?= =?iso-8859-1?q?laRvAcIk8Fnr/xYCb6ziD?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: +KBP4y+QIWCsfb/vU+dEKz849oVNveVaufsxskWvus4MwoOe0+thHGBaxdjGATO14I2r41t4zi10rQvq5rs2CBJepNnlCUAvool2tDljk/HsnNGhdIazPurZEpKeHBkSbTgWE3VAWw/oWwPeWfy2oiOVSnB5ExHc1Qmka0FKSxdG3FimxpAhmRl4LvIq6lEz+vPxENoLi74ELKfuOMK5Jpm+ZQ2vWc/w4Tx0fL9Gu1MyaQ/3Yh/geJof8VUABHIx+XaYkDJbjcuUOgtdGpea/yBgi7z98HYa4q6eivMBQxuufAY+dFbzIsyBkc3I2usrbmkQ9jCNvUoBSdve0mzfm+DEsWMpKD3MiEY4CLk9U8jAuI+vtySVj1RT6k5rtQOUVy1AHdpmPLKB+p90AZSAmBanYhPFi0pmk3qeqNt1SKxYYLXDe/piCDSD5uIOWmbtaulEdALvBkPQy3qqhipy9gLS8zn2TjrNRUHPW6xAQC7oUeEFyTX84efYqWNbBH/BhL5HaSij1eRcPf+HycdENIcO5+4597HYML74wwN6FBOGA3yXwTxbFFsxBfIiDzfaIWpP2XwiyOWj3SPYa1K+wY2z+o33cchAeHXZGbHap5sKsRKVab/ONJakA5i8kIxk X-OriginatorOrg: keysight.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR17MB6130.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e6bf2df-dbaa-4117-6ad5-08dc2995195f X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Feb 2024 17:32:33.1705 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 63545f27-3232-4d74-a44d-cdd457063402 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8jY+tbhH6Md1liMQwFDrGoFZnWr9z0qJ/9vUn3Dn/sCmyud2uBiq+tdvr6pjtcf7j1BP/kQ4s8lBqIgxON93Dq0W5zIKeI4CXKRy8ktQrqc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR17MB4906 X-Proofpoint-ORIG-GUID: qbWu5JogynzW9CN0-v0Y6ZOKBKGEydAr X-Proofpoint-GUID: qbWu5JogynzW9CN0-v0Y6ZOKBKGEydAr X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-09_14,2024-02-08_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 phishscore=0 bulkscore=0 adultscore=0 mlxlogscore=737 spamscore=0 mlxscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402090126 X-Original-Sender: john.ripple@keysight.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@keysight.com header.s=ppfeb2020 header.b=d4Zd3t1Z; dkim=pass header.i=@keysight.com header.s=selector1 header.b="k/ntA2f7"; arc=pass (i=1 spf=pass spfdomain=keysight.com dkim=pass dkdomain=keysight.com dmarc=pass fromdomain=keysight.com); spf=pass (google.com: domain of john.ripple@keysight.com designates 205.220.173.93 as permitted sender) smtp.mailfrom=john.ripple@keysight.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=keysight.com X-Original-From: John Ripple Reply-To: John Ripple Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: John Ripple + Changed the regex conditions so @@ symbols can be at the start or end of lines without any other characters around them. This allows bitbake variables to be replaced at the start or end of a line, not just in the middle. Signed-off-by: John Ripple --- classes/swupdate-common.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.34.1 diff --git a/classes/swupdate-common.bbclass b/classes/swupdate-common.bbclass index 9074f7f..6305ab2 100644 --- a/classes/swupdate-common.bbclass +++ b/classes/swupdate-common.bbclass @@ -69,7 +69,7 @@ def swupdate_write_sha256(s): with open(os.path.join(s, "sw-description"), 'r') as f: for line in f: shastr = r"sha256.+=.+@(.+\")" - m = re.match(r"^(?P.+)(sha256|version).+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) + m = re.match(r"^(?P.*)(sha256|version).+[=:].*(?P[\'\"])@(?P.*)(?P=quote)", line) if m: filename = m.group('filename') bb.warn("Syntax for sha256 changed, please use $swupdate_get_sha256(%s)" % filename) @@ -85,7 +85,7 @@ def swupdate_write_sha256(s): def swupdate_exec_functions(d, s, write_lines): import re for index, line in enumerate(write_lines): - m = re.match(r"^(?P.+)\$(?P\w+)\((?P.+)\)(?P.+)$", line) + m = re.match(r"^(?P.*)\$(?P\w+)\((?P.+)\)(?P.*)$", line) if m: fun = m.group('bitbake_function_name') + "(d, \"" + s + "\", \"" + m.group('parms') + "\")" ret = eval(fun) @@ -102,7 +102,7 @@ def swupdate_expand_bitbake_variables(d, s): for line in f: found = False while True: - m = re.match(r"^(?P.+)@@(?P\w+)@@(?P.+)$", line) + m = re.match(r"^(?P.*)@@(?P\w+)@@(?P.*)$", line) if m: bitbake_variable_value = d.getVar(m.group('bitbake_variable_name'), True) if bitbake_variable_value is None: @@ -112,7 +112,7 @@ def swupdate_expand_bitbake_variables(d, s): found = True continue else: - m = re.match(r"^(?P.+)@@(?P.+)\[(?P.+)\]@@(?P.+)$", line) + m = re.match(r"^(?P.*)@@(?P.+)\[(?P.+)\]@@(?P.*)$", line) if m: bitbake_variable_value = (d.getVarFlag(m.group('bitbake_variable_name'), m.group('flag_var_name'), True) or "") if bitbake_variable_value is None: @@ -144,7 +144,7 @@ def swupdate_find_bitbake_variables(d): for line in f: found = False while True: - m = re.match(r"^(?P.+)@@(?P\w+)@@(?P.+)$", line) + m = re.match(r"^(?P.*)@@(?P\w+)@@(?P.*)$", line) if m: bitbake_variable_value = m.group('bitbake_variable_name') vardeps.append(bitbake_variable_value) @@ -152,7 +152,7 @@ def swupdate_find_bitbake_variables(d): found = True continue else: - m = re.match(r"^(?P.+)@@(?P.+)\[(?P.+)\]@@(?P.+)$", line) + m = re.match(r"^(?P.*)@@(?P.+)\[(?P.+)\]@@(?P.*)$", line) if m: bitbake_variable_value = m.group('bitbake_variable_name') vardeps.append(bitbake_variable_value)