mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdk-pixbuf: Make loader.cache reproducible

Browse Source 
Make the loader order in the file reliable to enable more reproducible
builds.

[YOCTO #11610]

(From OE-Core rev: 6c97a3291988cec0ac018338cd96aa2e734ca5c4)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen
2017-06-22 12:52:06 +03:00
committed by Richard Purdie
parent 26d1f90625
commit 01266607aa
2 changed files with 57 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-queryloaders-Make-output-more-reproducible.patch Normal file
View File

@@ -0,0 +1,56 @@
From 1049fbd887e52f94afeb03fc7942c01c143ebdfc Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Fri, 9 Jun 2017 12:01:25 +0300
Subject: [PATCH] queryloaders: Make output more reproducible
Reproducible builds are good: Sort the output by module name so that
same input always leads to same output.
This should also make gdk-pixbuf-print-mime-types output and
gdk-pixbuf-thumbnailer.thumbnailer reproducible.
https://bugzilla.gnome.org/show_bug.cgi?id=783592
Upstream-Status: Submitted
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
gdk-pixbuf/queryloaders.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
index 395674a..4ac9b28 100644
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
@@ -346,6 +346,7 @@ int main (int argc, char **argv)
#ifdef USE_GMODULE
const char *path;
GDir *dir;
+ GList *l, *modules = NULL;
path = g_getenv ("GDK_PIXBUF_MODULEDIR");
#ifdef G_OS_WIN32
@@ -365,12 +366,19 @@ int main (int argc, char **argv)
gint len = strlen (dent);
if (len > SOEXT_LEN &&
strcmp (dent + len - SOEXT_LEN, SOEXT) == 0) {
+ modules = g_list_prepend (modules,
+ g_strdup (dent));
- if (!query_module (contents, path, dent))
- success = FALSE;
}
}
g_dir_close (dir);
}
+
+ modules = g_list_sort (modules, (GCompareFunc)strcmp);
+ for (l = modules; l != NULL; l = l->next)
+ if (!query_module (contents, path, l->data))
+ success = FALSE;
+
+ g_list_free_full (modules, g_free);
#else
g_string_append_printf (contents, "# dynamic loading of modules not supported\n");
#endif
--
2.1.4

1
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.36.6.bb
View File

@@ -18,6 +18,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
file://run-ptest \
file://fatal-loader.patch \
file://0001-Work-around-thumbnailer-cross-compile-failure.patch \
file://0001-queryloaders-Make-output-more-reproducible.patch \
"
SRC_URI[md5sum] = "5dd53760750670d27c194ff6ace7eb51"