summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-25 15:19:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-28 22:31:55 +0100
commit33747b73cc2d0cc4cad4071d7037ebc645d1635c (patch)
treecac97c0532ac3a67e626a47284d94099dc051bfa /meta
parent09cc67b9da6c3d248a88516349afb46fb00a7d51 (diff)
downloadpoky-33747b73cc2d0cc4cad4071d7037ebc645d1635c.tar.gz
libsecret: Improve determimism
(From OE-Core rev: 9c807afd997f0729fe3c90e81b2d8351ec980010) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 28175c44e7402397a24a00a4b056eef39b0a03fa) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/libsecret/libsecret/determinism.patch37
-rw-r--r--meta/recipes-gnome/libsecret/libsecret_0.20.3.bb3
2 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-gnome/libsecret/libsecret/determinism.patch b/meta/recipes-gnome/libsecret/libsecret/determinism.patch
new file mode 100644
index 0000000000..ad96e8f59b
--- /dev/null
+++ b/meta/recipes-gnome/libsecret/libsecret/determinism.patch
@@ -0,0 +1,37 @@
1secret-enum-types.c/h.template: Fix reproducibility issue
2
3When full filenames are used in generated sources it makes the resulting
4debug packages non-reproducible. Best practise is to use basename in
5comments instead.
6
7Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org
8Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/68]
9
10Index: libsecret-0.20.4/libsecret/secret-enum-types.c.template
11===================================================================
12--- libsecret-0.20.4.orig/libsecret/secret-enum-types.c.template
13+++ libsecret-0.20.4/libsecret/secret-enum-types.c.template
14@@ -23,8 +23,8 @@
15 /*** END file-header ***/
16
17 /*** BEGIN file-production ***/
18-#include "@filename@"
19-/* enumerations from "@filename@" */
20+#include "@basename@"
21+/* enumerations from "@basename@" */
22 /*** END file-production ***/
23
24 /*** BEGIN value-header ***/
25Index: libsecret-0.20.4/libsecret/secret-enum-types.h.template
26===================================================================
27--- libsecret-0.20.4.orig/libsecret/secret-enum-types.h.template
28+++ libsecret-0.20.4/libsecret/secret-enum-types.h.template
29@@ -27,7 +27,7 @@ G_BEGIN_DECLS
30
31 /*** BEGIN file-production ***/
32
33-/* enumerations from "@filename@" */
34+/* enumerations from "@basename@" */
35 /*** END file-production ***/
36
37 /*** BEGIN value-header ***/
diff --git a/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
index 533015a1e4..b72206535f 100644
--- a/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
+++ b/meta/recipes-gnome/libsecret/libsecret_0.20.3.bb
@@ -13,7 +13,8 @@ inherit gnomebase gtk-doc vala gobject-introspection manpages
13 13
14DEPENDS += "glib-2.0 libgcrypt gettext-native" 14DEPENDS += "glib-2.0 libgcrypt gettext-native"
15 15
16SRC_URI += "file://0001-meson-add-option-introspection.patch" 16SRC_URI += "file://0001-meson-add-option-introspection.patch \
17 file://determinism.patch"
17 18
18SRC_URI[archive.md5sum] = "47c3fdfeb111a87b509ad271e4a6f496" 19SRC_URI[archive.md5sum] = "47c3fdfeb111a87b509ad271e4a6f496"
19SRC_URI[archive.sha256sum] = "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4" 20SRC_URI[archive.sha256sum] = "4fcb3c56f8ac4ab9c75b66901fb0104ec7f22aa9a012315a14c0d6dffa5290e4"