[thud,2/2] meson: Correct use of the _append operator

Submitted by Peter Kjellerstedt on Dec. 22, 2018, 10:13 p.m. | Patch ID: 157393

Details

Message ID 20181222221322.3768-2-pkj@axis.com
State Thud Next
Delegated to: Armin Kuster
Headers show

Commit Message

Peter Kjellerstedt Dec. 22, 2018, 10:13 p.m.
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>

The value to SRC_URI_append_class-native was not prefixed with a space.
This was not noticed as the SRC_URI before applying the _append contains
trailing spaces. However, if one, e.g., has a .bbappend and adds to the
SRC_URI using SRC_URI += "file://foo.patch", then there no longer is any
trailing space and the _append concatenates the two URIs together,
leading to a build failue.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

This is a backport from master.

 meta/recipes-devtools/meson/meson.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index b7fb3e698a..40b29d5802 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -15,9 +15,10 @@  SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
 SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb"
 SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e"
 
-SRC_URI_append_class-native = "file://0002-Make-CPU-family-warnings-fatal.patch \
-                               file://0001-Support-building-allarch-recipes-again.patch \
-                               "
+SRC_URI_append_class-native = " \
+    file://0002-Make-CPU-family-warnings-fatal.patch \
+    file://0001-Support-building-allarch-recipes-again.patch \
+"
 
 UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
 

Comments

Armin Kuster Dec. 23, 2018, 4:48 p.m.
On 12/22/18 2:13 PM, Peter Kjellerstedt wrote:
> From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
>
> The value to SRC_URI_append_class-native was not prefixed with a space.
> This was not noticed as the SRC_URI before applying the _append contains
> trailing spaces. However, if one, e.g., has a .bbappend and adds to the
> SRC_URI using SRC_URI += "file://foo.patch", then there no longer is any
> trailing space and the _append concatenates the two URIs together,
> leading to a build failue.
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

This is stagged in stable/thud-nmut.

thanks.

> ---
>
> This is a backport from master.
>
>  meta/recipes-devtools/meson/meson.inc | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
> index b7fb3e698a..40b29d5802 100644
> --- a/meta/recipes-devtools/meson/meson.inc
> +++ b/meta/recipes-devtools/meson/meson.inc
> @@ -15,9 +15,10 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
>  SRC_URI[sha256sum] = "92d8afd921751261e36151643464efd3394162f69efbe8cd53e0a66b1cf395eb"
>  SRC_URI[md5sum] = "31bda3519d8c0eb3438267268a78085e"
>  
> -SRC_URI_append_class-native = "file://0002-Make-CPU-family-warnings-fatal.patch \
> -                               file://0001-Support-building-allarch-recipes-again.patch \
> -                               "
> +SRC_URI_append_class-native = " \
> +    file://0002-Make-CPU-family-warnings-fatal.patch \
> +    file://0001-Support-building-allarch-recipes-again.patch \
> +"
>  
>  UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
>