summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-02-05 17:32:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-06 12:16:34 +0000
commit2aac5700b80f8e207db0a212d97dd9a650151dc7 (patch)
tree929ecd4787fb4791a0c6bc82eb15541f68d73513 /meta
parent934d21e032cd6331e248f23f12bb455cbeb5b645 (diff)
downloadpoky-2aac5700b80f8e207db0a212d97dd9a650151dc7.tar.gz
gtk+3: sort resources for reproducible binaries
The list of resources is gathered with $(wildcard) in Make, which isn't sorted. If this order changes then the generated libraries will differ. (From OE-Core rev: f3675be6be29426688187a135221431a0941d007) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch19
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb1
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch
new file mode 100644
index 0000000000..7f87372c52
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch
@@ -0,0 +1,19 @@
1If the resources file isn't sorted in some way then libgdk.so will differ
2depending on the inode order of the resource files.
3
4Upstream-Status: Pending
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/gdk/Makefile.am b/gdk/Makefile.am
8index e25b57ba50..26f2d57c6e 100644
9--- a/gdk/Makefile.am
10+++ b/gdk/Makefile.am
11@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status
12 # Resources
13 #
14
15-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
16+glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl))
17
18 gdk.gresource.xml: Makefile.am
19 $(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
diff --git a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb
index 18976b54c5..025d8870e2 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.13.bb
@@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \ 7 file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
8 file://0003-Add-disable-opengl-configure-option.patch \ 8 file://0003-Add-disable-opengl-configure-option.patch \
9 file://link_fribidi.patch \ 9 file://link_fribidi.patch \
10 file://sort-resources.patch \
10 " 11 "
11SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686" 12SRC_URI[md5sum] = "f65515e7bfa2199bd2188e871d69c686"
12SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9" 13SRC_URI[sha256sum] = "4c775c38cf1e3c534ef0ca52ca6c7a890fe169981af66141c713e054e68930a9"