From patchwork Sat Mar 30 14:25:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3458 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Sat, 30 Mar 2024 15:25:49 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f192.google.com (mail-lj1-f192.google.com [209.85.208.192]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42UEPmCD004615 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 30 Mar 2024 15:25:48 +0100 Received: by mail-lj1-f192.google.com with SMTP id 38308e7fff4ca-2d486c08c6esf22920061fa.0 for ; Sat, 30 Mar 2024 07:25:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711808743; cv=pass; d=google.com; s=arc-20160816; b=NGp1jxGuIhX5wRxc4Xgep+tCEwsbBbqb3PpvyvGnS0cI3OwvNWNbIb+x4xgCosoyqe GzM/ekpojElAe7B1/AGdcNWaN4DfSUH7Uey4YLiroLNRaHMBSP4fik9fId734V5z1xXp AVzswYfe4noYAl665nsQYtmDZgVTbA4h2adCJ9LOIdKh6ekmKR60a0JOPkAdFF7vhDVK aBkowa0E9cq8gLWw4GKI8GPFKcg+FzIk5ZtQfOsdhM9sPe+mNxBTbqg1fYy6GI1TIdW8 cYo0vxiER2DlzGaa9euZmYXKElXr7LdY3vf9lMEOw0bIVbDKPv3aDkdTAqfRNiEQACil qgcQ== ARC-Message-Signature: i=2; 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:ui-outboundreport :autocrypt:cc:content-language:subject:to:from:user-agent :mime-version:date:message-id:dkim-signature; bh=yadTHBW+UATNlOrfpE4odrtkc0kVEpFlCQ4FwwTpmP8=; fh=lcYTqNoP1XI0pFJTM8vJw3DMdK6g+vhwR1SatpFV7mk=; b=sYI7FTyS+u8lQ3HLydqYrsjJO0gR6XG4lCCxrrABwr6SSPmc0rliUGKqWK0SZAn+G5 SuwjpVZB4upAHoFatxXKEz0sSz55L8/3IzjMq8/gbeZXEmqEhbTdQaJ5rK2McEBr3SaK i4DPdF7GJNkNaihHVWdUtVh5I14UHmvFuNtdqldEvzkTWq+784EfpnHRZuvzQaoN0Yvm VHrGm8Eemok6cyyiumL2XiS9Wc+sqn5EsuPMCIzleSU0FuNRZtysFgSZmzCdxiuDIUDC 6pk28vloxgUS9WM3rdH9d3ErGUr61lZsg5AQPW9d6XV8bJeo/jTJULrJIv9vQhgQl2l+ CP3Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=jc1ILFJ+; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.3 as permitted sender) smtp.mailfrom=jan.kiszka@web.de; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1711808743; x=1712413543; darn=isar-build.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 :ui-outboundreport:autocrypt:cc:content-language:subject:to:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=yadTHBW+UATNlOrfpE4odrtkc0kVEpFlCQ4FwwTpmP8=; b=XKwJKge+Ep2Pok6sbmJ0y9ZXkvZdOSTM+69k6edINBii5autXPHw0vgmmiw7NSWqMn 46VBQl447UGsSI8YSjf3+46cVFbEJ/kO1SPtc0R89K0vqdXWQxmJajocmyIfs5p2zpTV P+2AtVARG5a4yAJqInE4jroHb+eUC0pc+VvbaWw4bTGYBxfzV39R1XUbb1trphZNNSC5 6BVomNAiqSiARMRte6Vk40Pf1LaPpdPMccqO9KOelYMLm0tBmSvziIDdO4ZKIMdvfIA3 3i9Bvf1PntwQy9okYBfL7ubFVc+JJWqgplMkG6kwYkc2bbm3GUFjB8JBzlYoqOXGLpJl a4ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711808743; x=1712413543; 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 :ui-outboundreport:autocrypt:cc:content-language:subject:to:from :user-agent:mime-version:date:message-id:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yadTHBW+UATNlOrfpE4odrtkc0kVEpFlCQ4FwwTpmP8=; b=As9s+DEvXSAVeQix98Ozv5x+lT7UIjD9vifM5nkeSldAnW/eEAy86lsjFFSIsvtKuY ut/YT4tg9OOf8bdOHradY6SSvdhrpkztMB7Q9DucWK0ETXNXV0Z9i8qPfMI3UBIkvAPr spdIK6fAPi7Bj0FaA4D3P22TBCtr+toqGVRJ/MwcdpAvRRS0rBa0FbBu5uAGJ0IPPeAy u1NvFYIGNjygG94dFCes2ZFn8g+6vJx8Qd0/yytQn9D1QpJe4CPzQy1nuVrmp6PHsVrn ve5/1mVO6q4GW/3uLjjXPwf5Xbru5gs/mFkhM5f7GpXxuRcgYb2cfP7KUit7phai2SaT Z/sA== X-Forwarded-Encrypted: i=2; AJvYcCVrABx+zWXIwb914P1AUREVYnlZdPq4M9Wi+Nkj/ZePPATkyhmoG3+EGTXrWLQeFJniuGSR+l6Z4d0Z0884f4iJ0Gd84ok= X-Gm-Message-State: AOJu0YyoxKArIPWPil6NTuYtjAUVnSbCRjAnuxFass0AfHEfjRA86qc0 fx7bm8oLqddo0f1Tahkr6ltoOo6REbsADIw+qKO2coCLaOpZeWrR X-Google-Smtp-Source: AGHT+IEkxftv7N0D68nkb09LzfRB49m5d8OJGWd9cnh8BrEtZTxD2XxAdPraotpcmtxRydV3CnL3rg== X-Received: by 2002:a2e:a0d5:0:b0:2d5:9bd4:44a0 with SMTP id f21-20020a2ea0d5000000b002d59bd444a0mr2495452ljm.6.1711808741525; Sat, 30 Mar 2024 07:25:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:884e:0:b0:2d3:3a2f:99a0 with SMTP id z14-20020a2e884e000000b002d33a2f99a0ls489863ljj.0.-pod-prod-09-eu; Sat, 30 Mar 2024 07:25:39 -0700 (PDT) X-Received: by 2002:a19:e01e:0:b0:515:cc50:9376 with SMTP id x30-20020a19e01e000000b00515cc509376mr3442279lfg.22.1711808738915; Sat, 30 Mar 2024 07:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711808738; cv=none; d=google.com; s=arc-20160816; b=i0RxI10mSL6aDLV1i1/8uj0N2ifjj/RUDoKlU3orHit4nzQqah3VlystqB7ijRxNzR 1e2GCSd0igpPrWCntzDFyejYmVZAwtaLgLy1hJEU/Zr7SjGBJsjl5q0tb4vxsxk/YStw G7V3PUCXDXvmbmy32+e+UvH7xXgAH843hUUlskyfHTxpO/MJgDA5uq0XY7WGKRn0dUrb w1rtqe5YIZ0tg9o1dS9bfag9USukfIKV6DFqOmnd17L3QJqtyLh4+1aimvyFL1KH1gsx FP7/PqCNvMxCj8ziyyRjCTD9uEPoirGMZNPJVfjJawE+1His2UjzNZc3DbWG1FnUtyw/ zcUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:autocrypt:cc :content-language:subject:to:from:user-agent:mime-version:date :message-id:dkim-signature; bh=abVdKjbdX0f5anyeMm8UdVAuO7+nEy7q6FvDVZFMkyo=; fh=JjW52eJG1tdf+kf26Zok2IvI/Mm5P16SWlWcduuhXUk=; b=WHRkMQtgS+bjP0MBEYiKF/E+xohgZ7JE9K/BWGLbEt+S8Agx5Q9eZ9R6ssyMVQq8j6 r+eDGe+WHNp8mxMQKp/Ukl78NWyLhoFsl2Gl/IXoitiD1n5aNFOtatEtt2jB/kUZR+fM rZEQgcI2OqRn9kTKV3UWe0c6uvJj0KD6ZPSGjkDykUcKo3IKv+bmsnx039F4oIrxcRGB aikI5sWyM/bBfxQckkq9YisxV4n5RdmlfNozUy9LnQlWjoCU0ODtT0WTY5iAqHByr3XF 0eTBBIpk1I2hSmJH4LO7lppX136caWfybkT+yO8IqMiVdPiS/E6oyruiwlC9Ze/2X7UJ ydDg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=jc1ILFJ+; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.3 as permitted sender) smtp.mailfrom=jan.kiszka@web.de; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de Received: from mout.web.de (mout.web.de. [212.227.15.3]) by gmr-mx.google.com with ESMTPS id i6-20020a0565123e0600b00515d3383bfesi77054lfv.0.2024.03.30.07.25.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Mar 2024 07:25:38 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.3 as permitted sender) client-ip=212.227.15.3; X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.31] ([88.70.124.107]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MCoku-1rzL4j4AGu-008ohw; Sat, 30 Mar 2024 15:25:38 +0100 Message-ID: <426c29dc-ab8d-45e8-83e8-70ddcb91efce@web.de> Date: Sat, 30 Mar 2024 15:25:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Subject: [PATCH] multiarch: Fix PN-to-BPN massaging Content-Language: en-US Cc: Anton Mikanovich , "Schmidt, Adriaan" Autocrypt: addr=jan.kiszka@web.de; keydata= xsDhBEq0i8QRBAD2wOxlC9m/8t/vqjm1U9yQCT6OJ2Wbv/qys9DYM0CvcOTDMWQwmV1/VsZj KR5YgB5NPt+To7X6x5cjz15AGnx5Fb8Wnrq8EF9ZfHMwb7YMx1LdPYPDnXr37wE3XupFmkHB Mes4htyX7Dz8LvKDLnli4IsAmWG+kV1JI6LWKXLpSwCg8JRq4SWoB4VCQxbH3GjntgvwNc8D /2q5Dj0urJ7s7sdXhrH0hcFkpSFRmU5Yd6MCwcbFHm2paL5gqVjNNUUwDBKAL9eZaQVIHKwC 44BvNGO2gcQ26R3AuCHUQ+pZHg34tok1JCNZ6IEZccb+33Qq0qbcDMJJiDYp7ppp6ozifvc4 YaqJECX48IydxfE9+41oV7T5vNAzA/QL/UMJyTnu5jiOXcyn5iFQw535lXkwKsqeXzCowLho HICZ2jITJPdTT/+9pGWwMQqST/SS35Tx4EnS3z2BWsNMCLuXCPkxF1elaMJqMfMJxFD8rAgS 9GK6zP6fJlsA1wq/UvKSL8v4QPOnTNCVOsyqJVasGV0ZPcDfcj+ClNO4zR5KYW4gS2lzemth IDxqYW4ua2lzemthQHdlYi5kZT7CYAQTEQIAIAUCSrSLxAIbIwYLCQgHAwIEFQIIAwQWAgMB Ah4BAheAAAoJEIrUrG965ecUhIMAnR6DDCW5cx+cVdYhydbhQXqeief6AJ4p+z4+nrmZLdfU 7V6nKqKeHeTtj87BTQRKtIvEEAgA2/PlX6oyi7dToH0CJCHq0eKmZaa7CmGaVnxyeepKvIfi M8n8Td76AbG64fjREMwgSpb4F/UytF3z/03tj4e49W/zKjbBRB2/wmFRlZBC9crg22Q+bgvM OsxnC6uHXaWN8fL+jVei/5OoHOoFqaMsX8EvploitlI/BPj+VgW26jksf3YZyk1hnclsZ/IY hXzgRmVJo4RiTW/YLQAkwndwc+fKPa/IYLEDW1Jc4kNLoK0P90b45zju0hpl0C00pVORTOtz FK9G5Ha7qOAWJfAVJORHKAkkvwftf3hkpPdLyvZUWRHXvUexmA61fLvDBAFhRxYGD8t5gz88 SF5Tzq+0ywADBQf/YSkaYrEslPWiCA2wU6EW0yaqBQAobFsOMvsufJ6o2ntq5Ncq37VI3KCT 67eHPE9x+zPcENoZWsRrC9S9PCf1LOsi7ybZsR13AJqDFlRzJZ4klh9QwgwFZxUBzOdIvttw zG1QkzHx06RKZluFYpPF3DRduSMukdIJ2wmWCU+ohB+mYefe65JGjYQfHVs8mgYVFOPxbRea 9VJACCMuspoZWpj43UdR1lLLyIUFYz+jqcPW7Hd/GTIw4N67pYl0dwPDmFd4ohJ5g4Zpq61t oNysBGEuEm5GCcn0VmGtQpSYnR5cVm5b2yPz4bIuFOSuZUo/l7vitdY0iy0/wvKbBC+NK8JJ BBgRAgAJBQJKtIvEAhsMAAoJEIrUrG965ecULvAAoKGvxs5T3IhyQT8I8sMsyAvCE4wHAJ46 S16yab+OxNkvOeoOEX0EnHVHaA== X-Provags-ID: V03:K1:fKS29UUqkwrfVAAFpbY8Z9keJfdEFFJo7kDq2t1YDe92w6wV7yK /Tpn96Ig60WeP3NrP6kfe0OnpSxynmLSYA7OVzIeL4rISxDUgWKmGMTCUahcCt55JBGZmay Zn6NkDAgoA4Ms6aiKolXisQ0i+bkzdI9FttxyDvHG5XLoJDGH+hwe9udXtfwoxArocC8iGU jHH9V+2CaEDFx79LyVZ9g== UI-OutboundReport: notjunk:1;M01:P0:vx3sVEsmQ2c=;5LZkOKMiccL3DIib5slUJfCBDzc ujS5RZGNrP1lqcfweeeSxd8DxLrEH+ID/jCi+11wl6fgo6yLx21KNOSgtUYswqS07SElbonEH xPrjuykUFnkYbvHDQPIY4YhpdZpXApvbDtOOSVJw0031g7gzY7EA283VHKLPwGjbv3yDMfBb/ gvPopQzbl0uxDflAhS4IYREfHrIK/x2qESI1KFZyNwGa7Kmft6oBOE4XPJX41E4Mt7k6F4TUe zXx1Ht9DwRcKScvOhyziqExxUTq8cKzUpLKBOhfn/GHzyAihXCghlX+DH0/+rBvfeXV4l9Q9M edNkr5KM37wAFnQR17FzA1miMHEvwGsNxyv/RxC7eSW28VGJkFYcIOpZhaVADpnIB7kFCFXpR n1YlZ8R5Q6MBcILaJ+PkjvbHWaf1yTC+4V9BuD/I4VKEFZLAbNFDECSEzFKL/Dj/iIPUqciW5 dKF5v9tydAhft+14LoAcPcKHNFOcQChq/wZdzT2rOM+kSUjWDLUBpchq/6ZP6+sDWOQWHxXC8 5kCKypdTIgIdnQSdPs4JospQMx8w6jxbgGgzP6hBpiD5pLNz10qKBewDofFsLJ/8+IFIrgOKC ZebkxouILdSdYJQtKs//vRftmRAIX+eF4SX1xJ+rblPBwz4BkNqRPulGEkta2GGYZIeJ8CEs6 lA6DN353edGB3SXfgdvm9gPOmFIiOI7nA3T6fzAWidnJvOiL1JZdvB15m1aoRsUkHYkOrJ9k2 nTwKBPl4h7148/VdPB0tbAfDR3w8AZe2LfbCGBEt3rUqoRE/YvONKCxYfGZe+/vNnQhH6/0cX bd8TH390zZPxfOfubcrGAp4qaecIVfrzruqjG2XasxjVY= X-Original-Sender: jan.kiszka@web.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=jc1ILFJ+; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.3 as permitted sender) smtp.mailfrom=jan.kiszka@web.de; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=web.de X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka SRC_URI and FILESPATH are differently built, thus can't be handled the same way when trying to translate PN to BPN. While entries in the former are space-separated, they are colon-separated in the latter. Furthermore, the existing logic didn't properly split the entries, rather processed the complete string. That was surely not desired as well. Account for all by handling the variables separately and by splitting them first. This fixes warnings like WARNING: /build/../repo/meta-isar/recipes-core/images/isar-image-installer.bb: Unable to get checksum for isar-image-installer-native SRC_URI entry debian-configscript.sh: file could not be found Signed-off-by: Jan Kiszka --- meta/classes/multiarch.bbclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -- 2.35.3 diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass index 5783b0bf..3123045e 100644 --- a/meta/classes/multiarch.bbclass +++ b/meta/classes/multiarch.bbclass @@ -46,12 +46,16 @@ python multiarch_virtclass_handler() { # parse time, and parsing always happens for all build variants. So in those # few variables, we automatically replace ${PN} with ${BPN}. def fixup_pn_in_vars(d): - vars = 'SRC_URI FILESPATH'.split() - for var in vars: - v = d.getVar(var, expand=False) - if v is not None and '${PN}' in v: - d.setVar(var + ':remove', v) - d.appendVar(var, ' ' + v.replace('${PN}', '${BPN}')) + v = d.getVar('SRC_URI', expand=False) or '' + for uri in v.split(':'): + if '${PN}' in uri: + d.setVar('SRC_URI' + ':remove', uri) + d.appendVar('SRC_URI', ' ' + uri.replace('${PN}', '${BPN}')) + + v = d.getVar('FILESPATH', expand=False) or '' + for path in v.split(':'): + if '${PN}' in path: + d.appendVar('FILESPATH', ':' + path.replace('${PN}', '${BPN}')) # When building compat/native, the corresponding suffix needs to be # propagated to all bitbake dependency definitions.