From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7352162563113615360 X-Forwarded-Encrypted: i=2; AJvYcCWlNk1pBkMtDaAjuqtW1BWSFr1H4Tffg3ql8n8axZg9Qb37KLvw0m/fOyGDivWFsBRa479DAmKlCZjsxxYFPvVJfRxCg6aZaDEvx+0= X-Received: by 2002:a19:8c09:0:b0:513:da24:19ff with SMTP id o9-20020a198c09000000b00513da2419ffmr7212831lfd.38.1712640334413; Mon, 08 Apr 2024 22:25:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:e82:b0:56e:5313:8b52 with SMTP id h2-20020a0564020e8200b0056e53138b52ls339205eda.1.-pod-prod-08-eu; Mon, 08 Apr 2024 22:25:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWQfQ5S2bIv2h29Q6bmA0K/yR2pzESjcTxTiIaxT9y0KTYJunkmIkhbFtvNLWQ0JORt7xfOVfc3/VAKWv5qq65u2WePzflchRwqGyA= X-Google-Smtp-Source: AGHT+IHuqr3hh4D5CPNe1pgaWlELb64xZOsHgk1xvpR4gn/9g9NYOk96JmLozt3wb6VZNo5dbflP X-Received: by 2002:a17:906:8811:b0:a4e:2d07:70a6 with SMTP id zh17-20020a170906881100b00a4e2d0770a6mr7716218ejb.44.1712640332117; Mon, 08 Apr 2024 22:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712640332; cv=none; d=google.com; s=arc-20160816; b=UfjyZpaBSOULQjVFXWjG9sgGLezrZQPY7sWr51chzEGhjg8knwCQ/x+rLlxjExC6JW NJ9WNMIy6Zjn1mpL3g8ZAbNUpghpV2ZCgbBFKfKw9UlkDWCxC6mPJA5py87b2ahpl3tf +hxbLsBxVU4syflUA1T7YAoble6/LcfqzHi5lkF2fWaUmFXzWlPUeTrjvAa3nkh+Vrig fJO+YhBQ0gaCdxTXrpdEv6YPACgtr99WE2xcsR9cX8BUtrdZjpUnfojekkeJIJFpSUk/ oWE+1hruTe/ytY9rBkIh6AyslziTXO4fkvQKjZx4R52g+ao9IJ2DhA0Bc+dWEXPl8eTZ S6aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:content-transfer-encoding:autocrypt :references:in-reply-to:date:cc:to:from:subject:message-id; bh=ZbmpPGjvUXm24/UxP6wHgTYWQrrd61JhlKlCYOdSHsQ=; fh=QjR5Qt48sbdpk4VfJkdhTmeAHYg+2QFMfpgVnxtHCUE=; b=FgdCffw6Z4al1FP9S5YwWoEk+z2P13/vEHkFEaq4D0V68IbXiKc8PoS+Bn2Ebc/Qds ACHrzb55Y6GTaH/kPbVmEoI6N8sxnppJosvm46VGxDDxUlQpc+U0Xv2KF3UU/P5/AI1g rQdwo75faUjMup5AD6Rs0600To5mrMziiHXPDR7bUmUwrfjkdEG3+W038uBoe4bDTMqM KGoocOFZiihhwglTHBv6yddd0qDrxWlUorGG4YJxM9BqD60z7B8X1rZE+3JQBe7D3IRr DVcI5svHbCUkcbunQbHVhdhl0rfwKpRq+8lBY4RKIYOKFjla2A1Z8gm8uroKK+mM6uoq KHfg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id qw16-20020a1709066a1000b00a51ad0c647csi298865ejc.0.2024.04.08.22.25.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Apr 2024 22:25:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from [IPv6:::1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4395PTaa019729 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 9 Apr 2024 07:25:31 +0200 Message-ID: Subject: Re: [PATCH v2] multiarch: Fix PN-to-BPN massaging From: Uladzimir Bely To: Jan Kiszka , isar-users Cc: "Schmidt, Adriaan" Date: Tue, 09 Apr 2024 08:25:29 +0300 In-Reply-To: References: Autocrypt: addr=ubely@ilbers.de; prefer-encrypt=mutual; keydata=mQENBGO2eUkBCACtT+T3OrPVSExBmqfgXT3lp9XcdxRzjYp26wezkgYjjBXaf36bxtaAf S471VoQtpar0RVeFfW7WDDdfX9ZclSj36zBQe+RVSJzoNoNQfjOXWuSHb5Z+cpAFtqBY4muxK4+ia IlLJd6CN3ejOsLHATtCeHHq8wi0z2T+KdLQO+wQRgo2hjj0Lp9pGTrKJry50HP/o7Vbdu14dOx2xq r8+wPc6SQbBIrcqaa4MqCQC00vQG7eXvo+k2MOw59FDdpMH0KR9mHgp3u/s4I+4YRBArukt9G9xz/ rsEFmxAIBC6N/a6Hzwg4puc91n7ABDsPg8Vp+X3MDraujN0dvR6OKVNtABEBAAG0IFVsYWR6aW1pc iBCZWx5IDx1YmVseUBpbGJlcnMuZGU+iQFOBBMBCAA4FiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAm O2eUkCGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQAUQYBM/2FkprlAgAmuna8Hm9EyoEtTl DBGDg6Zm4ZLp5ffvZBE946h92jepDrteoxsJ7pSzJVC2HmDLa4iZUao7lLLbDsUj5x45/iLJcqBZK k3YnAxP2r6a+kI+1VVQY1pxdG1nlJAbdNzoojm/qmezNPSrqni61KVMQKsXBCWhIjSXDSM9CsBj21 a+9qaVqfxovJGTn9lgrZO+xzKQNMKZeOouJlscVuFj21P0ww3/YENiU/nMeTSuYypO76mDtAd08Jo nc3yuHa9MJGei5ixN3wT+IrGR2aL2hdw2M6NgH7sYbL2Zi4ugD6RXHJai1Bh2yvFSVqSQ+M6QOInT 4ud7wslm1XRB065dXtLkBDQRjtnlJAQgA0nDigNK6FToZn7ezdts22l//+cyPF9k1OQM+wNuhdEYG ZvieFPNnH4iPf2C6OVPxOsHxs66X3mpn728s5Mg+0V2pkDqX4E9IU1sdPAFGC9Zl5eDGmE0PxqaTr lLG2ZA2lxouoHUe/xwE3fKiHENxiY4RVC8vya8dnU/SMnTc39uHS1nlPk0oPiZd2odHO+YABGz2pM LMShCstX+8LDlV/XxXacBbXYDeR+Xk78mFsjKzavfXWhZ7UoA6vitR7XG5y1koZ9FbtU6kq7JPRDe eYbVf0mIufdGTUBedza12M1Lm4knvzZRX+get1lLFngPstU48t041YfQKZpNK0cePPwARAQABiQE2 BBgBCAAgFiEEJqPNVhVGyk12Eh+PAUQYBM/2FkoFAmO2eUkCGwwACgkQAUQYBM/2Fkq3aQf6AuKj6 5nqjLIOLIasYQ6D28Jhip65ZFhW6XISv5rcjHkvYfMp4J+LaNOZk2P+1b/QN/2wDVisNGYq6lhkkf pBN3vTQlvMY0ugKDug2YaRYeuoLSFBMFVONa9N6437KQg+vRNd46d5282q9BTXAlOLWR/ZuXg/IR5 ZIV3JTwLtqbPCUGof85hFxSPWEHMYeeE7180r66wUjA/Zf46Mar9t+olviBW1ss5XOx1JWt7FpQ5p eETwmkoYi4Kq16iyuRB94mQqyy1C4fiqTq8dKr4uUYg759NWwU6j21G0kf31bDd4QgTIHvhY/8Agl dyzoeJX5Bz67KzX3+/fAWvPEXAvvg== Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.52.0 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: nlzIemcBUbjK On Mon, 2024-04-01 at 15:17 +0200, Jan Kiszka wrote: > From: Jan Kiszka >=20 > 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. >=20 > Furthermore, the existing logic didn't properly split the entries, > rather > processed the complete string. That was surely not desired as well. >=20 > Account for all by handling the variables separately and by splitting > them first. This fixes warnings like >=20 > 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 >=20 > Signed-off-by: Jan Kiszka > --- >=20 > Changes since v2: > =C2=A0- picked final patch from local queue, fixing SRC_URI regression >=20 > =C2=A0meta/classes/multiarch.bbclass | 16 ++++++++++------ > =C2=A01 file changed, 10 insertions(+), 6 deletions(-) >=20 > 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() { > =C2=A0=C2=A0=C2=A0=C2=A0 # parse time, and parsing always happens for all= build variants. > So in those > =C2=A0=C2=A0=C2=A0=C2=A0 # few variables, we automatically replace ${PN} = with ${BPN}. > =C2=A0=C2=A0=C2=A0=C2=A0 def fixup_pn_in_vars(d): > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 vars =3D 'SRC_URI FILESPATH'.= split() > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for var in vars: > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 v =3D= d.getVar(var, expand=3DFalse) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if v = is not None and '${PN}' in v: > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 d.setVar(var + ':remove', v) > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 d.appendVar(var, ' ' + v.replace('${PN}', '${BPN}')) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 v =3D d.getVar('SRC_URI', exp= and=3DFalse) or '' > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for uri in v.split(): > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if '$= {PN}' in uri: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 d.setVar('SRC_URI' + ':remove', uri) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 d.appendVar('SRC_URI', ' ' + uri.replace('${PN}', > '${BPN}')) > + > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 v =3D d.getVar('FILESPATH', e= xpand=3DFalse) or '' > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 for path in v.split(':'): > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if '$= {PN}' in path: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 d.appendVar('FILESPATH', ':' + path.replace('${PN}', > '${BPN}')) >=20 > =C2=A0=C2=A0=C2=A0=C2=A0 # When building compat/native, the corresponding= suffix needs to > be > =C2=A0=C2=A0=C2=A0=C2=A0 # propagated to all bitbake dependency definitio= ns. > -- > 2.35.3 >=20 --=20 Applied to next, thanks.