diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-25 15:19:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-26 15:21:21 +0000 |
commit | 574f981fd8f832aca2ee9915ab579638b61b0361 (patch) | |
tree | 175657b94ce596f702188c68d88bc667968ac9ad | |
parent | dd371100bdc4b8be289739b9ad798ef880b54631 (diff) | |
download | poky-574f981fd8f832aca2ee9915ab579638b61b0361.tar.gz |
libsecret: Improve determimism
(From OE-Core rev: 28175c44e7402397a24a00a4b056eef39b0a03fa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oeqa/selftest/cases/reproducible.py | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/libsecret/libsecret/determinism.patch | 37 | ||||
-rw-r--r-- | meta/recipes-gnome/libsecret/libsecret_0.20.4.bb | 2 |
3 files changed, 39 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index ec8ac0bcc8..03a29241c7 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py | |||
@@ -41,8 +41,6 @@ exclude_packages = [ | |||
41 | 'libaprutil', | 41 | 'libaprutil', |
42 | 'libhandy-1-src', | 42 | 'libhandy-1-src', |
43 | 'libid3tag', | 43 | 'libid3tag', |
44 | 'libsecret-dev', | ||
45 | 'libsecret-src', | ||
46 | 'lttng-tools-dbg', | 44 | 'lttng-tools-dbg', |
47 | 'lttng-tools-ptest', | 45 | 'lttng-tools-ptest', |
48 | 'ltp', | 46 | 'ltp', |
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 @@ | |||
1 | secret-enum-types.c/h.template: Fix reproducibility issue | ||
2 | |||
3 | When full filenames are used in generated sources it makes the resulting | ||
4 | debug packages non-reproducible. Best practise is to use basename in | ||
5 | comments instead. | ||
6 | |||
7 | Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org | ||
8 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/68] | ||
9 | |||
10 | Index: 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 ***/ | ||
25 | Index: 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.4.bb b/meta/recipes-gnome/libsecret/libsecret_0.20.4.bb index 96f6460181..4b6b2172e4 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 | |||
13 | 13 | ||
14 | DEPENDS += "glib-2.0 libgcrypt gettext-native" | 14 | DEPENDS += "glib-2.0 libgcrypt gettext-native" |
15 | 15 | ||
16 | SRC_URI += " file://determinism.patch" | ||
17 | |||
16 | SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" | 18 | SRC_URI[archive.sha256sum] = "325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28" |
17 | 19 | ||
18 | GTKDOC_MESON_OPTION = 'gtk_doc' | 20 | GTKDOC_MESON_OPTION = 'gtk_doc' |