[PATCH] multiarch: Fix PN-to-BPN massaging

[Jan Kiszka <jan.kiszka@web.de>]

From: Jan Kiszka <jan.kiszka@siemens.com>

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 <jan.kiszka@siemens.com>
---
 meta/classes/multiarch.bbclass | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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.
--
2.35.3