Signed-off-by: Richard Purdie <[email protected]>
---
meta/lib/oeqa/selftest/cases/reproducible.py | 2 -
.../libsecret/libsecret/determinism.patch | 37 +++++++++++++++++++
.../libsecret/libsecret_0.20.4.bb | 2 +
3 files changed, 39 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-gnome/libsecret/libsecret/determinism.patch
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py
b/meta/lib/oeqa/selftest/cases/reproducible.py
index ec8ac0bcc84..03a29241c7d 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -41,8 +41,6 @@ exclude_packages = [
'libaprutil',
'libhandy-1-src',
'libid3tag',
- 'libsecret-dev',
- 'libsecret-src',
'lttng-tools-dbg',
'lttng-tools-ptest',
'ltp',
diff --git a/meta/recipes-gnome/libsecret/libsecret/determinism.patch
b/meta/recipes-gnome/libsecret/libsecret/determinism.patch
new file mode 100644
index 00000000000..ad96e8f59bf
--- /dev/null
+++ b/meta/recipes-gnome/libsecret/libsecret/determinism.patch
@@ -0,0 +1,37 @@
+secret-enum-types.c/h.template: Fix reproducibility issue
+
+When full filenames are used in generated sources it makes the resulting
+debug packages non-reproducible. Best practise is to use basename in
+comments instead.
+
+Signed-off-by: Richard Purdie [email protected]
+Upstream-Status: Submitted
[https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/68]
+
+Index: libsecret-0.20.4/libsecret/secret-enum-types.c.template
+===================================================================
+--- libsecret-0.20.4.orig/libsecret/secret-enum-types.c.template
++++ libsecret-0.20.4/libsecret/secret-enum-types.c.template
+@@ -23,8 +23,8 @@
+ /*** END file-header ***/
+
+ /*** BEGIN file-production ***/
+-#include "@filename@"
+-/* enumerations from "@filename@" */
++#include "@basename@"
++/* enumerations from "@basename@" */
+ /*** END file-production ***/
+
+ /*** BEGIN value-header ***/
+Index: libsecret-0.20.4/libsecret/secret-enum-types.h.template
+===================================================================
+--- libsecret-0.20.4.orig/libsecret/secret-enum-types.h.template
++++ libsecret-0.20.4/libsecret/secret-enum-types.h.template
+@@ -27,7 +27,7 @@ G_BEGIN_DECLS
+
+ /*** BEGIN file-production ***/
+
+-/* enumerations from "@filename@" */
++/* enumerations from "@basename@" */
+ /*** END file-production ***/
+
+ /*** BEGIN value-header ***/
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb
b/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb
index 96f6460181d..4b6b2172e4e 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb
@@ -13,6 +13,8 @@ inherit gnomebase gtk-doc vala gobject-introspection manpages
DEPENDS += "glib-2.0 libgcrypt gettext-native"
+SRC_URI += " file://determinism.patch"
+
SRC_URI[archive.sha256sum] =
"325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28"
GTKDOC_MESON_OPTION = 'gtk_doc'
--
2.27.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#148644):
https://lists.openembedded.org/g/openembedded-core/message/148644
Mute This Topic: https://lists.openembedded.org/mt/80926055/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
