summaryrefslogtreecommitdiffstats
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-11 23:05:12 +0000
commit3a54dd9de886a4228a4be1744ba5fd5ff380915c (patch)
treea7ebf814172a1a679a1ed428b7d3cf21ae1a5d97
parentd3d7b1b2d01f1e66dbaeddfa1652de72adcaa2ad (diff)
downloadpoky-3a54dd9de886a4228a4be1744ba5fd5ff380915c.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) (From OE-Core rev: a2a6d9fa4df66a1f52c1c1fec45eedb4199e8162) (From OE-Core rev: 5c38cdfc67fb2da167012190d24a607dc7b273ba) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch19
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3_3.24.8.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.8.bb b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb
index d79b18bee0..596dee6264 100644
--- a/meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+3_3.24.8.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] = "eeedde01856238114dcf4df3ebc942a5" 12SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5"
12SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799" 13SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799"