diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-core/glib-2.0 | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-core/glib-2.0')
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch | 17 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch | 14 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch | 70 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch | 29 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch | 39 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch | 20 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch | 30 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch | 13 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb (renamed from poky/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb) | 8 | ||||
-rw-r--r-- | poky/meta/recipes-core/glib-2.0/glib.inc | 25 |
10 files changed, 75 insertions, 190 deletions
diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch index aee96aaa6e..0ebf138d60 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Do-not-ignore-return-value-of-write.patch @@ -1,30 +1,30 @@ -From d6501b107940e9f548c89236d773c6d33c15a5c9 Mon Sep 17 00:00:00 2001 +From d250652782b65b071b7cc8f01f2db833df104e0e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 16 Apr 2016 13:28:59 -0700 -Subject: [PATCH 1/2] Do not ignore return value of write() +Subject: [PATCH] Do not ignore return value of write() gcc warns about ignoring return value when compiling with fortify turned on. assert when write() fails -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- Upstream-Status: Submitted +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- glib/tests/unix.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/glib/tests/unix.c b/glib/tests/unix.c -index 3543458..4e7ed85 100644 +index 9d55a6c..a07f945 100644 --- a/glib/tests/unix.c +++ b/glib/tests/unix.c @@ -32,14 +32,15 @@ test_pipe (void) GError *error = NULL; int pipefd[2]; char buf[1024]; -- ssize_t bytes_read; -+ ssize_t bytes_read, bytes_written; +- gssize bytes_read; ++ gssize bytes_read, bytes_written; gboolean res; res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); @@ -37,6 +37,3 @@ index 3543458..4e7ed85 100644 memset (buf, 0, sizeof (buf)); bytes_read = read (pipefd[0], buf, sizeof(buf) - 1); g_assert_cmpint (bytes_read, >, 0); --- -2.8.0 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch index 561d100209..97d0aff5d6 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch @@ -1,4 +1,4 @@ -From 80682c171ccb27d01343d4cfcfb4dd49b7863ccc Mon Sep 17 00:00:00 2001 +From 856045927b9ab391165c0ebabf401835f8439eab Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 22 Mar 2016 15:14:58 +0200 Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM @@ -8,24 +8,22 @@ renamer does not cope with library packages with files in ${bindir} Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Upstream-Status: Inappropriate [OE specific] + --- gio/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gio/Makefile.am b/gio/Makefile.am -index b7f91cc..4d81cc0 100644 +index e14cad2..bf2bcc7 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am -@@ -702,7 +702,8 @@ gio.def: libgio-2.0.la +@@ -835,7 +835,8 @@ gio.def: libgio-2.0.la gio-2.0.lib: libgio-2.0.la gio.def $(AM_V_GEN) lib.exe -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgio-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:$(builddir)/gio.def -out:$@ --bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings -+bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings +-bin_PROGRAMS = gio-querymodules glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop ++bin_PROGRAMS = glib-compile-schemas glib-compile-resources gsettings gio-launch-desktop +libexec_PROGRAMS = gio-querymodules glib_compile_resources_LDADD = libgio-2.0.la \ $(top_builddir)/gobject/libgobject-2.0.la \ --- -2.1.4 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch deleted file mode 100644 index c6e4966bb8..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/0001-Test-for-pthread_getname_np-before-using-it.patch +++ /dev/null @@ -1,70 +0,0 @@ -From f627fe16099a2b08d8b4e9023ae6b4f352451967 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 6 Nov 2016 08:59:08 -0800 -Subject: [PATCH] Test for pthread_getname_np before using it - -Its a GNU extention and not all libc implement it -musl e.g. implements the setname API but not getname -in any case, it seems to be safer to check for the -function before using it. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - config.h.in | 3 +++ - configure.ac | 10 ++++++++++ - glib/tests/thread.c | 2 +- - 3 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/config.h.in b/config.h.in -index 2c35ff1..da7ac30 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -326,6 +326,9 @@ - #undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP - - /* Have function pthread_setname_np(const char*) */ -+#undef HAVE_PTHREAD_GETNAME_NP -+ -+/* Have function pthread_setname_np(const char*) */ - #undef HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID - - /* Have function pthread_setname_np(pthread_t, const char*) */ -diff --git a/configure.ac b/configure.ac -index 4309671..209770a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2121,6 +2121,16 @@ AS_IF([ test x"$have_threads" = xposix], [ - AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP,1, - [Have function pthread_cond_timedwait_relative_np])], - [AC_MSG_RESULT(no)]) -+ dnl gets thread names -+ AC_MSG_CHECKING(for pthread_getname_np(pthread_t, char*, size_t)) -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include <pthread.h>], -+ [pthread_getname_np(pthread_self(),"example",0)])], -+ [AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_PTHREAD_GETNAME_NP,1, -+ [Have function pthread_setname_np(const char*)])], -+ [AC_MSG_RESULT(no)]) - dnl Sets thread names on OS X 10.6, iOS 3.2 (and higher) - AC_MSG_CHECKING(for pthread_setname_np(const char*)) - AC_LINK_IFELSE( -diff --git a/glib/tests/thread.c b/glib/tests/thread.c -index 5447836..2f248a6 100644 ---- a/glib/tests/thread.c -+++ b/glib/tests/thread.c -@@ -174,7 +174,7 @@ test_thread5 (void) - static gpointer - thread6_func (gpointer data) - { --#ifdef HAVE_PTHREAD_SETNAME_NP_WITH_TID -+#if defined(HAVE_PTHREAD_SETNAME_NP_WITH_TID) && defined(HAVE_PTHREAD_GETNAME_NP) - char name[16]; - - pthread_getname_np (pthread_self(), name, 16); --- -2.10.2 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch index b98f933dae..50781e7892 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/Enable-more-tests-while-cross-compiling.patch @@ -1,7 +1,7 @@ -From d762907d33b81cf7469b5696c87f2188d2050afb Mon Sep 17 00:00:00 2001 +From 4b1a6d247c78125096a6ea5ab3cab8a1f000dc23 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Mon, 9 Nov 2015 11:07:27 +0200 -Subject: [PATCH 06/10] Enable more tests while cross-compiling +Subject: [PATCH] Enable more tests while cross-compiling Upstream disables a few tests while cross-compiling because their build requires running other built binaries. This usually makes sense but in the cross-compile @@ -16,10 +16,10 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index acc1da4..9176640 100644 +index 1f0bed7..8295deb 100644 --- a/gio/tests/Makefile.am +++ b/gio/tests/Makefile.am -@@ -516,10 +516,9 @@ test_programs += \ +@@ -550,10 +550,9 @@ test_programs += \ endif # ----------------------------------------------------------------------------- @@ -32,7 +32,7 @@ index acc1da4..9176640 100644 test_programs += resources resources_SOURCES = resources.c nodist_resources_SOURCES = test_resources.c test_resources2.c test_resources2.h -@@ -543,7 +542,11 @@ if !ENABLE_INSTALLED_TESTS +@@ -578,7 +577,11 @@ if !ENABLE_INSTALLED_TESTS libresourceplugin_la_LDFLAGS += -rpath / endif @@ -44,7 +44,7 @@ index acc1da4..9176640 100644 test-generated.txt: test1.txt $(AM_V_GEN) echo "Generated" > $@ && \ -@@ -564,7 +567,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- +@@ -599,7 +602,6 @@ test.gresource: test.gresource.xml Makefile $(shell $(glib_compile_resources) -- EXTRA_DIST += test.gresource.xml test1.txt test2.gresource.xml test2.txt test3.gresource.xml test3.txt test4.gresource.xml CLEANFILES += test-generated.txt test_resources.c test_resources2.[ch] plugin_resources.c test.gresource @@ -53,10 +53,10 @@ index acc1da4..9176640 100644 BUILT_SOURCES += giotypefuncs.inc diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am -index 656941d..68555ff 100644 +index 0e60987..927d13a 100644 --- a/tests/gobject/Makefile.am +++ b/tests/gobject/Makefile.am -@@ -48,10 +48,13 @@ if ENABLE_TIMELOOP +@@ -51,10 +51,13 @@ if ENABLE_TIMELOOP installed_test_programs += timeloop-closure endif @@ -72,14 +72,9 @@ index 656941d..68555ff 100644 testmarshal.h: stamp-testmarshal.h @true -@@ -69,7 +72,6 @@ BUILT_SOURCES += testmarshal.h testmarshal.c - CLEANFILES += stamp-testmarshal.h +@@ -71,4 +74,3 @@ testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal) + BUILT_SOURCES += testmarshal.h testmarshal.c + CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c EXTRA_DIST += testcommon.h testmarshal.list - BUILT_EXTRA_DIST += testmarshal.h testmarshal.c -endif # !CROSS_COMPILING - - dist-hook: $(BUILT_EXTRA_DIST) - files='$(BUILT_EXTRA_DIST)'; \ --- -2.14.1 - +\ No newline at end of file diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch deleted file mode 100644 index 3d0c008bbe..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/allow-run-media-sdX-drive-mount-if-username-root.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c53e94a520b573aa0dcf12903e9563fe8badc34c Mon Sep 17 00:00:00 2001 -From: Marius Avram <marius.avram@intel.com> -Date: Wed, 27 Aug 2014 12:10:41 +0300 -Subject: [PATCH] Allow /run/media/sdX drive mount if username root - -In case that the username logged in the system is root -the drives are directly mounted in /run/media/sdX and -not /run/media/<username>/sdX as the function -g_unix_mount_guess_should_display() expects. - -Without this change USB stick mounts are not accesible from -graphical applications such as the File Manager (pcmanfm). - -Upstream-Status: Inappropriate - -Signed-off-by: Marius Avram <marius.avram@intel.com> ---- - gio/gunixmounts.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c -index 4999354..f6c1472 100644 ---- a/gio/gunixmounts.c -+++ b/gio/gunixmounts.c -@@ -2136,6 +2136,11 @@ g_unix_mount_guess_should_display (GUnixMountEntry *mount_entry) - mount_path[sizeof ("/run/media/") - 1 + user_name_len] == '/') - is_in_runtime_dir = TRUE; - -+ /* Allow no username in path in /run/media if current user is root */ -+ if (strcmp(user_name, "root") == 0 && -+ strncmp (mount_path, "/run/media/", sizeof("run/media")) == 0) -+ is_in_runtime_dir = TRUE; -+ - if (is_in_runtime_dir || g_str_has_prefix (mount_path, "/media/")) - { - char *path; --- -1.7.9.5 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch new file mode 100644 index 0000000000..dd0aff7281 --- /dev/null +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/date-lt.patch @@ -0,0 +1,20 @@ +Update Lithuanian month names in the test suite as glibc changed the translations. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/glib/merge_requests/373] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/glib/tests/date.c b/glib/tests/date.c +index b801ca704..6646c227c 100644 +--- a/glib/tests/date.c ++++ b/glib/tests/date.c +@@ -365,8 +365,8 @@ test_month_names (void) + TEST_DATE ( 1, 4, 2018, "%Y m. %OB", "2018 m. balandis"); + TEST_DATE ( 1, 5, 2018, "%Y m. %OB", "2018 m. gegužė"); + TEST_DATE ( 1, 6, 2018, "%Y m. %OB", "2018 m. birželis"); +- TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Lie 17 d."); +- TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. Rgp"); ++ TEST_DATE (17, 7, 2018, "%Y m. %b %e d.", "2018 m. Liep. 17 d."); ++ TEST_DATE ( 1, 8, 2018, "%Y m. %Ob", "2018 m. rugp."); + } + else + g_test_skip ("locale lt_LT not available, skipping Lithuanian month names test"); diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch deleted file mode 100644 index f3be02770c..0000000000 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/ptest-paths.patch +++ /dev/null @@ -1,30 +0,0 @@ -Instead of writing the temporary mapping files in the mappedfile test to the -user runtime directory, write them to $TMP. The runtime directory may not -currently exist if the test is executed on a non-desktop system and the test -doesn't attempt to create the directory structure. - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/glib/tests/mappedfile.c b/glib/tests/mappedfile.c -index 40e0e60..27a24be 100644 ---- a/glib/tests/mappedfile.c -+++ b/glib/tests/mappedfile.c -@@ -81,7 +81,7 @@ test_writable (void) - const gchar *new = "abcdefghijklmnopqrstuvxyz"; - gchar *tmp_copy_path; - -- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL); -+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL); - - g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error); - g_assert_no_error (error); -@@ -125,7 +125,7 @@ test_writable_fd (void) - int fd; - gchar *tmp_copy_path; - -- tmp_copy_path = g_build_filename (g_get_user_runtime_dir (), "glib-test-4096-random-bytes", NULL); -+ tmp_copy_path = g_build_filename (g_get_tmp_dir (), "glib-test-4096-random-bytes", NULL); - - g_file_get_contents (g_test_get_filename (G_TEST_DIST, "4096-random-bytes", NULL), &contents, &len, &error); - g_assert_no_error (error); diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch index 65d5b43f9b..f9794d3dd2 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch @@ -1,3 +1,8 @@ +From 8326961841f4d16c7239e747de11e3817c35cfd2 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Fri, 11 Mar 2016 15:35:55 +0000 +Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds + Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. @@ -8,12 +13,13 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> Port patch to 2.48 Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- gio/giomodule.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gio/giomodule.c b/gio/giomodule.c -index da7c167..cc0bc7c 100644 +index 36c0cef..912e490 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -40,6 +40,8 @@ @@ -25,7 +31,7 @@ index da7c167..cc0bc7c 100644 #endif #include <glib/gstdio.h> -@@ -1036,7 +1038,15 @@ get_gio_module_dir (void) +@@ -1099,7 +1101,15 @@ get_gio_module_dir (void) #endif g_free (install_dir); #else @@ -42,6 +48,3 @@ index da7c167..cc0bc7c 100644 #endif } --- -2.1.4 - diff --git a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb index faf594569d..1271a7c269 100644 --- a/poky/meta/recipes-core/glib-2.0/glib-2.0_2.54.3.bb +++ b/poky/meta/recipes-core/glib-2.0/glib-2.0_2.58.0.bb @@ -7,18 +7,16 @@ SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://run-ptest \ - file://ptest-paths.patch \ file://uclibc_musl_translation.patch \ - file://allow-run-media-sdX-drive-mount-if-username-root.patch \ file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ file://Enable-more-tests-while-cross-compiling.patch \ file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ file://0001-Do-not-ignore-return-value-of-write.patch \ - file://0001-Test-for-pthread_getname_np-before-using-it.patch \ file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ + file://date-lt.patch \ " SRC_URI_append_class-native = " file://relocate-modules.patch" -SRC_URI[md5sum] = "16e886ad677bf07b7d48eb8188bcf759" -SRC_URI[sha256sum] = "963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8" +SRC_URI[md5sum] = "9b5d21c802f55bf37171c4fbfe7d32d1" +SRC_URI[sha256sum] = "c0f4ce0730b4f95c47b711613b5406a887c2ee13ea6d25930d72a4fa7fdb77f6" diff --git a/poky/meta/recipes-core/glib-2.0/glib.inc b/poky/meta/recipes-core/glib-2.0/glib.inc index f645ed6f0c..e8215da583 100644 --- a/poky/meta/recipes-core/glib-2.0/glib.inc +++ b/poky/meta/recipes-core/glib-2.0/glib.inc @@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://glib/glib.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ file://gmodule/COPYING;md5=4fbd65380cdd255951079008b364516c \ file://gmodule/gmodule.h;beginline=4;endline=17;md5=b88abb7f3ad09607e71cb9d530155906 \ - file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ - file://glib/pcre/pcre.h;beginline=11;endline=35;md5=de27f2bf633d20a2b7af0b1983423283 \ + file://glib/pcre/pcre.h;beginline=8;endline=36;md5=3e2977dae4ad05217f58c446237298fc \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" BUGTRACKER = "http://bugzilla.gnome.org" SECTION = "libs" @@ -39,8 +38,9 @@ PACKAGECONFIG ??= "system-pcre libmount" PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre" PACKAGECONFIG[libmount] = "--enable-libmount,--disable-libmount,util-linux" PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" +PACKAGECONFIG[libelf] = "--enable-libelf,--disable-libelf,elfutils" -CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" +CORECONF = "--disable-dtrace --disable-fam --disable-systemtap" PRINTF = "--enable-included-printf=no" PRINTF_darwin = "--enable-included-printf=yes" @@ -86,10 +86,10 @@ ARM_INSTRUCTION_SET_armv5 = "arm" CPPFLAGS_append_class-target_mips16e = " -DNVALGRIND=1" # GLib generally requires gettext to be present so for USE_NLS to yes. For -# native builds as i18n is disabled globally we can tell it to use a fake msgfmt. +# native builds as i18n is disabled globally we have to add a gettext-native dependency. USE_NLS_class-target = "yes" USE_NLS_class-nativesdk = "yes" -CACHED_CONFIGUREVARS_append_class-native = " ac_cv_path_MSGFMT=/bin/false" +DEPENDS_append_class-native = " gettext-native" EXEEXT = "" EXEEXT_mingw32 = ".exe" @@ -116,7 +116,7 @@ do_install_append () { do_install_append_class-target () { # Tests are only installed on targets, not native builds. Separating this out - # keeps glib-2.0-native from depending on ${DISTRO_FEATURES} + # keeps glib-2.0-native from depending on DISTRO_FEATURES if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then if ${@bb.utils.contains("DISTRO_FEATURES", "x11", "false", "true", d)}; then rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test @@ -140,6 +140,8 @@ RDEPENDS_${PN}-ptest += "\ shared-mime-info \ " +# When https://gitlab.gnome.org/GNOME/glib/issues/1343 is +# fixed add locale-base-pl-pl RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-gconv-utf-16 \ glibc-charmap-utf-8 \ @@ -152,6 +154,17 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\ glibc-gconv-iso8859-15 \ glibc-charmap-invariant \ glibc-localedata-translit-cjk-variants \ + locale-base-tr-tr \ + locale-base-lt-lt \ + locale-base-ja-jp.euc-jp \ + locale-base-fa-ir \ + locale-base-ru-ru \ + locale-base-de-de \ + locale-base-hr-hr \ + locale-base-el-gr \ + locale-base-fr-fr \ + locale-base-es-es \ + locale-base-en-gb \ " INSANE_SKIP_${PN}-ptest += "libdir" |