Skip to contentSkip to conversation

pango: improve reproducibility

PATCH In review Oleksiy Obitotskyy 2 participants 3 messages Jan 21, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pango: improve reproducibility

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

---
 meta/recipes-graphics/pango/pango_1.48.0.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-graphics/pango/pango_1.48.0.bb +3 -0
index 552a44583c..a070581732 100644
@@ -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() {
Signature · 1 line
2.26.2.Cisco
#1 lore raw

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

Quoted 29 lines · Oleksiy Obitotskyy via lists.openembedded.org

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

---
 meta/recipes-graphics/pango/pango_1.48.0.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-graphics/pango/pango_1.48.0.bb +3 -1
index 552a44583c..a070581732 100644
@@ -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

#2 lore raw

My bad. Already fixed in upstream master.

Regards,
Oleksiy
________________________________
From: Ross Burton <[email protected]>
Sent: Thursday, January 21, 2021 15:31
To: Oleksiy Obitotskyi -X (oobitots - GLOBALLOGIC INC at Cisco) <[email protected]>
Cc: OE-core <[email protected]>
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

Quoted 29 lines · Oleksiy Obitotskyy via lists.openembedded.org

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

---
 meta/recipes-graphics/pango/pango_1.48.0.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-graphics/pango/pango_1.48.0.bb +3 -1
index 552a44583c..a070581732 100644
@@ -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