diff options
| author |   Ross Burton <ross.burton@intel.com> | 2020-02-05 17:32:01 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-11 23:04:29 +0000 |
| commit | 5c38cdfc67fb2da167012190d24a607dc7b273ba (patch) | |
| tree | ba2de2bfd02df6e96f370e4b7ffef4fc7b8738af | |
| parent | 77be3238269de636199f9e1e40133711b7440cb4 (diff) | |
| download | openembedded-core-contrib-5c38cdfc67fb2da167012190d24a607dc7b273ba.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)
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>
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3/sort-resources.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-gnome/gtk+/gtk+3_3.24.8.bb | 1 |
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 @@ +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'?>" > $@; \ 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 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" |