multiarch: Add missing space in BPN append

Message ID 20240314085620.3866335-1-amikan@ilbers.de
State Accepted, archived
Headers show
Series multiarch: Add missing space in BPN append | expand

Commit Message

Anton Mikanovich March 14, 2024, 8:56 a.m. UTC
Adding values must be done with a leading space.

Fixes: f50237eb059c ("multiarch: Fix SRC_URI:remove ignoring")
Reported-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta/classes/multiarch.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Uladzimir Bely March 18, 2024, 1:06 p.m. UTC | #1
On Thu, 2024-03-14 at 10:56 +0200, Anton Mikanovich wrote:
> Adding values must be done with a leading space.
> 
> Fixes: f50237eb059c ("multiarch: Fix SRC_URI:remove ignoring")
> Reported-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta/classes/multiarch.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/multiarch.bbclass
> b/meta/classes/multiarch.bbclass
> index d92421d8..5783b0bf 100644
> --- a/meta/classes/multiarch.bbclass
> +++ b/meta/classes/multiarch.bbclass
> @@ -51,7 +51,7 @@ python multiarch_virtclass_handler() {
>              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}'))
> +                d.appendVar(var, ' ' + v.replace('${PN}', '${BPN}'))
>  
>      # When building compat/native, the corresponding suffix needs to
> be
>      # propagated to all bitbake dependency definitions.
> -- 
> 2.34.1
> 

Applied to next.

Patch

diff --git a/meta/classes/multiarch.bbclass b/meta/classes/multiarch.bbclass
index d92421d8..5783b0bf 100644
--- a/meta/classes/multiarch.bbclass
+++ b/meta/classes/multiarch.bbclass
@@ -51,7 +51,7 @@  python multiarch_virtclass_handler() {
             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}'))
+                d.appendVar(var, ' ' + v.replace('${PN}', '${BPN}'))
 
     # When building compat/native, the corresponding suffix needs to be
     # propagated to all bitbake dependency definitions.