diff options
Diffstat (limited to 'meta/recipes-core/glib-networking')
3 files changed, 81 insertions, 36 deletions
diff --git a/meta/recipes-core/glib-networking/glib-networking/eagain.patch b/meta/recipes-core/glib-networking/glib-networking/eagain.patch new file mode 100644 index 0000000000..6c2e3c634b --- /dev/null +++ b/meta/recipes-core/glib-networking/glib-networking/eagain.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From 5604707bed4b4a4bc4658c7158a18c1774775775 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Sat, 6 May 2023 12:18:50 +0100 | ||
4 | Subject: [PATCH] In autobuilder testing we regularly see glib-networking ptest | ||
5 | fail with: | ||
6 | |||
7 | GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27) | ||
8 | Bail out! GLib-Net:ERROR:/usr/src/debug/glib-networking/2.74.0-r0/tls/tests/connection.c:1944:simul_read_thread: assertion failed (error == NULL): Resource temporarily unavailable (g-io-error-quark, 27) | ||
9 | FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6) | ||
10 | SUMMARY: total=4; passed=3; skipped=0; failed=1; user=0.9s; system=0.4s; maxrss=10708 | ||
11 | FAIL: glib-networking/connection-openssl.test (Child process killed by signal 6) | ||
12 | |||
13 | The test should probably retry in this situation so test a patch which does this. | ||
14 | |||
15 | Upstream-Status: Pending [testing to see if patch resolves the issue] | ||
16 | |||
17 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
18 | --- | ||
19 | tls/tests/connection.c | 4 ++++ | ||
20 | 1 file changed, 4 insertions(+) | ||
21 | |||
22 | diff --git a/tls/tests/connection.c b/tls/tests/connection.c | ||
23 | index 62a7fbb..3447c80 100644 | ||
24 | --- a/tls/tests/connection.c | ||
25 | +++ b/tls/tests/connection.c | ||
26 | @@ -2210,6 +2210,10 @@ simul_read_thread (gpointer user_data) | ||
27 | test->buf + test->nread, | ||
28 | MIN (TEST_DATA_LENGTH / 2, TEST_DATA_LENGTH - test->nread), | ||
29 | NULL, &error); | ||
30 | + | ||
31 | + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) | ||
32 | + continue; | ||
33 | + | ||
34 | g_assert_no_error (error); | ||
35 | |||
36 | test->nread += nread; | ||
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.66.0.bb b/meta/recipes-core/glib-networking/glib-networking_2.66.0.bb deleted file mode 100644 index 230932daf0..0000000000 --- a/meta/recipes-core/glib-networking/glib-networking_2.66.0.bb +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | SUMMARY = "GLib networking extensions" | ||
2 | DESCRIPTION = "glib-networking contains the implementations of certain GLib networking features that cannot be implemented directly in GLib itself because of their dependencies." | ||
3 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" | ||
4 | BUGTRACKER = "http://bugzilla.gnome.org" | ||
5 | |||
6 | LICENSE = "LGPLv2.1" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | ||
8 | |||
9 | SECTION = "libs" | ||
10 | DEPENDS = "glib-2.0" | ||
11 | |||
12 | SRC_URI[archive.sha256sum] = "c5d7be2437fdd196eebfb70c4517b96d3ba7ec13bd496318b8f02dea383e0099" | ||
13 | |||
14 | PACKAGECONFIG ??= "gnutls ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | ||
15 | |||
16 | PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" | ||
17 | PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" | ||
18 | PACKAGECONFIG[libproxy] = "-Dlibproxy=enabled,-Dlibproxy=disabled,libproxy" | ||
19 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" | ||
20 | |||
21 | EXTRA_OEMESON = "-Dgnome_proxy=disabled" | ||
22 | |||
23 | GNOMEBASEBUILDCLASS = "meson" | ||
24 | inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome | ||
25 | |||
26 | SRC_URI += "file://run-ptest" | ||
27 | |||
28 | FILES_${PN} += "\ | ||
29 | ${libdir}/gio/modules/libgio*.so \ | ||
30 | ${datadir}/dbus-1/services/ \ | ||
31 | ${systemd_user_unitdir} \ | ||
32 | " | ||
33 | FILES_${PN}-dev += "${libdir}/gio/modules/libgio*.la" | ||
34 | FILES_${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" | ||
35 | |||
36 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb b/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb new file mode 100644 index 0000000000..5060d9fd7a --- /dev/null +++ b/meta/recipes-core/glib-networking/glib-networking_2.78.1.bb | |||
@@ -0,0 +1,45 @@ | |||
1 | SUMMARY = "GLib networking extensions" | ||
2 | DESCRIPTION = "glib-networking contains the implementations of certain GLib networking features that cannot be implemented directly in GLib itself because of their dependencies." | ||
3 | HOMEPAGE = "https://gitlab.gnome.org/GNOME/glib-networking/" | ||
4 | BUGTRACKER = "http://bugzilla.gnome.org" | ||
5 | |||
6 | LICENSE = "LGPL-2.1-or-later" | ||
7 | LICENSE:append = "${@bb.utils.contains('PACKAGECONFIG', 'openssl', ' & Glib-Networking-OpenSSL-Exception', '', d)}" | ||
8 | NO_GENERIC_LICENSE[Glib-Networking-OpenSSL-Exception] = "LICENSE_EXCEPTION" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | ||
11 | file://LICENSE_EXCEPTION;md5=0f5be697951b5e71aff00f4a4ce66be8 \ | ||
12 | file://tls/base/gtlsconnection-base.c;beginline=7;endline=22;md5=ab641ac307f3337811008ea9afe7059f" | ||
13 | |||
14 | SECTION = "libs" | ||
15 | DEPENDS = "glib-2.0-native glib-2.0" | ||
16 | |||
17 | SRC_URI[archive.sha256sum] = "e48f2ddbb049832cbb09230529c5e45daca9f0df0eda325f832f7379859bf09f" | ||
18 | |||
19 | # Upstream note that for the openssl backend, half the tests where this backend don't return | ||
20 | # the expected error code or don't work as expected so default to gnutls | ||
21 | PACKAGECONFIG ??= "gnutls environment ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | ||
22 | |||
23 | PACKAGECONFIG[gnutls] = "-Dgnutls=enabled,-Dgnutls=disabled,gnutls" | ||
24 | PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl" | ||
25 | PACKAGECONFIG[environment] = "-Denvironment_proxy=enabled,-Denvironment_proxy=disabled" | ||
26 | PACKAGECONFIG[libproxy] = "-Dlibproxy=enabled,-Dlibproxy=disabled,libproxy" | ||
27 | PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" | ||
28 | PACKAGECONFIG[gnomeproxy] = "-Dgnome_proxy=enabled,-Dgnome_proxy=disabled,gsettings-desktop-schemas" | ||
29 | |||
30 | inherit gnomebase gettext upstream-version-is-even gio-module-cache ptest-gnome | ||
31 | |||
32 | SRC_URI += "file://run-ptest" | ||
33 | SRC_URI += "file://eagain.patch" | ||
34 | |||
35 | FILES:${PN} += "\ | ||
36 | ${libdir}/gio/modules/libgio*.so \ | ||
37 | ${datadir}/dbus-1/services/ \ | ||
38 | ${systemd_user_unitdir} \ | ||
39 | " | ||
40 | FILES:${PN}-dev += "${libdir}/gio/modules/libgio*.la" | ||
41 | FILES:${PN}-staticdev += "${libdir}/gio/modules/libgio*.a" | ||
42 | |||
43 | RDEPENDS:${PN}-ptest += "bash" | ||
44 | |||
45 | BBCLASSEXTEND = "native nativesdk" | ||