diff options
Diffstat (limited to 'meta/recipes-support')
44 files changed, 511 insertions, 241 deletions
diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index a274f3a16e..b46dc76a86 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch | |||
@@ -7,7 +7,7 @@ The disabled tests rely on timing to pass correctly. On a virtualized | |||
7 | system under heavy load, these tests randomly fail because they miss | 7 | system under heavy load, these tests randomly fail because they miss |
8 | a timer or other timing related issues. | 8 | a timer or other timing related issues. |
9 | 9 | ||
10 | Upstream-Status: Pending | 10 | Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] |
11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> | 11 | Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> |
12 | 12 | ||
13 | --- | 13 | --- |
diff --git a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch b/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch deleted file mode 100644 index 8760b0140c..0000000000 --- a/meta/recipes-support/apr/apr/0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | From c6afc4a4a766478cb6aa6b43a50051881b6318d7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 3 Mar 2017 22:24:17 +0100 | ||
4 | Subject: [PATCH 7/7] explicitly link libapr against phtread to make gold happy | ||
5 | on test | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_init' | ||
11 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_settype' | ||
12 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutexattr_destroy' | ||
13 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_mutex_trylock' | ||
14 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_attr_setstacksize' | ||
15 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_create' | ||
16 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_join' | ||
17 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_detach' | ||
18 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_sigmask' | ||
19 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_once' | ||
20 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_create' | ||
21 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_getspecific' | ||
22 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_key_delete' | ||
23 | | ../.libs/libapr-1.so: error: undefined reference to 'pthread_setspecific' | ||
24 | | collect2: error: ld returned 1 exit status | ||
25 | | Makefile:114: recipe for target 'globalmutexchild' failed | ||
26 | | make[1]: *** [globalmutexchild] Error 1 | ||
27 | | make[1]: Leaving directory '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/apr/1.5.2-r0/apr-1.5.2/test' | ||
28 | |||
29 | Upstream-Status: Pending | ||
30 | |||
31 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
32 | --- | ||
33 | configure.in | 1 + | ||
34 | 1 file changed, 1 insertion(+) | ||
35 | |||
36 | diff --git a/configure.in b/configure.in | ||
37 | index a227e72..cbc0f90 100644 | ||
38 | --- a/configure.in | ||
39 | +++ b/configure.in | ||
40 | @@ -784,6 +784,7 @@ else | ||
41 | APR_PTHREADS_CHECK_RESTORE ] ) | ||
42 | fi | ||
43 | if test "$pthreadh" = "1"; then | ||
44 | + APR_ADDTO(LIBS,[-lpthread]) | ||
45 | APR_CHECK_PTHREAD_GETSPECIFIC_TWO_ARGS | ||
46 | APR_CHECK_PTHREAD_ATTR_GETDETACHSTATE_ONE_ARG | ||
47 | APR_CHECK_PTHREAD_RECURSIVE_MUTEX | ||
48 | -- | ||
49 | 1.8.3.1 | ||
50 | |||
diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.4.bb index d322629b66..4df741c766 100644 --- a/meta/recipes-support/apr/apr_1.7.4.bb +++ b/meta/recipes-support/apr/apr_1.7.4.bb | |||
@@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ | |||
18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ | 18 | file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ |
19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ | 19 | file://0004-Fix-packet-discards-HTTP-redirect.patch \ |
20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ | 20 | file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ |
21 | file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \ | ||
22 | file://libtoolize_check.patch \ | 21 | file://libtoolize_check.patch \ |
23 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ | 22 | file://0001-Add-option-to-disable-timed-dependant-tests.patch \ |
24 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ | 23 | file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ |
diff --git a/meta/recipes-support/atk/at-spi2-core_2.50.1.bb b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb index 6996ebebcd..913b408403 100644 --- a/meta/recipes-support/atk/at-spi2-core_2.50.1.bb +++ b/meta/recipes-support/atk/at-spi2-core_2.52.0.bb | |||
@@ -7,11 +7,13 @@ BUGTRACKER = "http://bugzilla.gnome.org/" | |||
7 | LICENSE = "LGPL-2.1-or-later" | 7 | LICENSE = "LGPL-2.1-or-later" |
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" |
9 | 9 | ||
10 | CVE_PRODUCT += "at-spi2-atk" | ||
11 | |||
10 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | 12 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" |
11 | 13 | ||
12 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" | 14 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" |
13 | 15 | ||
14 | SRC_URI[sha256sum] = "5727b5c0687ac57ba8040e79bd6731b714a36b8fcf32190f236b8fb3698789e7" | 16 | SRC_URI[sha256sum] = "0ac3fc8320c8d01fa147c272ba7fa03806389c6b03d3c406d0823e30e35ff5ab" |
15 | 17 | ||
16 | DEPENDS = " \ | 18 | DEPENDS = " \ |
17 | dbus \ | 19 | dbus \ |
diff --git a/meta/recipes-support/attr/attr_2.5.1.bb b/meta/recipes-support/attr/attr_2.5.1.bb deleted file mode 100644 index 5c5f7bcffb..0000000000 --- a/meta/recipes-support/attr/attr_2.5.1.bb +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | require attr.inc | ||
2 | |||
3 | SRC_URI[sha256sum] = "bae1c6949b258a0d68001367ce0c741cebdacdd3b62965d17e5eb23cd78adaf8" | ||
4 | |||
5 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.5.2.bb new file mode 100644 index 0000000000..2110c6d885 --- /dev/null +++ b/meta/recipes-support/attr/attr_2.5.2.bb | |||
@@ -0,0 +1,5 @@ | |||
1 | require attr.inc | ||
2 | |||
3 | SRC_URI[sha256sum] = "39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87" | ||
4 | |||
5 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/bash-completion/bash-completion_2.12.0.bb b/meta/recipes-support/bash-completion/bash-completion_2.13.0.bb index 66f65f565c..f75d61e219 100644 --- a/meta/recipes-support/bash-completion/bash-completion_2.12.0.bb +++ b/meta/recipes-support/bash-completion/bash-completion_2.13.0.bb | |||
@@ -14,7 +14,7 @@ SECTION = "console/utils" | |||
14 | 14 | ||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" |
16 | 16 | ||
17 | SRC_URI[sha256sum] = "3eb05b1783c339ef59ed576afb0f678fa4ef49a6de8a696397df3148f8345af9" | 17 | SRC_URI[sha256sum] = "c5f99a39e40f0d154c03ff15438e87ece1f5ac666336a4459899e2ff4bedf3d1" |
18 | GITHUB_BASE_URI = "https://github.com/scop/bash-completion/releases" | 18 | GITHUB_BASE_URI = "https://github.com/scop/bash-completion/releases" |
19 | 19 | ||
20 | PARALLEL_MAKE = "" | 20 | PARALLEL_MAKE = "" |
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb index 346bd60e4d..0f2153d493 100644 --- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb +++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb | |||
@@ -31,6 +31,9 @@ PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/s | |||
31 | PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" | 31 | PACKAGECONFIG[polkit] = "--with-polkit,--without-polkit,polkit" |
32 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir=" | 32 | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir}/,--with-systemdsystemunitdir=" |
33 | 33 | ||
34 | # Fails to build with GCC14 with incompatible pointer error warning being treated as error | ||
35 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
36 | |||
34 | FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ | 37 | FILES:${PN} += "${exec_prefix}/lib/ConsoleKit \ |
35 | ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ | 38 | ${libdir}/ConsoleKit ${systemd_unitdir} ${base_libdir} \ |
36 | ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" | 39 | ${datadir}/dbus-1 ${datadir}/PolicyKit ${datadir}/polkit*" |
diff --git a/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch new file mode 100644 index 0000000000..98f7db93e8 --- /dev/null +++ b/meta/recipes-support/curl/curl/721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From 721941aadf4adf4f6aeb3f4c0ab489bb89610c36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Stefan Eissing <stefan@eissing.org> | ||
3 | Date: Mon, 1 Apr 2024 15:41:18 +0200 | ||
4 | Subject: [PATCH] http: with chunked POST forced, disable length check on read | ||
5 | callback | ||
6 | |||
7 | - when an application forces HTTP/1.1 chunked transfer encoding | ||
8 | by setting the corresponding header and instructs curl to use | ||
9 | the CURLOPT_READFUNCTION, disregard any POST length information. | ||
10 | - this establishes backward compatibility with previous curl versions | ||
11 | |||
12 | Applications are encouraged to not force "chunked", but rather | ||
13 | set length information for a POST. By setting -1, curl will | ||
14 | auto-select chunked on HTTP/1.1 and work properly on other HTTP | ||
15 | versions. | ||
16 | |||
17 | Reported-by: Jeff King | ||
18 | Fixes #13229 | ||
19 | Closes #13257 | ||
20 | Upstream-Status: Backport | ||
21 | --- | ||
22 | lib/http.c | 22 ++++++++++++++++++++-- | ||
23 | 1 file changed, 20 insertions(+), 2 deletions(-) | ||
24 | |||
25 | diff --git a/lib/http.c b/lib/http.c | ||
26 | index 92c04e69cd8373..a764d3c4403c39 100644 | ||
27 | --- a/lib/http.c | ||
28 | +++ b/lib/http.c | ||
29 | @@ -2046,8 +2046,19 @@ static CURLcode set_reader(struct Curl_easy *data, Curl_HttpReq httpreq) | ||
30 | else | ||
31 | result = Curl_creader_set_null(data); | ||
32 | } | ||
33 | - else { /* we read the bytes from the callback */ | ||
34 | - result = Curl_creader_set_fread(data, postsize); | ||
35 | + else { | ||
36 | + /* we read the bytes from the callback. In case "chunked" encoding | ||
37 | + * is forced by the application, we disregard `postsize`. This is | ||
38 | + * a backward compatibility decision to earlier versions where | ||
39 | + * chunking disregarded this. See issue #13229. */ | ||
40 | + bool chunked = FALSE; | ||
41 | + char *ptr = Curl_checkheaders(data, STRCONST("Transfer-Encoding")); | ||
42 | + if(ptr) { | ||
43 | + /* Some kind of TE is requested, check if 'chunked' is chosen */ | ||
44 | + chunked = Curl_compareheader(ptr, STRCONST("Transfer-Encoding:"), | ||
45 | + STRCONST("chunked")); | ||
46 | + } | ||
47 | + result = Curl_creader_set_fread(data, chunked? -1 : postsize); | ||
48 | } | ||
49 | return result; | ||
50 | |||
51 | @@ -2115,6 +2126,13 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, | ||
52 | data->req.upload_chunky = | ||
53 | Curl_compareheader(ptr, | ||
54 | STRCONST("Transfer-Encoding:"), STRCONST("chunked")); | ||
55 | + if(data->req.upload_chunky && | ||
56 | + Curl_use_http_1_1plus(data, data->conn) && | ||
57 | + (data->conn->httpversion >= 20)) { | ||
58 | + infof(data, "suppressing chunked transfer encoding on connection " | ||
59 | + "using HTTP version 2 or higher"); | ||
60 | + data->req.upload_chunky = FALSE; | ||
61 | + } | ||
62 | } | ||
63 | else { | ||
64 | curl_off_t req_clen = Curl_creader_total_length(data); | ||
diff --git a/meta/recipes-support/curl/curl/no-test-timeout.patch b/meta/recipes-support/curl/curl/no-test-timeout.patch index b4cfe716db..7122b6f043 100644 --- a/meta/recipes-support/curl/curl/no-test-timeout.patch +++ b/meta/recipes-support/curl/curl/no-test-timeout.patch | |||
@@ -1,10 +1,17 @@ | |||
1 | Set the max-time timeout to 600 so the timeout is 10 minutes instead of 13 seconds. | 1 | From 42cddb52e821cfc2f09f1974742714e5f2f1856e Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Fri, 15 Mar 2024 14:37:37 +0000 | ||
4 | Subject: [PATCH] Set the max-time timeout to 600 so the timeout is 10 minutes | ||
5 | instead of 13 seconds. | ||
2 | 6 | ||
3 | Upstream-Status: Inappropriate | 7 | Upstream-Status: Inappropriate |
4 | Signed-off-by: Ross Burton <ross.burton@arm.com> | 8 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
9 | --- | ||
10 | tests/servers.pm | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
5 | 12 | ||
6 | diff --git a/tests/servers.pm b/tests/servers.pm | 13 | diff --git a/tests/servers.pm b/tests/servers.pm |
7 | index d4472d509..aeab62c47 100644 | 14 | index d4472d5..9999938 100644 |
8 | --- a/tests/servers.pm | 15 | --- a/tests/servers.pm |
9 | +++ b/tests/servers.pm | 16 | +++ b/tests/servers.pm |
10 | @@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string | 17 | @@ -120,7 +120,7 @@ my $sshdverstr; # for socks server, ssh daemon version string |
diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest index acd2892f80..3d25f3d90b 100644 --- a/meta/recipes-support/curl/curl/run-ptest +++ b/meta/recipes-support/curl/curl/run-ptest | |||
@@ -8,4 +8,4 @@ cd tests | |||
8 | # Run four tests in parallel | 8 | # Run four tests in parallel |
9 | # Print log output on failure | 9 | # Print log output on failure |
10 | # Don't run the flaky or timing dependent tests | 10 | # Don't run the flaky or timing dependent tests |
11 | ./runtests.pl -a -n -am -j4 -p '!flaky !timing-dependent' | 11 | ./runtests.pl -a -n -am -j4 -p !flaky !timing-dependent |
diff --git a/meta/recipes-support/curl/curl_8.6.0.bb b/meta/recipes-support/curl/curl_8.7.1.bb index ea69164d76..c74416d7e9 100644 --- a/meta/recipes-support/curl/curl_8.6.0.bb +++ b/meta/recipes-support/curl/curl_8.7.1.bb | |||
@@ -11,11 +11,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eed2e5088e1ac619c9a1c747da291d75" | |||
11 | 11 | ||
12 | SRC_URI = " \ | 12 | SRC_URI = " \ |
13 | https://curl.se/download/${BP}.tar.xz \ | 13 | https://curl.se/download/${BP}.tar.xz \ |
14 | file://721941aadf4adf4f6aeb3f4c0ab489bb89610c36.patch \ | ||
14 | file://run-ptest \ | 15 | file://run-ptest \ |
15 | file://disable-tests \ | 16 | file://disable-tests \ |
16 | file://no-test-timeout.patch \ | 17 | file://no-test-timeout.patch \ |
17 | " | 18 | " |
18 | SRC_URI[sha256sum] = "3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15" | 19 | SRC_URI[sha256sum] = "6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd" |
19 | 20 | ||
20 | # Curl has used many names over the years... | 21 | # Curl has used many names over the years... |
21 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" | 22 | CVE_PRODUCT = "haxx:curl haxx:libcurl curl:curl curl:libcurl libcurl:libcurl daniel_stenberg:curl" |
@@ -79,7 +80,7 @@ EXTRA_OECONF = " \ | |||
79 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ | 80 | ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls openssl', d) == '') else ''} \ |
80 | " | 81 | " |
81 | 82 | ||
82 | do_install:append:class-target() { | 83 | fix_absolute_paths () { |
83 | # cleanup buildpaths from curl-config | 84 | # cleanup buildpaths from curl-config |
84 | sed -i \ | 85 | sed -i \ |
85 | -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ | 86 | -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ |
@@ -89,6 +90,14 @@ do_install:append:class-target() { | |||
89 | ${D}${bindir}/curl-config | 90 | ${D}${bindir}/curl-config |
90 | } | 91 | } |
91 | 92 | ||
93 | do_install:append:class-target() { | ||
94 | fix_absolute_paths | ||
95 | } | ||
96 | |||
97 | do_install:append:class-nativesdk() { | ||
98 | fix_absolute_paths | ||
99 | } | ||
100 | |||
92 | do_compile_ptest() { | 101 | do_compile_ptest() { |
93 | oe_runmake -C ${B}/tests | 102 | oe_runmake -C ${B}/tests |
94 | } | 103 | } |
diff --git a/meta/recipes-support/debianutils/debianutils_5.16.bb b/meta/recipes-support/debianutils/debianutils_5.17.bb index ec629d8b73..c5f25bae40 100644 --- a/meta/recipes-support/debianutils/debianutils_5.16.bb +++ b/meta/recipes-support/debianutils/debianutils_5.17.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://debian/copyright;md5=4b667f30411d21bc8fd7db85d502a8e9 | |||
11 | SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \ | 11 | SRC_URI = "git://salsa.debian.org/debian/debianutils.git;protocol=https;branch=master \ |
12 | " | 12 | " |
13 | 13 | ||
14 | SRCREV = "9e0facf19b17b6d090a5dcc8cacb0c16e5ad9f72" | 14 | SRCREV = "baf12e98a02883d1b76081e32f2185ee3497570b" |
15 | 15 | ||
16 | inherit autotools update-alternatives | 16 | inherit autotools update-alternatives |
17 | 17 | ||
diff --git a/meta/recipes-support/diffoscope/diffoscope_259.bb b/meta/recipes-support/diffoscope/diffoscope_265.bb index eca2c208fc..6af5abc974 100644 --- a/meta/recipes-support/diffoscope/diffoscope_259.bb +++ b/meta/recipes-support/diffoscope/diffoscope_265.bb | |||
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope" | |||
12 | 12 | ||
13 | inherit pypi setuptools3 | 13 | inherit pypi setuptools3 |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "c1f14452467f84c4be804a3725cbfdd5eadf977ece7ad463be8b647d1a87fb42" | 15 | SRC_URI[sha256sum] = "7bdcbd7fc5bc4c821bf6ab5ffbbeb265103b04e6908ea4bb12144d7e5ca002ff" |
16 | 16 | ||
17 | RDEPENDS:${PN} += "\ | 17 | RDEPENDS:${PN} += "\ |
18 | binutils \ | 18 | binutils \ |
diff --git a/meta/recipes-support/enchant/enchant2_2.6.7.bb b/meta/recipes-support/enchant/enchant2_2.7.2.bb index b31bdc422b..08998dd48f 100644 --- a/meta/recipes-support/enchant/enchant2_2.6.7.bb +++ b/meta/recipes-support/enchant/enchant2_2.7.2.bb | |||
@@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 groff-native" | |||
12 | inherit autotools pkgconfig github-releases | 12 | inherit autotools pkgconfig github-releases |
13 | 13 | ||
14 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" | 14 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/enchant-${PV}.tar.gz" |
15 | SRC_URI[sha256sum] = "a1c2e5b59acca000bbfb24810af4a1165733d407f2154786588e076c8cd57bfc" | 15 | SRC_URI[sha256sum] = "7cc3400a6657974a740b6e3c2568e2935c70e5302f07fadb2095366b75ecad6f" |
16 | 16 | ||
17 | GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" | 17 | GITHUB_BASE_URI = "https://github.com/AbiWord/enchant/releases" |
18 | 18 | ||
diff --git a/meta/recipes-support/gmp/gmp_6.3.0.bb b/meta/recipes-support/gmp/gmp_6.3.0.bb index 3dbcd68b5c..fd4aec92fd 100644 --- a/meta/recipes-support/gmp/gmp_6.3.0.bb +++ b/meta/recipes-support/gmp/gmp_6.3.0.bb | |||
@@ -29,13 +29,21 @@ do_install:append() { | |||
29 | oe_multilib_header gmp.h | 29 | oe_multilib_header gmp.h |
30 | } | 30 | } |
31 | 31 | ||
32 | do_install:prepend:class-target() { | 32 | fix_absolute_paths () { |
33 | sed -i \ | 33 | sed -i \ |
34 | -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ | 34 | -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ |
35 | -e "s|${DEBUG_PREFIX_MAP}||g" \ | 35 | -e "s|${DEBUG_PREFIX_MAP}||g" \ |
36 | ${B}/gmp.h | 36 | ${B}/gmp.h |
37 | } | 37 | } |
38 | 38 | ||
39 | do_install:prepend:class-target() { | ||
40 | fix_absolute_paths | ||
41 | } | ||
42 | |||
43 | do_install:prepend:class-nativesdk() { | ||
44 | fix_absolute_paths | ||
45 | } | ||
46 | |||
39 | SSTATE_SCAN_FILES += "gmp.h" | 47 | SSTATE_SCAN_FILES += "gmp.h" |
40 | 48 | ||
41 | # Doesn't compile in MIPS16e mode due to use of hand-written | 49 | # Doesn't compile in MIPS16e mode due to use of hand-written |
diff --git a/meta/recipes-support/gnupg/gnupg_2.4.4.bb b/meta/recipes-support/gnupg/gnupg_2.4.5.bb index fff7d8c6da..99996968b1 100644 --- a/meta/recipes-support/gnupg/gnupg_2.4.4.bb +++ b/meta/recipes-support/gnupg/gnupg_2.4.5.bb | |||
@@ -23,7 +23,7 @@ SRC_URI:append:class-native = " file://0001-configure.ac-use-a-custom-value-for- | |||
23 | file://relocate.patch" | 23 | file://relocate.patch" |
24 | SRC_URI:append:class-nativesdk = " file://relocate.patch" | 24 | SRC_URI:append:class-nativesdk = " file://relocate.patch" |
25 | 25 | ||
26 | SRC_URI[sha256sum] = "67ebe016ca90fa7688ce67a387ebd82c6261e95897db7b23df24ff335be85bc6" | 26 | SRC_URI[sha256sum] = "f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277" |
27 | 27 | ||
28 | EXTRA_OECONF = "--disable-ldap \ | 28 | EXTRA_OECONF = "--disable-ldap \ |
29 | --disable-ccid-driver \ | 29 | --disable-ccid-driver \ |
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch index 4bdc40d932..d13bfee8ef 100644 --- a/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch +++ b/meta/recipes-support/gnutls/gnutls/0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 21a8295bac3805e4490ba2b5f136e7f4c121061b Mon Sep 17 00:00:00 2001 | 1 | From 7be8ec59a53e93c2bd453b3ba2d63d1b300ef11f Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@fujitsu.com> | 2 | From: Lei Maohui <leimaohui@fujitsu.com> |
3 | Date: Mon, 23 May 2022 10:44:43 +0900 | 3 | Date: Mon, 23 May 2022 10:44:43 +0900 |
4 | Subject: [PATCH] Creating .hmac file should be excuted in target environment, | 4 | Subject: [PATCH] Creating .hmac file should be excuted in target environment, |
@@ -6,16 +6,15 @@ Subject: [PATCH] Creating .hmac file should be excuted in target environment, | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] | 7 | Upstream-Status: Inappropriate [https://gitlab.com/gnutls/gnutls/-/issues/1373] |
8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> | 8 | Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> |
9 | |||
10 | --- | 9 | --- |
11 | lib/Makefile.am | 3 +-- | 10 | lib/Makefile.am | 3 +-- |
12 | 1 file changed, 1 insertion(+), 2 deletions(-) | 11 | 1 file changed, 1 insertion(+), 2 deletions(-) |
13 | 12 | ||
14 | diff --git a/lib/Makefile.am b/lib/Makefile.am | 13 | diff --git a/lib/Makefile.am b/lib/Makefile.am |
15 | index 6d4e8d2..24ef108 100644 | 14 | index a50d311..193ea19 100644 |
16 | --- a/lib/Makefile.am | 15 | --- a/lib/Makefile.am |
17 | +++ b/lib/Makefile.am | 16 | +++ b/lib/Makefile.am |
18 | @@ -206,8 +206,7 @@ hmac_file = .libs/.$(gnutls_so).hmac | 17 | @@ -198,8 +198,7 @@ hmac_file = .libs/.$(gnutls_so).hmac |
19 | 18 | ||
20 | all-local: $(hmac_file) | 19 | all-local: $(hmac_file) |
21 | 20 | ||
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch new file mode 100644 index 0000000000..cc39f5c9a5 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch | |||
@@ -0,0 +1,269 @@ | |||
1 | From 2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d Mon Sep 17 00:00:00 2001 | ||
2 | From: Zoltan Fridrich <zfridric@redhat.com> | ||
3 | Date: Wed, 10 Apr 2024 12:51:33 +0200 | ||
4 | Subject: [PATCH] Fix RSAES-PKCS1-v1_5 system-wide configuration | ||
5 | |||
6 | Upstream-Status: Backport [expected for 3.8.6 https://gitlab.com/gnutls/gnutls/-/merge_requests/1830?commit_id=2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d] | ||
7 | |||
8 | Signed-off-by: Simone Weiß <simone.p.weiss@posteo.com> | ||
9 | Signed-off-by: Zoltan Fridrich <zfridric@redhat.com> | ||
10 | --- | ||
11 | lib/priority.c | 125 +++++++++++------- | ||
12 | ...system-override-allow-rsa-pkcs1-encrypt.sh | 27 +++- | ||
13 | 2 files changed, 96 insertions(+), 56 deletions(-) | ||
14 | |||
15 | diff --git a/lib/priority.c b/lib/priority.c | ||
16 | index 8abe00d1ff..3434619aad 100644 | ||
17 | --- a/lib/priority.c | ||
18 | +++ b/lib/priority.c | ||
19 | @@ -1018,6 +1018,12 @@ struct cfg { | ||
20 | bool force_ext_master_secret_set; | ||
21 | }; | ||
22 | |||
23 | +static inline void cfg_init(struct cfg *cfg) | ||
24 | +{ | ||
25 | + memset(cfg, 0, sizeof(*cfg)); | ||
26 | + cfg->allow_rsa_pkcs1_encrypt = true; | ||
27 | +} | ||
28 | + | ||
29 | static inline void cfg_deinit(struct cfg *cfg) | ||
30 | { | ||
31 | if (cfg->priority_strings) { | ||
32 | @@ -1095,6 +1101,12 @@ struct ini_ctx { | ||
33 | size_t curves_size; | ||
34 | }; | ||
35 | |||
36 | +static inline void ini_ctx_init(struct ini_ctx *ctx) | ||
37 | +{ | ||
38 | + memset(ctx, 0, sizeof(*ctx)); | ||
39 | + cfg_init(&ctx->cfg); | ||
40 | +} | ||
41 | + | ||
42 | static inline void ini_ctx_deinit(struct ini_ctx *ctx) | ||
43 | { | ||
44 | cfg_deinit(&ctx->cfg); | ||
45 | @@ -1423,9 +1435,6 @@ static inline int cfg_apply(struct cfg *cfg, struct ini_ctx *ctx) | ||
46 | _gnutls_default_priority_string = cfg->default_priority_string; | ||
47 | } | ||
48 | |||
49 | - /* enable RSA-PKCS1-V1_5 by default */ | ||
50 | - cfg->allow_rsa_pkcs1_encrypt = true; | ||
51 | - | ||
52 | if (cfg->allowlisting) { | ||
53 | /* also updates `flags` of global `hash_algorithms[]` */ | ||
54 | ret = cfg_hashes_set_array(cfg, ctx->hashes, ctx->hashes_size); | ||
55 | @@ -2217,22 +2226,73 @@ update_system_wide_priority_string(void) | ||
56 | return 0; | ||
57 | } | ||
58 | |||
59 | +/* Returns false on parse error, otherwise true. | ||
60 | + * The system_wide_config must be locked for writing. | ||
61 | + */ | ||
62 | +static inline bool load_system_priority_file(void) | ||
63 | +{ | ||
64 | + int err; | ||
65 | + FILE *fp; | ||
66 | + struct ini_ctx ctx; | ||
67 | + | ||
68 | + cfg_init(&system_wide_config); | ||
69 | + | ||
70 | + fp = fopen(system_priority_file, "re"); | ||
71 | + if (fp == NULL) { | ||
72 | + _gnutls_debug_log("cfg: unable to open: %s: %d\n", | ||
73 | + system_priority_file, errno); | ||
74 | + return true; | ||
75 | + } | ||
76 | + | ||
77 | + /* Parsing the configuration file needs to be done in 2 phases: | ||
78 | + * first parsing the [global] section | ||
79 | + * and then the other sections, | ||
80 | + * because the [global] section modifies the parsing behavior. | ||
81 | + */ | ||
82 | + ini_ctx_init(&ctx); | ||
83 | + err = ini_parse_file(fp, global_ini_handler, &ctx); | ||
84 | + if (!err) { | ||
85 | + if (fseek(fp, 0L, SEEK_SET) < 0) { | ||
86 | + _gnutls_debug_log("cfg: unable to rewind: %s\n", | ||
87 | + system_priority_file); | ||
88 | + if (fail_on_invalid_config) | ||
89 | + exit(1); | ||
90 | + } | ||
91 | + err = ini_parse_file(fp, cfg_ini_handler, &ctx); | ||
92 | + } | ||
93 | + fclose(fp); | ||
94 | + if (err) { | ||
95 | + ini_ctx_deinit(&ctx); | ||
96 | + _gnutls_debug_log("cfg: unable to parse: %s: %d\n", | ||
97 | + system_priority_file, err); | ||
98 | + return false; | ||
99 | + } | ||
100 | + cfg_apply(&system_wide_config, &ctx); | ||
101 | + ini_ctx_deinit(&ctx); | ||
102 | + return true; | ||
103 | +} | ||
104 | + | ||
105 | static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
106 | { | ||
107 | - int ret, err = 0; | ||
108 | + int ret; | ||
109 | + bool config_parse_error = false; | ||
110 | struct stat sb; | ||
111 | - FILE *fp; | ||
112 | gnutls_buffer_st buf; | ||
113 | - struct ini_ctx ctx; | ||
114 | |||
115 | ret = gnutls_rwlock_rdlock(&system_wide_config_rwlock); | ||
116 | - if (ret < 0) { | ||
117 | + if (ret < 0) | ||
118 | return gnutls_assert_val(ret); | ||
119 | - } | ||
120 | |||
121 | if (stat(system_priority_file, &sb) < 0) { | ||
122 | _gnutls_debug_log("cfg: unable to access: %s: %d\n", | ||
123 | system_priority_file, errno); | ||
124 | + | ||
125 | + (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
126 | + ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); | ||
127 | + if (ret < 0) | ||
128 | + goto out; | ||
129 | + /* If system-wide config is unavailable, apply the defaults */ | ||
130 | + cfg_init(&system_wide_config); | ||
131 | goto out; | ||
132 | } | ||
133 | |||
134 | @@ -2240,63 +2300,27 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
135 | system_priority_last_mod == sb.st_mtime) { | ||
136 | _gnutls_debug_log("cfg: system priority %s has not changed\n", | ||
137 | system_priority_file); | ||
138 | - if (system_wide_config.priority_string) { | ||
139 | + if (system_wide_config.priority_string) | ||
140 | goto out; /* nothing to do */ | ||
141 | - } | ||
142 | } | ||
143 | |||
144 | (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
145 | |||
146 | ret = gnutls_rwlock_wrlock(&system_wide_config_rwlock); | ||
147 | - if (ret < 0) { | ||
148 | + if (ret < 0) | ||
149 | return gnutls_assert_val(ret); | ||
150 | - } | ||
151 | |||
152 | /* Another thread could have successfully re-read system-wide config, | ||
153 | * skip re-reading if the mtime it has used is exactly the same. | ||
154 | */ | ||
155 | - if (system_priority_file_loaded) { | ||
156 | + if (system_priority_file_loaded) | ||
157 | system_priority_file_loaded = | ||
158 | (system_priority_last_mod == sb.st_mtime); | ||
159 | - } | ||
160 | |||
161 | if (!system_priority_file_loaded) { | ||
162 | - _name_val_array_clear(&system_wide_config.priority_strings); | ||
163 | - | ||
164 | - gnutls_free(system_wide_config.priority_string); | ||
165 | - system_wide_config.priority_string = NULL; | ||
166 | - | ||
167 | - fp = fopen(system_priority_file, "re"); | ||
168 | - if (fp == NULL) { | ||
169 | - _gnutls_debug_log("cfg: unable to open: %s: %d\n", | ||
170 | - system_priority_file, errno); | ||
171 | + config_parse_error = !load_system_priority_file(); | ||
172 | + if (config_parse_error) | ||
173 | goto out; | ||
174 | - } | ||
175 | - /* Parsing the configuration file needs to be done in 2 phases: | ||
176 | - * first parsing the [global] section | ||
177 | - * and then the other sections, | ||
178 | - * because the [global] section modifies the parsing behavior. | ||
179 | - */ | ||
180 | - memset(&ctx, 0, sizeof(ctx)); | ||
181 | - err = ini_parse_file(fp, global_ini_handler, &ctx); | ||
182 | - if (!err) { | ||
183 | - if (fseek(fp, 0L, SEEK_SET) < 0) { | ||
184 | - _gnutls_debug_log("cfg: unable to rewind: %s\n", | ||
185 | - system_priority_file); | ||
186 | - if (fail_on_invalid_config) | ||
187 | - exit(1); | ||
188 | - } | ||
189 | - err = ini_parse_file(fp, cfg_ini_handler, &ctx); | ||
190 | - } | ||
191 | - fclose(fp); | ||
192 | - if (err) { | ||
193 | - ini_ctx_deinit(&ctx); | ||
194 | - _gnutls_debug_log("cfg: unable to parse: %s: %d\n", | ||
195 | - system_priority_file, err); | ||
196 | - goto out; | ||
197 | - } | ||
198 | - cfg_apply(&system_wide_config, &ctx); | ||
199 | - ini_ctx_deinit(&ctx); | ||
200 | _gnutls_debug_log("cfg: loaded system config %s mtime %lld\n", | ||
201 | system_priority_file, | ||
202 | (unsigned long long)sb.st_mtime); | ||
203 | @@ -2332,9 +2356,8 @@ static int _gnutls_update_system_priorities(bool defer_system_wide) | ||
204 | out: | ||
205 | (void)gnutls_rwlock_unlock(&system_wide_config_rwlock); | ||
206 | |||
207 | - if (err && fail_on_invalid_config) { | ||
208 | + if (config_parse_error && fail_on_invalid_config) | ||
209 | exit(1); | ||
210 | - } | ||
211 | |||
212 | return ret; | ||
213 | } | ||
214 | diff --git a/tests/system-override-allow-rsa-pkcs1-encrypt.sh b/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
215 | index b7d477c96e..714d0af946 100755 | ||
216 | --- a/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
217 | +++ b/tests/system-override-allow-rsa-pkcs1-encrypt.sh | ||
218 | @@ -19,9 +19,8 @@ | ||
219 | # You should have received a copy of the GNU Lesser General Public License | ||
220 | # along with this program. If not, see <https://www.gnu.org/licenses/> | ||
221 | |||
222 | -: ${srcdir=.} | ||
223 | -TEST=${srcdir}/rsaes-pkcs1-v1_5 | ||
224 | -CONF=${srcdir}/config.$$.tmp | ||
225 | +TEST=${builddir}/rsaes-pkcs1-v1_5 | ||
226 | +CONF=config.$$.tmp | ||
227 | export GNUTLS_SYSTEM_PRIORITY_FILE=${CONF} | ||
228 | export GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID=1 | ||
229 | |||
230 | @@ -38,15 +37,33 @@ cat <<_EOF_ > ${CONF} | ||
231 | allow-rsa-pkcs1-encrypt = true | ||
232 | _EOF_ | ||
233 | |||
234 | -${TEST} && fail "RSAES-PKCS1-v1_5 expected to succeed" | ||
235 | +${TEST} | ||
236 | +if [ $? != 0 ]; then | ||
237 | + echo "${TEST} expected to succeed" | ||
238 | + exit 1 | ||
239 | +fi | ||
240 | +echo "RSAES-PKCS1-v1_5 successfully enabled" | ||
241 | |||
242 | cat <<_EOF_ > ${CONF} | ||
243 | [overrides] | ||
244 | allow-rsa-pkcs1-encrypt = false | ||
245 | _EOF_ | ||
246 | |||
247 | -${TEST} || fail "RSAES-PKCS1-v1_5 expected to fail" | ||
248 | +${TEST} | ||
249 | +if [ $? = 0 ]; then | ||
250 | + echo "${TEST} expected to fail" | ||
251 | + exit 1 | ||
252 | +fi | ||
253 | +echo "RSAES-PKCS1-v1_5 successfully disabled" | ||
254 | |||
255 | unset GNUTLS_SYSTEM_PRIORITY_FILE | ||
256 | unset GNUTLS_SYSTEM_PRIORITY_FAIL_ON_INVALID | ||
257 | + | ||
258 | +${TEST} | ||
259 | +if [ $? != 0 ]; then | ||
260 | + echo "${TEST} expected to succeed by default" | ||
261 | + exit 1 | ||
262 | +fi | ||
263 | +echo "RSAES-PKCS1-v1_5 successfully enabled by default" | ||
264 | + | ||
265 | exit 0 | ||
266 | -- | ||
267 | GitLab | ||
268 | |||
269 | |||
diff --git a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch index f87cf536fa..8edd31d6b9 100644 --- a/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch +++ b/meta/recipes-support/gnutls/gnutls/Add-ptest-support.patch | |||
@@ -1,11 +1,10 @@ | |||
1 | From 81861f7ba690956c064ebe8dce6c313951fa2a9f Mon Sep 17 00:00:00 2001 | 1 | From bfa70adcbda4e505cf2e597907852e78e0439ee2 Mon Sep 17 00:00:00 2001 |
2 | From: Ravineet Singh <ravineet.a.singh@est.tech> | 2 | From: Ravineet Singh <ravineet.a.singh@est.tech> |
3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 | 3 | Date: Tue, 10 Jan 2023 16:11:10 +0100 |
4 | Subject: [PATCH] gnutls: add ptest support | 4 | Subject: [PATCH] gnutls: add ptest support |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [embedded specific] | 6 | Upstream-Status: Inappropriate [embedded specific] |
7 | Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> | 7 | Signed-off-by: Ravineet Singh <ravineet.a.singh@est.tech> |
8 | |||
9 | --- | 8 | --- |
10 | Makefile.am | 3 +++ | 9 | Makefile.am | 3 +++ |
11 | configure.ac | 2 ++ | 10 | configure.ac | 2 ++ |
@@ -27,10 +26,10 @@ index 843193f..816b09f 100644 | |||
27 | 26 | ||
28 | include $(top_srcdir)/cligen/cligen.mk | 27 | include $(top_srcdir)/cligen/cligen.mk |
29 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
30 | index b25ba14..860ddef 100644 | 29 | index 934377e..4406eae 100644 |
31 | --- a/configure.ac | 30 | --- a/configure.ac |
32 | +++ b/configure.ac | 31 | +++ b/configure.ac |
33 | @@ -1150,6 +1150,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) | 32 | @@ -1213,6 +1213,8 @@ AC_SUBST(LIBGNUTLS_CFLAGS) |
34 | 33 | ||
35 | AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes") | 34 | AM_CONDITIONAL(NEEDS_LIBRT, test "$gnutls_needs_librt" = "yes") |
36 | 35 | ||
@@ -40,10 +39,10 @@ index b25ba14..860ddef 100644 | |||
40 | 39 | ||
41 | hw_features= | 40 | hw_features= |
42 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 41 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
43 | index d530ad0..71c592f 100644 | 42 | index e39a3b3..861dd63 100644 |
44 | --- a/tests/Makefile.am | 43 | --- a/tests/Makefile.am |
45 | +++ b/tests/Makefile.am | 44 | +++ b/tests/Makefile.am |
46 | @@ -648,6 +648,12 @@ SH_LOG_COMPILER = $(SHELL) | 45 | @@ -663,6 +663,12 @@ SH_LOG_COMPILER = $(SHELL) |
47 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind | 46 | AM_VALGRINDFLAGS = --suppressions=$(srcdir)/suppressions.valgrind |
48 | LOG_COMPILER = $(LOG_VALGRIND) | 47 | LOG_COMPILER = $(LOG_VALGRIND) |
49 | 48 | ||
diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index fe3f031fdc..883d0123db 100644 --- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5810d97281bb30edb786de9946e5c13186eff6a2 Mon Sep 17 00:00:00 2001 | 1 | From d17ae0ef31c3c186766a338e8c40c87d1b98820e Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <jslater@windriver.com> | 2 | From: Joe Slater <jslater@windriver.com> |
3 | Date: Wed, 25 Jan 2017 13:52:59 -0800 | 3 | Date: Wed, 25 Jan 2017 13:52:59 -0800 |
4 | Subject: [PATCH] gnutls: account for ARM_EABI | 4 | Subject: [PATCH] gnutls: account for ARM_EABI |
@@ -14,7 +14,7 @@ Signed-off-by: Joe Slater <jslater@windriver.com> | |||
14 | 1 file changed, 2 insertions(+) | 14 | 1 file changed, 2 insertions(+) |
15 | 15 | ||
16 | diff --git a/tests/seccomp.c b/tests/seccomp.c | 16 | diff --git a/tests/seccomp.c b/tests/seccomp.c |
17 | index 86442a5..03a5aa8 100644 | 17 | index 881f0bb..5f9204a 100644 |
18 | --- a/tests/seccomp.c | 18 | --- a/tests/seccomp.c |
19 | +++ b/tests/seccomp.c | 19 | +++ b/tests/seccomp.c |
20 | @@ -55,7 +55,9 @@ int disable_system_calls(void) | 20 | @@ -55,7 +55,9 @@ int disable_system_calls(void) |
@@ -27,6 +27,3 @@ index 86442a5..03a5aa8 100644 | |||
27 | ADD_SYSCALL(getpid, 0); | 27 | ADD_SYSCALL(getpid, 0); |
28 | ADD_SYSCALL(gettimeofday, 0); | 28 | ADD_SYSCALL(gettimeofday, 0); |
29 | #if defined(HAVE_CLOCK_GETTIME) | 29 | #if defined(HAVE_CLOCK_GETTIME) |
30 | -- | ||
31 | 2.30.2 | ||
32 | |||
diff --git a/meta/recipes-support/gnutls/gnutls_3.8.3.bb b/meta/recipes-support/gnutls/gnutls_3.8.5.bb index 27d6753be0..52a1c00c4a 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.3.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.5.bb | |||
@@ -21,11 +21,12 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | |||
21 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ | 21 | SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ |
22 | file://arm_eabi.patch \ | 22 | file://arm_eabi.patch \ |
23 | file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ | 23 | file://0001-Creating-.hmac-file-should-be-excuted-in-target-envi.patch \ |
24 | file://0001-Fix-RSAES-PKCS1-v1_5-system-wide-configuration.patch \ | ||
24 | file://run-ptest \ | 25 | file://run-ptest \ |
25 | file://Add-ptest-support.patch \ | 26 | file://Add-ptest-support.patch \ |
26 | " | 27 | " |
27 | 28 | ||
28 | SRC_URI[sha256sum] = "f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e" | 29 | SRC_URI[sha256sum] = "66269a2cfe0e1c2dabec87bdbbd8ab656f396edd9a40dd006978e003cfa52bfc" |
29 | 30 | ||
30 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest | 31 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc ptest |
31 | 32 | ||
diff --git a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch index 2968d571bb..c0e9e2806b 100644 --- a/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ b/meta/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 | 1 | From 0f4e9eee64bd4220aa4fae1ab4f7bbf10b87cd69 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 15 Feb 2014 21:06:42 +0000 | 3 | Date: Sat, 15 Feb 2014 21:06:42 +0000 |
4 | Subject: [PATCH] Disable LDFLAGSICUDT for Linux | 4 | Subject: [PATCH] Disable LDFLAGSICUDT for Linux |
@@ -7,14 +7,14 @@ Upstream-Status: Inappropriate [ OE Configuration ] | |||
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | 9 | --- |
10 | source/config/mh-linux | 2 +- | 10 | config/mh-linux | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/config/mh-linux b/config/mh-linux | 13 | diff --git a/config/mh-linux b/config/mh-linux |
14 | index 366f0cc..2689aab 100644 | 14 | index 53d6780..b622513 100644 |
15 | --- a/config/mh-linux | 15 | --- a/config/mh-linux |
16 | +++ b/config/mh-linux | 16 | +++ b/config/mh-linux |
17 | @@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN | 17 | @@ -23,7 +23,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN |
18 | LD_RPATH_PRE = -Wl,-rpath, | 18 | LD_RPATH_PRE = -Wl,-rpath, |
19 | 19 | ||
20 | ## These are the library specific LDFLAGS | 20 | ## These are the library specific LDFLAGS |
@@ -23,6 +23,3 @@ index 366f0cc..2689aab 100644 | |||
23 | 23 | ||
24 | ## Compiler switch to embed a library name | 24 | ## Compiler switch to embed a library name |
25 | # The initial tab in the next line is to prevent icu-config from reading it. | 25 | # The initial tab in the next line is to prevent icu-config from reading it. |
26 | -- | ||
27 | 1.7.10.4 | ||
28 | |||
diff --git a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch index 578517b57f..a25285fb54 100644 --- a/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +++ b/meta/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e3c25af4b40d64f098e7b8ae5a91fdc3c90163c4 Mon Sep 17 00:00:00 2001 | 1 | From cf55c077b77b7a219502364eaadf12c074ab005e Mon Sep 17 00:00:00 2001 |
2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> | 2 | From: Lei Maohui <leimaohui@cn.fujitsu.com> |
3 | Date: Wed, 8 May 2019 14:42:30 +0900 | 3 | Date: Wed, 8 May 2019 14:42:30 +0900 |
4 | Subject: [PATCH] icu: Added armeb support. | 4 | Subject: [PATCH] icu: Added armeb support. |
@@ -8,16 +8,15 @@ Make icu support arm32 BE. | |||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | 9 | ||
10 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> | 10 | Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> |
11 | |||
12 | --- | 11 | --- |
13 | i18n/double-conversion-utils.h | 2 +- | 12 | i18n/double-conversion-utils.h | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h | 15 | diff --git a/i18n/double-conversion-utils.h b/i18n/double-conversion-utils.h |
17 | index 7f23e0a..7f89094 100644 | 16 | index 303668f..7d859dc 100644 |
18 | --- a/i18n/double-conversion-utils.h | 17 | --- a/i18n/double-conversion-utils.h |
19 | +++ b/i18n/double-conversion-utils.h | 18 | +++ b/i18n/double-conversion-utils.h |
20 | @@ -115,7 +115,7 @@ int main(int argc, char** argv) { | 19 | @@ -146,7 +146,7 @@ int main(int argc, char** argv) { |
21 | // | 20 | // |
22 | // If it prints "correct" then the architecture should be here, in the "correct" section. | 21 | // If it prints "correct" then the architecture should be here, in the "correct" section. |
23 | #if defined(_M_X64) || defined(__x86_64__) || \ | 22 | #if defined(_M_X64) || defined(__x86_64__) || \ |
diff --git a/meta/recipes-support/icu/icu/fix-install-manx.patch b/meta/recipes-support/icu/icu/fix-install-manx.patch index 925b064ebd..16cabc8264 100644 --- a/meta/recipes-support/icu/icu/fix-install-manx.patch +++ b/meta/recipes-support/icu/icu/fix-install-manx.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001 | 1 | From 2d544cac238eccbfc32cafc9502ddf6e00994211 Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 | 3 | Date: Fri, 9 Oct 2015 17:50:41 +0100 |
4 | Subject: [PATCH] icu: fix install race | 4 | Subject: [PATCH] icu: fix install race |
@@ -11,15 +11,16 @@ and one process tries to chown a file that the other process has just deleted. | |||
11 | Also install-manx should be a phony target, and for clarity use $^ instead of $? | 11 | Also install-manx should be a phony target, and for clarity use $^ instead of $? |
12 | in the install command. | 12 | in the install command. |
13 | 13 | ||
14 | Upstream-Status: Pending | 14 | Upstream ticket: https://unicode-org.atlassian.net/jira/software/c/projects/ICU/issues/ICU-21172 |
15 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
16 | 15 | ||
16 | Upstream-Status: Submitted [https://github.com/unicode-org/icu/pull/2966] | ||
17 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
17 | --- | 18 | --- |
18 | source/Makefile.in | 8 ++++---- | 19 | Makefile.in | 8 ++++---- |
19 | 1 file changed, 4 insertions(+), 4 deletions(-) | 20 | 1 file changed, 4 insertions(+), 4 deletions(-) |
20 | 21 | ||
21 | diff --git a/Makefile.in b/Makefile.in | 22 | diff --git a/Makefile.in b/Makefile.in |
22 | index be9435b..ada20d7 100644 | 23 | index 8366f01..79b91c9 100644 |
23 | --- a/Makefile.in | 24 | --- a/Makefile.in |
24 | +++ b/Makefile.in | 25 | +++ b/Makefile.in |
25 | @@ -77,7 +77,7 @@ EXTRA_DATA = | 26 | @@ -77,7 +77,7 @@ EXTRA_DATA = |
diff --git a/meta/recipes-support/icu/icu_74-1.bb b/meta/recipes-support/icu/icu_74-2.bb index 88ded166b5..8352bf2a5b 100644 --- a/meta/recipes-support/icu/icu_74-1.bb +++ b/meta/recipes-support/icu/icu_74-2.bb | |||
@@ -111,8 +111,8 @@ SRC_URI = "${BASE_SRC_URI};name=code \ | |||
111 | SRC_URI:append:class-target = "\ | 111 | SRC_URI:append:class-target = "\ |
112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ | 112 | file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ |
113 | " | 113 | " |
114 | SRC_URI[code.sha256sum] = "86ce8e60681972e60e4dcb2490c697463fcec60dd400a5f9bffba26d0b52b8d0" | 114 | SRC_URI[code.sha256sum] = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c" |
115 | SRC_URI[data.sha256sum] = "67d5ab39c5187e1dd0fed60a3fe52794dce9784b4c045cb85e19f5d317fd783f" | 115 | SRC_URI[data.sha256sum] = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6" |
116 | 116 | ||
117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" | 117 | UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P<pver>(?!.+rc).+)" |
118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" | 118 | GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" |
diff --git a/meta/recipes-support/libassuan/libassuan_2.5.6.bb b/meta/recipes-support/libassuan/libassuan_2.5.7.bb index 7e899e7399..d1e622635f 100644 --- a/meta/recipes-support/libassuan/libassuan_2.5.6.bb +++ b/meta/recipes-support/libassuan/libassuan_2.5.7.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \ | |||
20 | file://libassuan-add-pkgconfig-support.patch \ | 20 | file://libassuan-add-pkgconfig-support.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[sha256sum] = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426" | 23 | SRC_URI[sha256sum] = "0103081ffc27838a2e50479153ca105e873d3d65d8a9593282e9c94c7e6afb76" |
24 | 24 | ||
25 | BINCONFIG = "${bindir}/libassuan-config" | 25 | BINCONFIG = "${bindir}/libassuan-config" |
26 | 26 | ||
diff --git a/meta/recipes-support/libbsd/libbsd_0.12.1.bb b/meta/recipes-support/libbsd/libbsd_0.12.2.bb index 161dc6df43..7d5e88f293 100644 --- a/meta/recipes-support/libbsd/libbsd_0.12.1.bb +++ b/meta/recipes-support/libbsd/libbsd_0.12.2.bb | |||
@@ -38,7 +38,7 @@ SECTION = "libs" | |||
38 | 38 | ||
39 | SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" | 39 | SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" |
40 | 40 | ||
41 | SRC_URI[sha256sum] = "d7747f8ec1baa6ff5c096a9dd587c061233dec90da0f1aedd66d830f6db6996a" | 41 | SRC_URI[sha256sum] = "b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014" |
42 | 42 | ||
43 | inherit autotools pkgconfig | 43 | inherit autotools pkgconfig |
44 | 44 | ||
diff --git a/meta/recipes-support/libical/libical_3.0.17.bb b/meta/recipes-support/libical/libical_3.0.18.bb index b91912b048..052ca57cfb 100644 --- a/meta/recipes-support/libical/libical_3.0.17.bb +++ b/meta/recipes-support/libical/libical_3.0.18.bb | |||
@@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/libical/libical" | |||
7 | BUGTRACKER = "https://github.com/libical/libical/issues" | 7 | BUGTRACKER = "https://github.com/libical/libical/issues" |
8 | LICENSE = "LGPL-2.1-only | MPL-2.0" | 8 | LICENSE = "LGPL-2.1-only | MPL-2.0" |
9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ | 9 | LIC_FILES_CHKSUM = "file://LICENSE;md5=1910a2a76ddf6a9ba369182494170d87 \ |
10 | file://LICENSE.LGPL21.txt;md5=933adb561f159e7c3da079536f0ed871 \ | 10 | file://LICENSE.LGPL21.txt;md5=8f690bb538f4b301d931374a6eb864d0 \ |
11 | file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ | 11 | file://LICENSE.MPL2.txt;md5=f75d2927d3c1ed2414ef72048f5ad640 \ |
12 | " | 12 | " |
13 | SECTION = "libs" | 13 | SECTION = "libs" |
@@ -15,7 +15,7 @@ SECTION = "libs" | |||
15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ | 15 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ |
16 | file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ | 16 | file://0001-cmake-Do-not-export-CC-into-gir-compiler.patch \ |
17 | " | 17 | " |
18 | SRC_URI[sha256sum] = "bcda9a6db6870240328752854d1ea475af9bbc6356e6771018200e475e5f781b" | 18 | SRC_URI[sha256sum] = "72b7dc1a5937533aee5a2baefc990983b66b141dd80d43b51f80aced4aae219c" |
19 | 19 | ||
20 | inherit cmake pkgconfig gobject-introspection vala github-releases | 20 | inherit cmake pkgconfig gobject-introspection vala github-releases |
21 | 21 | ||
@@ -37,7 +37,8 @@ EXTRA_OECMAKE += "-DICAL_BUILD_DOCS=false" | |||
37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" | 37 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper" |
38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" | 38 | EXTRA_OECMAKE:append:class-target = " -DGObjectIntrospection_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper" |
39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" | 39 | EXTRA_OECMAKE += "-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen" |
40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF', d)}" | 40 | EXTRA_OECMAKE += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DGOBJECT_INTROSPECTION=ON -DICAL_GLIB_VAPI=ON', '-DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF', d)}" |
41 | EXTRA_OECMAKE:append:class-native = " -DGOBJECT_INTROSPECTION=OFF -DICAL_GLIB_VAPI=OFF" | ||
41 | 42 | ||
42 | # Tell the cross-libical where the tool it needs to build is | 43 | # Tell the cross-libical where the tool it needs to build is |
43 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" | 44 | EXTRA_OECMAKE:append:class-target = " -DIMPORT_ICAL_GLIB_SRC_GENERATOR=${STAGING_LIBDIR_NATIVE}/cmake/LibIcal/IcalGlibSrcGenerator.cmake" |
diff --git a/meta/recipes-support/libproxy/libproxy_0.5.4.bb b/meta/recipes-support/libproxy/libproxy_0.5.6.bb index b4f4c6d254..6a705b305f 100644 --- a/meta/recipes-support/libproxy/libproxy_0.5.4.bb +++ b/meta/recipes-support/libproxy/libproxy_0.5.6.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
14 | DEPENDS = "glib-2.0" | 14 | DEPENDS = "glib-2.0" |
15 | 15 | ||
16 | SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" | 16 | SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main" |
17 | SRCREV = "dff9a603d823dcc740ec966cd27960daa6b891b1" | 17 | SRCREV = "e7d18806575e21f94cf2f6024659386b129ca189" |
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
19 | 19 | ||
20 | inherit meson pkgconfig gobject-introspection vala gi-docgen | 20 | inherit meson pkgconfig gobject-introspection vala gi-docgen |
diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb index 06ba5e9c98..478e5f4289 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.5.bb | |||
@@ -17,10 +17,12 @@ S = "${WORKDIR}/git" | |||
17 | 17 | ||
18 | inherit autotools-brokensep pkgconfig ptest features_check | 18 | inherit autotools-brokensep pkgconfig ptest features_check |
19 | 19 | ||
20 | inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3native', '', d)} | ||
21 | |||
20 | REQUIRED_DISTRO_FEATURES = "seccomp" | 22 | REQUIRED_DISTRO_FEATURES = "seccomp" |
21 | 23 | ||
22 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
23 | PACKAGECONFIG[python] = "--enable-python, --disable-python, python3" | 25 | PACKAGECONFIG[python] = "--enable-python, --disable-python, python3-cython-native" |
24 | 26 | ||
25 | DISABLE_STATIC = "" | 27 | DISABLE_STATIC = "" |
26 | 28 | ||
@@ -48,9 +50,13 @@ do_install_ptest() { | |||
48 | for file in $(find tools/.libs/* -executable -type f); do | 50 | for file in $(find tools/.libs/* -executable -type f); do |
49 | install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools | 51 | install -m 744 ${S}/${file} ${D}/${PTEST_PATH}/tools |
50 | done | 52 | done |
53 | # fix python shebang | ||
54 | sed -i -e 's@cmd /usr/bin/env python @cmd /usr/bin/env python3 @' ${D}/${PTEST_PATH}/tests/regression | ||
55 | sed -i -e 's@^#!/usr/bin/env python$@#!/usr/bin/env python3@' ${D}/${PTEST_PATH}/tests/*.py | ||
51 | } | 56 | } |
52 | 57 | ||
53 | FILES:${PN} = "${bindir} ${libdir}/${BPN}.so*" | 58 | FILES:${PN} = "${bindir} ${libdir}/${BPN}.so* ${PYTHON_SITEPACKAGES_DIR}/" |
54 | FILES:${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" | 59 | FILES:${PN}-dbg += "${libdir}/${PN}/tests/.debug/* ${libdir}/${PN}/tools/.debug" |
55 | 60 | ||
61 | RDEPENDS:${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3', '', d)}" | ||
56 | RDEPENDS:${PN}-ptest = "coreutils bash" | 62 | RDEPENDS:${PN}-ptest = "coreutils bash" |
diff --git a/meta/recipes-support/libunwind/libunwind_1.6.2.bb b/meta/recipes-support/libunwind/libunwind_1.6.2.bb index 3208785124..c7b1604b61 100644 --- a/meta/recipes-support/libunwind/libunwind_1.6.2.bb +++ b/meta/recipes-support/libunwind/libunwind_1.6.2.bb | |||
@@ -40,3 +40,11 @@ do_install:append () { | |||
40 | } | 40 | } |
41 | 41 | ||
42 | BBCLASSEXTEND = "native" | 42 | BBCLASSEXTEND = "native" |
43 | |||
44 | # http://errors.yoctoproject.org/Errors/Build/183144/ | ||
45 | # libunwind-1.6.2/include/tdep-aarch64/libunwind_i.h:123:47: error: passing argument 1 of '_ULaarch64_uc_addr' from incompatible pointer type [-Wincompatible-pointer-types] | ||
46 | # libunwind-1.6.2/src/aarch64/Ginit.c:348:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
47 | # libunwind-1.6.2/src/aarch64/Ginit.c:377:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
48 | # libunwind-1.6.2/src/aarch64/Ginit_local.c:51:9: error: assignment to 'ucontext_t *' from incompatible pointer type 'unw_context_t *' {aka 'unw_tdep_context_t *'} [-Wincompatible-pointer-types] | ||
49 | # libunwind-1.6.2/src/aarch64/Gresume.c:37:28: error: initialization of 'unw_tdep_context_t *' from incompatible pointer type 'ucontext_t *' [-Wincompatible-pointer-types] | ||
50 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb b/meta/recipes-support/nghttp2/nghttp2_1.61.0.bb index cf62c32d8b..ad85576dcb 100644 --- a/meta/recipes-support/nghttp2/nghttp2_1.60.0.bb +++ b/meta/recipes-support/nghttp2/nghttp2_1.61.0.bb | |||
@@ -5,7 +5,7 @@ LICENSE = "MIT" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" |
6 | 6 | ||
7 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz" | 7 | SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/nghttp2-${PV}.tar.xz" |
8 | SRC_URI[sha256sum] = "625d6c3da1d9ca4fd643a638256431ae68fd1901653b2a61a245eea7b261bf4e" | 8 | SRC_URI[sha256sum] = "c0e660175b9dc429f11d25b9507a834fb752eea9135ab420bb7cb7e9dbcc9654" |
9 | 9 | ||
10 | inherit cmake manpages python3native github-releases | 10 | inherit cmake manpages python3native github-releases |
11 | PACKAGECONFIG[manpages] = "" | 11 | PACKAGECONFIG[manpages] = "" |
diff --git a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch b/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch deleted file mode 100644 index 47c426b4a5..0000000000 --- a/meta/recipes-support/npth/npth/0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | From e43524868bb4901703d63876f9d49f73ca75b3ab Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 12 May 2021 20:27:52 -0700 | ||
4 | Subject: [PATCH] Revert "Fix problem with regression tests on recent glibc." | ||
5 | |||
6 | This reverts commit 3a9d32eb59194b989656548755066ccd9feb36ac. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | configure.ac | 8 +++----- | ||
12 | 1 file changed, 3 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 8a9373c..8cda28d 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -284,11 +284,9 @@ AC_TYPE_SSIZE_T | ||
19 | # | ||
20 | # Checks for libraries and functions. | ||
21 | # | ||
22 | -# We test for pthread_detach because glibc 2.22 includes | ||
23 | -# pthread_create but not pthread_detach. | ||
24 | if test "$have_w32_system" = no; then | ||
25 | - AC_SEARCH_LIBS([pthread_detach],[pthread]) | ||
26 | - case "x$ac_cv_search_pthread_detach" in | ||
27 | + AC_SEARCH_LIBS([pthread_create],[pthread]) | ||
28 | + case "x$ac_cv_search_pthread_create" in | ||
29 | xno) | ||
30 | have_pthread=no | ||
31 | ;; | ||
32 | @@ -297,7 +295,7 @@ if test "$have_w32_system" = no; then | ||
33 | ;; | ||
34 | *) | ||
35 | have_pthread=yes | ||
36 | - config_libs="$config_libs $ac_cv_search_pthread_detach" | ||
37 | + config_libs="$config_libs $ac_cv_search_pthread_create" | ||
38 | ;; | ||
39 | esac | ||
40 | if test "$have_pthread" != no; then | ||
41 | -- | ||
42 | 2.31.1 | ||
43 | |||
diff --git a/meta/recipes-support/npth/npth/musl-fix.patch b/meta/recipes-support/npth/npth/musl-fix.patch new file mode 100644 index 0000000000..fabe78b14c --- /dev/null +++ b/meta/recipes-support/npth/npth/musl-fix.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 417abd56fd7bf45cd4948414050615cb1ad59134 Mon Sep 17 00:00:00 2001 | ||
2 | From: NIIBE Yutaka <gniibe@fsij.org> | ||
3 | Date: Fri, 1 Mar 2024 13:53:52 +0900 | ||
4 | Subject: [PATCH] Fix INSERT_EXPOSE_RWLOCK_API for musl C library. | ||
5 | |||
6 | * configure.ac: Add a case for musl system. | ||
7 | |||
8 | Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=npth.git;a=commit;h=417abd56fd7bf45cd4948414050615cb1ad59134] | ||
9 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
10 | -- | ||
11 | |||
12 | GnuPG-bug-id: 5664 | ||
13 | Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> | ||
14 | --- | ||
15 | configure.ac | 5 ++++- | ||
16 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index c1091b1..576a26e 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -381,7 +381,10 @@ fi | ||
23 | AC_SUBST(INSERT_NO_RWLOCK) | ||
24 | |||
25 | case "${host}" in | ||
26 | - *-*-linux*|*-*-gnu*) | ||
27 | + *-*-linux-musl*) | ||
28 | + INSERT_EXPOSE_RWLOCK_API="1" | ||
29 | + ;; | ||
30 | + *-*-linux-gnu*|*-*-gnu*) | ||
31 | INSERT_EXPOSE_RWLOCK_API="defined(__USE_UNIX98) || defined(__USE_XOPEN2K)" | ||
32 | ;; | ||
33 | *) | ||
34 | -- | ||
35 | 2.30.2 | ||
36 | |||
37 | |||
diff --git a/meta/recipes-support/npth/npth/pkgconfig.patch b/meta/recipes-support/npth/npth/pkgconfig.patch deleted file mode 100644 index b6a12e7309..0000000000 --- a/meta/recipes-support/npth/npth/pkgconfig.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | Added npth pkgconfig file | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
6 | |||
7 | Index: npth-1.1/src/npth.pc.in | ||
8 | =================================================================== | ||
9 | --- /dev/null | ||
10 | +++ npth-1.1/src/npth.pc.in | ||
11 | @@ -0,0 +1,10 @@ | ||
12 | +prefix=@prefix@ | ||
13 | +exec_prefix=@exec_prefix@ | ||
14 | +libdir=@libdir@ | ||
15 | +includedir=@includedir@ | ||
16 | + | ||
17 | +Name: npth | ||
18 | +Description: a new portable posix threading library | ||
19 | +Version: @VERSION@ | ||
20 | +Libs: -L${libdir} -lnpth -lpthread | ||
21 | +Cflags: -I${includedir} | ||
22 | Index: npth-1.1/src/Makefile.am | ||
23 | =================================================================== | ||
24 | --- npth-1.1.orig/src/Makefile.am | ||
25 | +++ npth-1.1/src/Makefile.am | ||
26 | @@ -27,8 +27,10 @@ | ||
27 | # License along with this program; if not, see <http://www.gnu.org/licenses/>. | ||
28 | |||
29 | ## Process this file with automake to produce Makefile.in | ||
30 | +pkgconfigdir = $(libdir)/pkgconfig | ||
31 | +pkgconfig_DATA = npth.pc | ||
32 | |||
33 | -EXTRA_DIST = libnpth.vers | ||
34 | +EXTRA_DIST = libnpth.vers npth.pc | ||
35 | # versioninfo.rc.in | ||
36 | nodist_include_HEADERS = npth.h | ||
37 | |||
38 | Index: npth-1.1/configure.ac | ||
39 | =================================================================== | ||
40 | --- npth-1.1.orig/configure.ac | ||
41 | +++ npth-1.1/configure.ac | ||
42 | @@ -337,6 +337,7 @@ src/Makefile | ||
43 | w32/Makefile | ||
44 | tests/Makefile]) | ||
45 | AC_CONFIG_FILES(npth-config, chmod +x npth-config) | ||
46 | +AC_CONFIG_FILES([src/npth.pc]) | ||
47 | AC_OUTPUT | ||
48 | |||
49 | echo " | ||
diff --git a/meta/recipes-support/npth/npth_1.6.bb b/meta/recipes-support/npth/npth_1.6.bb deleted file mode 100644 index ef863d39b0..0000000000 --- a/meta/recipes-support/npth/npth_1.6.bb +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | SUMMARY = "New GNU Portable Threads library" | ||
2 | DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " | ||
3 | HOMEPAGE = "https://www.gnu.org/software/pth/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "LGPL-2.0-or-later" | ||
6 | LIC_FILES_CHKSUM = "\ | ||
7 | file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de\ | ||
8 | " | ||
9 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | ||
10 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ | ||
11 | file://pkgconfig.patch \ | ||
12 | file://0001-Revert-Fix-problem-with-regression-tests-on-recent-g.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "375d1a15ad969f32d25f1a7630929854" | ||
16 | SRC_URI[sha256sum] = "1393abd9adcf0762d34798dc34fdcf4d0d22a8410721e76f1e3afcd1daa4e2d1" | ||
17 | |||
18 | BINCONFIG = "${bindir}/npth-config" | ||
19 | |||
20 | inherit autotools binconfig-disabled multilib_header | ||
21 | |||
22 | FILES:${PN} = "${libdir}/libnpth.so.*" | ||
23 | FILES:${PN}-dev += "${bindir}/npth-config" | ||
24 | |||
25 | do_install:append() { | ||
26 | oe_multilib_header npth.h | ||
27 | } | ||
28 | |||
29 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/npth/npth_1.7.bb b/meta/recipes-support/npth/npth_1.7.bb new file mode 100644 index 0000000000..0cf35565a3 --- /dev/null +++ b/meta/recipes-support/npth/npth_1.7.bb | |||
@@ -0,0 +1,21 @@ | |||
1 | SUMMARY = "New GNU Portable Threads library" | ||
2 | DESCRIPTION = "nPth is a library to provide the GNU Pth API and thus a non-preemptive threads implementation. " | ||
3 | HOMEPAGE = "https://gnupg.org/software/npth/" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "LGPL-2.0-or-later" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2caced0b25dfefd4c601d92bd15116de" | ||
7 | UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" | ||
8 | |||
9 | SRC_URI = "${GNUPG_MIRROR}/npth/npth-${PV}.tar.bz2 \ | ||
10 | file://musl-fix.patch \ | ||
11 | " | ||
12 | |||
13 | SRC_URI[sha256sum] = "8589f56937b75ce33b28d312fccbf302b3b71ec3f3945fde6aaa74027914ad05" | ||
14 | |||
15 | inherit autotools multilib_header | ||
16 | |||
17 | do_install:append() { | ||
18 | oe_multilib_header npth.h | ||
19 | } | ||
20 | |||
21 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb index b7ebd44abc..2ede38deba 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.3.bb | |||
@@ -32,3 +32,13 @@ FILES:${PN} += " \ | |||
32 | INSANE_SKIP:${PN} = "dev-so" | 32 | INSANE_SKIP:${PN} = "dev-so" |
33 | 33 | ||
34 | BBCLASSEXTEND = "native nativesdk" | 34 | BBCLASSEXTEND = "native nativesdk" |
35 | |||
36 | # # This one is reproducible only on 32bit MACHINEs | ||
37 | # http://errors.yoctoproject.org/Errors/Details/766969/ | ||
38 | # git/p11-kit/import-object.c:223:62: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
39 | # git/p11-kit/import-object.c:229:70: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
40 | # git/p11-kit/import-object.c:264:78: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
41 | # git/p11-kit/import-object.c:223:62: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
42 | # git/p11-kit/import-object.c:229:70: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
43 | # git/p11-kit/import-object.c:264:78: error: passing argument 3 of 'p11_asn1_read' from incompatible pointer type [-Wincompatible-pointer-types] | ||
44 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/rng-tools/rng-tools_6.16.bb b/meta/recipes-support/rng-tools/rng-tools_6.16.bb index f0aa3ff93f..ed755ae705 100644 --- a/meta/recipes-support/rng-tools/rng-tools_6.16.bb +++ b/meta/recipes-support/rng-tools/rng-tools_6.16.bb | |||
@@ -50,9 +50,9 @@ do_configure:prepend() { | |||
50 | } | 50 | } |
51 | 51 | ||
52 | do_install:append() { | 52 | do_install:append() { |
53 | install -Dm 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/rng-tools | 53 | install -Dm 0644 ${UNPACKDIR}/default ${D}${sysconfdir}/default/rng-tools |
54 | install -Dm 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rng-tools | 54 | install -Dm 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rng-tools |
55 | install -Dm 0644 ${WORKDIR}/rng-tools.service \ | 55 | install -Dm 0644 ${UNPACKDIR}/rng-tools.service \ |
56 | ${D}${systemd_system_unitdir}/rng-tools.service | 56 | ${D}${systemd_system_unitdir}/rng-tools.service |
57 | sed -i \ | 57 | sed -i \ |
58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | 58 | -e 's,@SYSCONFDIR@,${sysconfdir},g' \ |
@@ -67,3 +67,7 @@ do_install:append() { | |||
67 | ${D}${systemd_system_unitdir}/rng-tools.service | 67 | ${D}${systemd_system_unitdir}/rng-tools.service |
68 | fi | 68 | fi |
69 | } | 69 | } |
70 | |||
71 | # libargp detection fails | ||
72 | # http://errors.yoctoproject.org/Errors/Details/766951/ | ||
73 | CFLAGS += "-Wno-error=incompatible-pointer-types" | ||
diff --git a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch index 91640d6044..c8e6eddfec 100644 --- a/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch +++ b/meta/recipes-support/serf/serf/SConstruct.stop.creating.directories.without.sandbox-install.prefix.patch | |||
@@ -31,7 +31,7 @@ ERROR: scons install execution failed. | |||
31 | and the installed paths (including the paths inside libserf*.pc) | 31 | and the installed paths (including the paths inside libserf*.pc) |
32 | look correct | 32 | look correct |
33 | 33 | ||
34 | Upstream-Status: Pending | 34 | Upstream-Status: Inappropriate [removes block of code rather than fixing the problem in that block] |
35 | 35 | ||
36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 36 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
37 | 37 | ||
diff --git a/meta/recipes-support/sqlite/sqlite3_3.45.1.bb b/meta/recipes-support/sqlite/sqlite3_3.45.3.bb index 50612feb25..03d70bbd38 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.45.1.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.45.3.bb | |||
@@ -4,5 +4,5 @@ LICENSE = "PD" | |||
4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" | 4 | LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66" |
5 | 5 | ||
6 | SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz" | 6 | SRC_URI = "http://www.sqlite.org/2024/sqlite-autoconf-${SQLITE_PV}.tar.gz" |
7 | SRC_URI[sha256sum] = "cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a" | 7 | SRC_URI[sha256sum] = "b2809ca53124c19c60f42bf627736eae011afdcc205bb48270a5ee9a38191531" |
8 | 8 | ||
diff --git a/meta/recipes-support/taglib/taglib_2.0.bb b/meta/recipes-support/taglib/taglib_2.0.1.bb index 4bf9be15ae..14f99aabbc 100644 --- a/meta/recipes-support/taglib/taglib_2.0.bb +++ b/meta/recipes-support/taglib/taglib_2.0.1.bb | |||
@@ -11,7 +11,7 @@ DEPENDS = "zlib utfcpp" | |||
11 | 11 | ||
12 | SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" | 12 | SRC_URI = "http://taglib.github.io/releases/${BP}.tar.gz" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "e36ea877a6370810b97d84cf8f72b1e4ed205149ab3ac8232d44c850f38a2859" | 14 | SRC_URI[sha256sum] = "08c0a27b96aa5c4e23060fe0b6f93102ee9091a9385257b9d0ddcf467de0d925" |
15 | 15 | ||
16 | UPSTREAM_CHECK_URI = "https://taglib.org/" | 16 | UPSTREAM_CHECK_URI = "https://taglib.org/" |
17 | UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar" | 17 | UPSTREAM_CHECK_REGEX = "taglib-(?P<pver>\d+(\.\d+)+)\.tar" |
diff --git a/meta/recipes-support/user-creation/xuser-account_0.1.bb b/meta/recipes-support/user-creation/xuser-account_0.1.bb index 639b01f6eb..2bd3699e74 100644 --- a/meta/recipes-support/user-creation/xuser-account_0.1.bb +++ b/meta/recipes-support/user-creation/xuser-account_0.1.bb | |||
@@ -15,7 +15,7 @@ do_compile() { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | do_install() { | 17 | do_install() { |
18 | install -D -m 0644 ${WORKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf | 18 | install -D -m 0644 ${UNPACKDIR}/system-xuser.conf ${D}${sysconfdir}/dbus-1/system.d/system-xuser.conf |
19 | } | 19 | } |
20 | 20 | ||
21 | FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" | 21 | FILES:${PN} = "${sysconfdir}/dbus-1/system.d/system-xuser.conf" |