[PATCH] pango: improve reproducibility

[PATCH] pango: improve reproducibility

[Oleksiy Obitotskyy]

Replace filename with basename in templates
to avoid absolute path in generated source files.

Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
---
 meta/recipes-graphics/pango/pango_1.48.0.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-graphics/pango/pango_1.48.0.bb b/meta/recipes-graphics/pango/pango_1.48.0.bb
index 552a44583c..a070581732 100644
--- a/meta/recipes-graphics/pango/pango_1.48.0.bb
+++ b/meta/recipes-graphics/pango/pango_1.48.0.bb
@@ -35,6 +35,9 @@ GIR_MESON_OPTION = 'introspection'
 
 do_configure_prepend() {
     chmod +x ${S}/tests/*.py
+    if [ -n "$SOURCE_DATE_EPOCH" ]; then
+        find ${S} -name "*.template" -print0 | xargs -0 sed -i -e "s/@filename@/@basename@/"
+    fi
 }
 
 do_configure_prepend_toolchain-clang() {
-- 
2.26.2.Cisco

Re: [OE-core] [PATCH] pango: improve reproducibility

[Ross Burton]

I thought we'd already fixed this once already upstream - maybe new
templates have appeared.  This would be better as an upstreamed patch,
can you submit it there too?

Ross

On Thu, 21 Jan 2021 at 13:08, Oleksiy Obitotskyy via
lists.openembedded.org <oobitots=cisco.com@lists.openembedded.org>
wrote:
>
> Replace filename with basename in templates
> to avoid absolute path in generated source files.
>
> Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
> ---
>  meta/recipes-graphics/pango/pango_1.48.0.bb | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-graphics/pango/pango_1.48.0.bb b/meta/recipes-graphics/pango/pango_1.48.0.bb
> index 552a44583c..a070581732 100644
> --- a/meta/recipes-graphics/pango/pango_1.48.0.bb
> +++ b/meta/recipes-graphics/pango/pango_1.48.0.bb
> @@ -35,6 +35,9 @@ GIR_MESON_OPTION = 'introspection'
>
>  do_configure_prepend() {
>      chmod +x ${S}/tests/*.py
> +    if [ -n "$SOURCE_DATE_EPOCH" ]; then
> +        find ${S} -name "*.template" -print0 | xargs -0 sed -i -e "s/@filename@/@basename@/"
> +    fi
>  }
>
>  do_configure_prepend_toolchain-clang() {
> --
> 2.26.2.Cisco
>
>
> 
>

Re: [OE-core] [PATCH] pango: improve reproducibility

[Oleksiy Obitotskyy]

[-- Attachment #1: Type: text/plain, Size: 1576 bytes --]

My bad. Already fixed in upstream master.

Regards,
Oleksiy
________________________________
From: Ross Burton <ross@burtonini.com>
Sent: Thursday, January 21, 2021 15:31
To: Oleksiy Obitotskyi -X (oobitots - GLOBALLOGIC INC at Cisco) <oobitots@cisco.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [PATCH] pango: improve reproducibility

I thought we'd already fixed this once already upstream - maybe new
templates have appeared.  This would be better as an upstreamed patch,
can you submit it there too?

Ross

On Thu, 21 Jan 2021 at 13:08, Oleksiy Obitotskyy via
lists.openembedded.org <oobitots=cisco.com@lists.openembedded.org>
wrote:
>
> Replace filename with basename in templates
> to avoid absolute path in generated source files.
>
> Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com>
> ---
>  meta/recipes-graphics/pango/pango_1.48.0.bb | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-graphics/pango/pango_1.48.0.bb b/meta/recipes-graphics/pango/pango_1.48.0.bb
> index 552a44583c..a070581732 100644
> --- a/meta/recipes-graphics/pango/pango_1.48.0.bb
> +++ b/meta/recipes-graphics/pango/pango_1.48.0.bb
> @@ -35,6 +35,9 @@ GIR_MESON_OPTION = 'introspection'
>
>  do_configure_prepend() {
>      chmod +x ${S}/tests/*.py
> +    if [ -n "$SOURCE_DATE_EPOCH" ]; then
> +        find ${S} -name "*.template" -print0 | xargs -0 sed -i -e "s/@filename@/@basename@/"
> +    fi
>  }
>
>  do_configure_prepend_toolchain-clang() {
> --
> 2.26.2.Cisco
>
>
> 
>

[-- Attachment #2: Type: text/html, Size: 3197 bytes --]