From patchwork Mon Apr 1 13:17:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3459 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 01 Apr 2024 15:17:15 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 431DHFph013360 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 1 Apr 2024 15:17:15 +0200 Received: by mail-wm1-f55.google.com with SMTP id 5b1f17b1804b1-4147f17da12sf19226695e9.0 for ; Mon, 01 Apr 2024 06:17:15 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711977429; cv=pass; d=google.com; s=arc-20160816; b=iQXtkIR2ngfNlP9MDGKR57roavS7X28mLASxntw0gSL0y0CazyLvFYa6CkyOZ2MCyp s44dSgphnGlvkLti2goNan/qcISswWUx/fjwLMcc16X6O773IAUKtgH1H6nakUrLMtfs 6YyKYZ2Uuq+TZf3U5yLRZIhudzp3PYmSv8JenN4ph+JtRVm2hoib5MXSCdvsf2aJNQoa GzPt8hKG89CHHWYqEfcYYB3QXgMpipj30/+TNI8WoIvZD8lksPKsOkJBkOaidheV8D/3 vKLT0qDPh7MY5+0AbGz9VId6YSnCDnv2+VyLbDBYiV6zCOXQs22ZRi2Jl+RqDneTxusn IILg== 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=ccRrFzBaY+gq2B0/19skBLQzy7KGLBKADCWSld7jxJc=; fh=O1lC+sCqSxg2APmjWV7JjWKDa+redn6lAPGUsfnabhM=; b=BUUSHyutXOvcqaglqKcg7T086mJCKOyb9hwmdmjZhmmmaICJ0FH+EEL9Gha1FG50Uz vM/IZFDCEJ0HHJV1cYHKxMcBSqsEkHqyCoBnLEwOgdNvG2dhJX8TDPa/D1dEe57awDLd e8gfFyomhIZEcXwyGA9Tu3lQdgqNrXLKTLk92yAb1FcouNMZeHB0hh5MBJu7Y0VgHUk9 /aiCeP6HkN8Zf0tHshMu5LPhVivf+gpgXg91dLO7oTLADAmrOCSDXCKnkzDiPOhy4n5r uGcXRXbhNhDqBpNu3a8DPJD69OWE8EhEIDvn37UqNyg6B0PRjvUp1HgsAX2N7Uix60+F kp5w==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=nez0UptB; spf=pass (google.com: domain of jan.kiszka@web.de designates 217.72.192.78 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=1711977429; x=1712582229; 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=ccRrFzBaY+gq2B0/19skBLQzy7KGLBKADCWSld7jxJc=; b=o58MDC5ShOa2jNtiMvCU73u5Ik9hiKy8LiDBHOTKvWWPLWQnYIonT0oKGgYFDjr/zA AMGWTFL/ovbkJbr+lu82TG7ySCMXtoc0Anyc4xnF8gOrIqJ6vShdXowpxiYygmx93zB6 DUUNk4AVb76bu5fGk+9zyKu89L6jbFFwo8JRaiNtV5PiCwZjetJf62vt6ld+YpGT5phk +8Xw9/m+14TzFxE2PvND9yruCgdcVPY6Ow1fkWLHBywGHRp0EMLaVRJ0QP4le+PXa7DA tpHpdwwe3AU6cTm/LId0vC0hwvSuOxCL+dGQTRzy8Q5pM5bFDLN8oJeejRsy1ox3bnds IHWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711977429; x=1712582229; 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=ccRrFzBaY+gq2B0/19skBLQzy7KGLBKADCWSld7jxJc=; b=ZK758Q5EKqDRFqFeAbVl1axj+FFRPg0CRvhiN6f4hCWa8a2MaaiLXcgTPLjI61oBOh 6ICXdmEVvnU1xBnGnxGW3oQaBLP9RcFS0mKlBvA9H1QosX1rsMQufrMdLOIBFHsB6UWQ 7GmSKj7KPpGHmVtdypCFdCs55RXnTgu+gv+EfRqT4te8Yj1IDn0stNXvYCSJ/APMYze5 9ZGz9mJTLtd+36mWfqdRRN17c2UU2tQ1H3LJak8HEpj0EmQVimC1DJTMv73atVzcGduD nNV7PddR2Mu2fgSm6H7WhcRhlDL0DLOZ4MABg0j/mN7LxozOPArYF+OsQ0v7fMlUfpl4 aBng== X-Forwarded-Encrypted: i=2; AJvYcCUc+NLYLbi0yX5l1TqLzKJ+G4QxFjOAnbTzKvYCcH00CrecVIjY60jTUTDNqe+eDfZzO89ajqmJYtLCjvWWKmD36syaT6c= X-Gm-Message-State: AOJu0YzALlyJ/QU15XrCPmW9h7CLWcTcXmL/ANjNDhbgpWdOaBXXfYXQ zcMdFu3vonxCy13bzJv5BFiRMUm+qVqAsqI7ggPJPztHZxpn2PAw X-Google-Smtp-Source: AGHT+IEi5adrF6qZA5bti4KzCKthSfLv1iIxhKKVSRcBguhNeCRI577CeCvwpsmY+2h5dSzhh95aow== X-Received: by 2002:a05:600c:a07:b0:415:59b:f665 with SMTP id z7-20020a05600c0a0700b00415059bf665mr6464318wmp.26.1711977428977; Mon, 01 Apr 2024 06:17:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c8a:b0:415:644f:d95e with SMTP id k10-20020a05600c1c8a00b00415644fd95els420634wms.1.-pod-prod-03-eu; Mon, 01 Apr 2024 06:17:07 -0700 (PDT) X-Received: by 2002:a05:600c:3b02:b0:414:860:bdc9 with SMTP id m2-20020a05600c3b0200b004140860bdc9mr6116665wms.33.1711977426660; Mon, 01 Apr 2024 06:17:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711977426; cv=none; d=google.com; s=arc-20160816; b=nvbTUv1yL9iktgA/FUL4ywxT9tfeIjmQCqRi/ZC+nI287Qhg83bZlGLPFdHJkw4uJL nA0Gtixnbv/r6lxYLf/jbiGS0AOXvpXzu2QjxQSNvbnvd391vx/+s0x/R4ygMems0ub8 M5m2CFw8nY2IbwVObO7ZF4QH52mNXrzEsmTdyrUe+8mX8ikh2E7O3yD+UKj1SQRtqJ12 Ko70cEU1kp3RCaBx7F/jG+JxFwCVRMyP39pWNiDY718CA5BeppIsXsCkE026PBoDV6kP R2ZoJNZkc6dD57SwGl2zWsFI6YxqtcT0jMXTgWAHbutX1SU7W6wSeHjlzEixZkdOvA78 iCWA== 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=j05NArWMhUyGvGw9M0PC5qXIijX9PGxMa2pKE1k64yQ=; fh=tuUs/EekgcJ78itlzYw1SUa7Ysgio1Tae7tVJ0Mwzu4=; b=0AideKRdMWfIhkM/gkLfTOi5K473yQph+9ewESVqVSaslxCrMwvSUVIYjgFmTWX89Q jX7w+KKc2xah121P9UutRU82dMof2WT3eGv0cqsna3BYeajUBGPno5AlcBMNZCzQvYAp tGMUI1p8h5W+BOshNoRFQf93DbOG6qCvdHtzQrge10P4rJc28o0iXw/9qbmCSsHxZC3B JHGPnwqqw2YsZi00yJp3hkRUDv5hUfB7SJ8zj9Iws4x/EalspchaQv6Em7MXu3siAFxv C1Iswf+WpVnz9YAwF8JmHIMQWhOx5j2JoOo90o8aKVvCPOC6KshK0GHdj2Lvrvb0u2FQ A0TA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@web.de header.s=s29768273 header.b=nez0UptB; spf=pass (google.com: domain of jan.kiszka@web.de designates 217.72.192.78 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. [217.72.192.78]) by gmr-mx.google.com with ESMTPS id fm26-20020a05600c0c1a00b004156a6790c7si102460wmb.1.2024.04.01.06.17.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Apr 2024 06:17:06 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 217.72.192.78 as permitted sender) client-ip=217.72.192.78; X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from [192.168.178.31] ([88.70.124.107]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1N9cHX-1swXDD0acn-015Iye; Mon, 01 Apr 2024 15:17:06 +0200 Message-ID: Date: Mon, 1 Apr 2024 15:17:05 +0200 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 v2] multiarch: Fix PN-to-BPN massaging Content-Language: en-US Cc: Uladzimir Bely , "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:ihEv5cKp40gHeRLeox/ygv5tBAKJKCQmYyC2O48oCYRmmdfUh+t co8V7JKhKePEXn+qfxmSayKm72nf0WBFSN33UuWkGeNoKGdsdVjQOd4WmbqhEWMi0macPzU 2CAlOmBoquBJty5YJiq7mJyoBcmow/N7b9T9sc3gRX9Uczq1/SXCcxActnq3Dc6DadSiCaT caa7MfJ2g4yuhDEyxBgYw== UI-OutboundReport: notjunk:1;M01:P0:VWbj7mVHBW8=;jgZpGwqT0UElX1lqNY+c0rwVZXl JzPZi1ODWceaDhjikktKvNmneDOlOqoOI7fkMoaWDfWtLpTuOXRYg7poHhQfk5wU67YblOa0T pN4DKwfLllo7alMtTVb44EGWyNiQTRsL9RnXL1y27PaOZr+FiZdkk82FTLBc7f5g6VN4tky1J QTTWs1iBJdjaZ5yvtUPppbS5mSQlxZqyvuZoDqrb8WgeVgceWDzALotB08bssj1SA8mixJ8CH nHWPfLPIXbuk5k/bga0VotJGVQSf6deJvfBK7/ygi2ZqDsUFsPQnEHFETqBb9xytDrPg1EH+j 2yLw07ukDErZvzGygWi8N7MK90526a35yjNn3dsPXw2PboXsgLr03IRkaPO3rlALFXjvOppm+ tue6E3Kqq6U/neJpVks/B2auksdOy8DSdiXXpJxOyOl2k+54GsfTeiBOu3X6KW6/7LS/QfgMB sRrwwbmJdyjl1LwwVQm6dRGs2XCWNsLpHmFBpCW1LMVxRixYsnbDjoSdHRjdj3cV5zxqpIa6a xEm+BQYGvzd9FOw3fhcNZA8NJk7W7wekhQJmIQgHIh0P+nZ9dp8Qpw5zJJtYNNUB+Rzz/p+eu 3isZo5uNUknL0bs4Dwi3aWxk2okv9HdI8Ri/r2HrxaMYuBnejCr4CUTm8npRvQlcQJiHRkDnc f8d1lKJzDw1kLRn61SFKb/lZCxr9rv4AgtEgEq1Xe/sEbiq9KtqSHkV/prvY8EHRpOZkISYKb sVwpsjUegF7VggkhxlloAv2/YN0XCj+Y1iBnVlrlDy/oqD7JRW8RHdZIg5bgBRZDAE4okudl+ uYetLK6czSmbBJkocGJ6rc7MHAS0Yud9saVQXnFZHtoxM= 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=nez0UptB; spf=pass (google.com: domain of jan.kiszka@web.de designates 217.72.192.78 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 --- Changes since v2: - picked final patch from local queue, fixing SRC_URI regression 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..5c97453b 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.