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>
This commit is contained in:
Ross Burton
2020-02-05 17:32:01 +00:00
committed by Richard Purdie
parent d3d7b1b2d0
commit 3a54dd9de8
2 changed files with 20 additions and 0 deletions

View File

@@ -0,0 +1,19 @@
If the resources file isn't sorted in some way then libgdk.so will differ
depending on the inode order of the resource files.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e25b57ba50..26f2d57c6e 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -465,7 +465,7 @@ stamp-gc-h: $(top_builddir)/config.status
# Resources
#
-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
+glsl_sources := $(sort $(wildcard $(srcdir)/resources/glsl/*.glsl))
gdk.gresource.xml: Makefile.am
$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \

View File

@@ -7,6 +7,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar
file://0002-Do-not-try-to-initialize-GL-without-libGL.patch \
file://0003-Add-disable-opengl-configure-option.patch \
file://link_fribidi.patch \
file://sort-resources.patch \
"
SRC_URI[md5sum] = "eeedde01856238114dcf4df3ebc942a5"
SRC_URI[sha256sum] = "666962de9b9768fe9ca785b0e2f42c8b9db3868a12fa9b356b167238d70ac799"