[OE-core] [PATCH 1/2] libusb1: Link with latomic only if compiler has no atomic builtins
This makes build use compiler to decide from where to get atomics instead of assuming that it should always come from libatomic, helps sharing build artifacts with OSes which may not have libatomic installed because it is not required on those hosts. Signed-off-by: Khem Raj --- ...k-with-latomic-only-if-no-atomic-bui.patch | 46 +++ meta/recipes-support/libusb/libusb1_1.0.26.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch diff --git a/meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch b/meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch new file mode 100644 index 00..3c223e0822 --- /dev/null +++ b/meta/recipes-support/libusb/libusb1/0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch @@ -0,0 +1,46 @@ +From 95e601ce116dd46ea7915c171976b85ea0905d58 Mon Sep 17 00:00:00 2001 +From: Lonnie Abelbeck +Date: Sun, 8 May 2022 14:05:56 -0500 +Subject: [PATCH] configure.ac: Link with -latomic only if no atomic builtins + +Follow-up to 561dbda, a check of GCC atomic builtins needs to be done +first. + +I'm no autoconf guru, but using this: +https://github.com/mesa3d/mesa/blob/0df485c285b73c34ba9062f0c27e55c3c702930d/configure.ac#L469 +as inspiration, I created a pre-check before calling AC_SEARCH_LIBS(...) + +Fixes #1135 +Closes #1139 +Upstream-Status: Backport [https://github.com/kraj/libusb/commit/95e601ce116dd46ea7915c171976b85ea0905d58] +Signed-off-by: Khem Raj +--- + configure.ac | 16 +++- + libusb/version_nano.h | 2 +- + 2 files changed, 16 insertions(+), 2 deletions(-) + +--- a/configure.ac b/configure.ac +@@ -153,7 +153,21 @@ if test "x$platform" = xposix; then + AC_SEARCH_LIBS([pthread_create], [pthread], + [test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])], + [], []) +- AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) ++ dnl Check for new-style atomic builtins. We first check without linking to -latomic. ++ AC_MSG_CHECKING(whether __atomic_load_n is supported) ++ AC_LINK_IFELSE([AC_LANG_SOURCE([[ ++ #include ++ int main() { ++ struct { ++ uint64_t *v; ++ } x; ++ return (int)__atomic_load_n(x.v, __ATOMIC_ACQUIRE) & ++ (int)__atomic_add_fetch(x.v, (uint64_t)1, __ATOMIC_ACQ_REL); ++ }]])], GCC_ATOMIC_BUILTINS_SUPPORTED=yes, GCC_ATOMIC_BUILTINS_SUPPORTED=no) ++ AC_MSG_RESULT($GCC_ATOMIC_BUILTINS_SUPPORTED) ++ if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != xyes; then ++ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) ++ fi + elif test "x$platform" = xwindows; then + AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.]) + else diff --git a/meta/recipes-support/libusb/libusb1_1.0.26.bb b/meta/recipes-support/libusb/libusb1_1.0.26.bb index 7371faf017..301e60c14f 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.26.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.26.bb @@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" BBCLASSEXTEND = "native nativesdk" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libusb-${PV}.tar.bz2 \ + file://0001-configure.ac-Link-with-latomic-only-if-no-atomic-bui.patch \ file://run-ptest \ " -- 2.39.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176253): https://lists.openembedded.org/g/openembedded-core/message/176253 Mute This Topic: https://lists.openembedded.org/mt/96427835/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 2/2] libusb1: Strip trailing whitespaces
Signed-off-by: Khem Raj --- meta/recipes-support/libusb/libusb1_1.0.26.bb | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-support/libusb/libusb1_1.0.26.bb b/meta/recipes-support/libusb/libusb1_1.0.26.bb index 301e60c14f..122c3d48b4 100644 --- a/meta/recipes-support/libusb/libusb1_1.0.26.bb +++ b/meta/recipes-support/libusb/libusb1_1.0.26.bb @@ -35,12 +35,12 @@ do_install:append() { fi } -do_compile_ptest() { -oe_runmake -C tests stress -} - -do_install_ptest() { -install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} +do_compile_ptest() { +oe_runmake -C tests stress +} + +do_install_ptest() { +install -m 755 ${B}/tests/.libs/stress ${D}${PTEST_PATH} } FILES:${PN} += "${base_libdir}/*.so.*" -- 2.39.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176254): https://lists.openembedded.org/g/openembedded-core/message/176254 Mute This Topic: https://lists.openembedded.org/mt/96427836/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] insane: Improve patch warning/error handling
On Fri, 2023-01-20 at 20:38 +0100, Alexander Kanavin wrote: > On Fri, 20 Jan 2023 at 20:29, Bruce Ashfield wrote: > > Because I'm simply not going to insist on it in all the patches. I > > need all the contributions I can get, and I'm not going to > > pedantically insist on that. > > > > meta-virt is not oe-core, I do the lifting. Therefore, if bitbake > > errors, I have to fix it. > > But you do not need to insist on the needed metadata or fix it after > the fact. Bitbake will do the insisting for you, when contributors > test the change locally *before* they send it to you. If bitbake > errors on your side, this means they never built their contribution, > and you should raise a concern for that reason, and not for the > missing metadata. It isn't that simple since this is a configurable QA warning, all it takes is one layer/distro to disable it and it is disabled for all layers that user works on. This is why "core" is a separate config to "noncore" but we can't have a config for every layer and even if we did, people would still turn it off. If it is turned off, it means people send patches and Bruce has to fix them, or ask them to resubmit which is extra overhead to the maintainer. I've been thinking about this and if I do make it the default, it will mean warnings show up on other CI systems and layer maintainers will get patches or complaints about the warnings. I'm not sure I really want to get into this. I do think it is something the project should be doing but I don't want to burn out our existing maintainers. Since there isn't wide community buy in, I suspect I should just drop the idea. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176252): https://lists.openembedded.org/g/openembedded-core/message/176252 Mute This Topic: https://lists.openembedded.org/mt/96354584/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] insane: Improve patch warning/error handling
On Fri, 20 Jan 2023 at 20:29, Bruce Ashfield wrote: > Because I'm simply not going to insist on it in all the patches. I > need all the contributions I can get, and I'm not going to > pedantically insist on that. > > meta-virt is not oe-core, I do the lifting. Therefore, if bitbake > errors, I have to fix it. But you do not need to insist on the needed metadata or fix it after the fact. Bitbake will do the insisting for you, when contributors test the change locally *before* they send it to you. If bitbake errors on your side, this means they never built their contribution, and you should raise a concern for that reason, and not for the missing metadata. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176251): https://lists.openembedded.org/g/openembedded-core/message/176251 Mute This Topic: https://lists.openembedded.org/mt/96354584/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] insane: Improve patch warning/error handling
On Fri, Jan 20, 2023 at 2:10 PM Alexander Kanavin wrote: > > On Fri, 20 Jan 2023 at 15:26, Bruce Ashfield wrote: > > but again, I won't insist that everyone does that > > on submission, so not having the warning/error disabled is just an > > extra load placed on me. > > I'm not sure I understand this. If the appropriate upstream-status is > enforced by bitbake, then any contributor has to get it right before > actually sending for review. Or otherwise it means they never built > what they're sending. > > Where is the extra load happening? > Because I'm simply not going to insist on it in all the patches. I need all the contributions I can get, and I'm not going to pedantically insist on that. meta-virt is not oe-core, I do the lifting. Therefore, if bitbake errors, I have to fix it. Other layers can nitpick all they want, but I'm not going to adopt that policy. Bruce > Alex -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176250): https://lists.openembedded.org/g/openembedded-core/message/176250 Mute This Topic: https://lists.openembedded.org/mt/96354584/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] insane: Improve patch warning/error handling
On Fri, 20 Jan 2023 at 15:26, Bruce Ashfield wrote: > but again, I won't insist that everyone does that > on submission, so not having the warning/error disabled is just an > extra load placed on me. I'm not sure I understand this. If the appropriate upstream-status is enforced by bitbake, then any contributor has to get it right before actually sending for review. Or otherwise it means they never built what they're sending. Where is the extra load happening? Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176249): https://lists.openembedded.org/g/openembedded-core/message/176249 Mute This Topic: https://lists.openembedded.org/mt/96354584/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 41/41] selftest/virgl: use pkg-config from the host
From: Alexander Kanavin The check needs to report dri location on the host machine, so pkg-config binary needs to be capable of finding the needed dri.pc file on the host, and therefore needs to know where host .pc files are located. This may not be the case when using pkg-config from buildtools, so this forces usage of host pkg-config. runqemu already does the same PATH tweak, so this simply brings the two in sync. Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit f0521f8a3ba7e15482756529ee7b0a95b3d53e7d) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index fe83b248f3..44f787ef12 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -265,7 +265,7 @@ class TestImage(OESelftestTestCase): except FileNotFoundError: self.fail("/dev/dri directory does not exist; no render nodes available on this machine. %s" %(render_hint)) try: -dripath = subprocess.check_output("pkg-config --variable=dridriverdir dri", shell=True) +dripath = subprocess.check_output("PATH=/bin:/usr/bin:$PATH pkg-config --variable=dridriverdir dri", shell=True) except subprocess.CalledProcessError as e: self.fail("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176248): https://lists.openembedded.org/g/openembedded-core/message/176248 Mute This Topic: https://lists.openembedded.org/mt/96406237/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 40/41] lib/oe/reproducible: Use git log without gpg signature
From: Benoît Mauduit Previously, if "showSignature" is present in user gitconfig, parsing of the timestamp will fail. Ideally we should replace this command with a git plumbing command. Signed-off-by: Benoît Mauduit Signed-off-by: Alexandre Belloni (cherry picked from commit 3bd6f78f79b3d3e87d8db1e11f58d8021f929843) Signed-off-by: Steve Sakoman --- meta/lib/oe/reproducible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oe/reproducible.py b/meta/lib/oe/reproducible.py index 04a1810d4f..9ac75c02e3 100644 --- a/meta/lib/oe/reproducible.py +++ b/meta/lib/oe/reproducible.py @@ -115,7 +115,8 @@ def get_source_date_epoch_from_git(d, sourcedir): return None bb.debug(1, "git repository: %s" % gitpath) -p = subprocess.run(['git', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], check=True, stdout=subprocess.PIPE) +p = subprocess.run(['git', '-c', 'log.showSignature=false', '--git-dir', gitpath, 'log', '-1', '--pretty=%ct'], + check=True, stdout=subprocess.PIPE) return int(p.stdout.decode('utf-8')) def get_source_date_epoch_from_youngest_file(d, sourcedir): -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176247): https://lists.openembedded.org/g/openembedded-core/message/176247 Mute This Topic: https://lists.openembedded.org/mt/96406236/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 39/41] at: Change when files are copied
From: Saul Wold The create_spdx code relies on patched code, if files are changed or added during the do_configure phase they will be missed by the create_spdx process. So we need to ensure files modifications/additions happen in the do_patch phase. Signed-off-by: Saul Wold Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 227c46fe48b64de7574f7b6b407b8c13be71b392) Signed-off-by: Steve Sakoman --- meta/recipes-extended/at/at_3.2.5.bb | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/at/at_3.2.5.bb b/meta/recipes-extended/at/at_3.2.5.bb index 87a436173f..c0c876a644 100644 --- a/meta/recipes-extended/at/at_3.2.5.bb +++ b/meta/recipes-extended/at/at_3.2.5.bb @@ -52,8 +52,10 @@ INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE:${PN} = "atd.service" -do_configure:prepend() { - cp -f ${WORKDIR}/posixtm.[ch] ${S} +do_patch[postfuncs] += "copy_posix_files" + +copy_posix_files() { +cp -f ${WORKDIR}/posixtm.[ch] ${S} } do_install () { -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176246): https://lists.openembedded.org/g/openembedded-core/message/176246 Mute This Topic: https://lists.openembedded.org/mt/96406235/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 38/41] curl: don't enable debug builds
From: Ross Burton In oe-core 27824261 --enable-debug was added to the configure arguments to turn on debugging symbols. However, enabling debug mode does more than turn on debugging symbols and introduces some codepaths that can be controlled with environment variables. Bluntly, the curl maintainer says that --enable-debug should not be used in production: https://curl.se/mail/lib-2023-01/0039.html I did a build and verified that the curl-dbg package doesn't massively shrink, so the debug symbols are still being built. Remove the debug options and hide them behind a PACKAGECONFIG, with a comment that it should not be used in production. Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 3ed3b2ffeeaa5d888f77dd30cb8cd81d3275398a) Signed-off-by: Steve Sakoman --- meta/recipes-support/curl/curl_7.85.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/curl/curl_7.85.0.bb b/meta/recipes-support/curl/curl_7.85.0.bb index 1e47e9fac5..846cdacb41 100644 --- a/meta/recipes-support/curl/curl_7.85.0.bb +++ b/meta/recipes-support/curl/curl_7.85.0.bb @@ -38,6 +38,8 @@ PACKAGECONFIG:class-nativesdk = "ipv6 openssl proxy random threaded-resolver ver PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver" PACKAGECONFIG[brotli] = "--with-brotli,--without-brotli,brotli" PACKAGECONFIG[builtinmanual] = "--enable-manual,--disable-manual" +# Don't use this in production +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[dict] = "--enable-dict,--disable-dict," PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" PACKAGECONFIG[gopher] = "--enable-gopher,--disable-gopher," @@ -74,9 +76,7 @@ EXTRA_OECONF = " \ --enable-crypto-auth \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ --without-libpsl \ ---enable-debug \ --enable-optimize \ ---disable-curldebug \ ${@'--without-ssl' if (bb.utils.filter('PACKAGECONFIG', 'gnutls mbedtls nss openssl', d) == '') else ''} \ " -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176245): https://lists.openembedded.org/g/openembedded-core/message/176245 Mute This Topic: https://lists.openembedded.org/mt/96406234/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 37/41] toolchain-scripts: compatibility with unbound variable protection
From: Jan Kircher Fixed an error when Bash's unbound variable protection is enabled (set -u) and variable "LD_LIBRARY_PATH" does not exist. Signed-off-by: Jan Kircher Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 85685370b0ad93291cda59fb091a15eeecf5e0d5) Signed-off-by: Steve Sakoman --- meta/classes-recipe/toolchain-scripts.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/toolchain-scripts.bbclass b/meta/classes-recipe/toolchain-scripts.bbclass index 3cc823fe63..fa658a6596 100644 --- a/meta/classes-recipe/toolchain-scripts.bbclass +++ b/meta/classes-recipe/toolchain-scripts.bbclass @@ -37,7 +37,7 @@ toolchain_create_sdk_env_script () { echo '# http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html#AEN80' >> $script echo '# http://xahlee.info/UnixResource_dir/_/ldpath.html' >> $script echo '# Only disable this check if you are absolutely know what you are doing!' >> $script - echo 'if [ ! -z "$LD_LIBRARY_PATH" ]; then' >> $script + echo 'if [ ! -z "${LD_LIBRARY_PATH:-}" ]; then' >> $script echo "echo \"Your environment is misconfigured, you probably need to 'unset LD_LIBRARY_PATH'\"" >> $script echo "echo \"but please check why this was set in the first place and that it's safe to unset.\"" >> $script echo 'echo "The SDK will not operate correctly in most cases when LD_LIBRARY_PATH is set."' >> $script -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176244): https://lists.openembedded.org/g/openembedded-core/message/176244 Mute This Topic: https://lists.openembedded.org/mt/96406233/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 36/41] libseccomp: fix typo in DESCRIPTION
From: Chen Qi Fix typo in DESCRIPTION: and -> an. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 349e63045298054f9454025d793c67284fce750b) Signed-off-by: Steve Sakoman --- meta/recipes-support/libseccomp/libseccomp_2.5.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb b/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb index e89b8f7f4b..505c21917b 100644 --- a/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb +++ b/meta/recipes-support/libseccomp/libseccomp_2.5.4.bb @@ -1,5 +1,5 @@ SUMMARY = "interface to seccomp filtering mechanism" -DESCRIPTION = "The libseccomp library provides and easy to use, platform independent,interface to the Linux Kernel's syscall filtering mechanism: seccomp." +DESCRIPTION = "The libseccomp library provides an easy to use, platform independent, interface to the Linux Kernel's syscall filtering mechanism: seccomp." HOMEPAGE = "https://github.com/seccomp/libseccomp"; SECTION = "security" LICENSE = "LGPL-2.1-only" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176243): https://lists.openembedded.org/g/openembedded-core/message/176243 Mute This Topic: https://lists.openembedded.org/mt/96406231/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 35/41] dhcpcd: backport two patches to fix runtime error
From: Chen Qi In case of nodistro, dhcpcd gives us 'Bad system call' error and exits. This is because there are syscalls that should be allowed but not in privsep. Backport two patches to fix this issue. Signed-off-by: Chen Qi Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f1e6a0c16d6685096ec9313301aa431e73d02c07) Signed-off-by: Steve Sakoman --- .../dhcpcd/dhcpcd_9.4.1.bb| 2 ++ ...low-getrandom-sysctl-for-newer-glibc.patch | 30 ++ ...sep-Allow-newfstatat-syscall-as-well.patch | 31 +++ 3 files changed, 63 insertions(+) create mode 100644 meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch create mode 100644 meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 1d03de09c8..5cf77fa0f6 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -14,6 +14,8 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"; SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \ file://0001-20-resolv.conf-improve-the-sitation-of-working-with-.patch \ + file://0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch \ + file://0002-privsep-Allow-newfstatat-syscall-as-well.patch \ file://dhcpcd.service \ file://dhcpcd@.service \ " diff --git a/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch new file mode 100644 index 00..68ab93416a --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0001-privsep-Allow-getrandom-sysctl-for-newer-glibc.patch @@ -0,0 +1,30 @@ +From c6cdf0aee71ab4126d36b045f02428ee3c6ec50b Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Fri, 26 Aug 2022 09:08:36 +0100 +Subject: [PATCH 1/2] privsep: Allow getrandom sysctl for newer glibc + +Fixes #120 + +Upstream-Status: Backport [c6cdf0aee71ab4126d36b045f02428ee3c6ec50b] +Signed-off-by: Chen Qi +--- + src/privsep-linux.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index b238644b..479a1d82 100644 +--- a/src/privsep-linux.c b/src/privsep-linux.c +@@ -300,6 +300,9 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_getpid + SECCOMP_ALLOW(__NR_getpid), + #endif ++#ifdef __NR_getrandom ++ SECCOMP_ALLOW(__NR_getrandom), ++#endif + #ifdef __NR_getsockopt + /* For route socket overflow */ + SECCOMP_ALLOW_ARG(__NR_getsockopt, 1, SOL_SOCKET), +-- +2.17.1 + diff --git a/meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch b/meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch new file mode 100644 index 00..c5d2cba305 --- /dev/null +++ b/meta/recipes-connectivity/dhcpcd/files/0002-privsep-Allow-newfstatat-syscall-as-well.patch @@ -0,0 +1,31 @@ +From 7625a555797f587a89dc2447fd9d621024d5165c Mon Sep 17 00:00:00 2001 +From: Roy Marples +Date: Fri, 26 Aug 2022 09:24:50 +0100 +Subject: [PATCH 2/2] privsep: Allow newfstatat syscall as well + +Allows newer glibc variants to work apparently. +As reported in #84 and #89. + +Upstream-Status: Backport [7625a555797f587a89dc2447fd9d621024d5165c] +Signed-off-by: Chen Qi +--- + src/privsep-linux.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/privsep-linux.c b/src/privsep-linux.c +index 479a1d82..6327b1bc 100644 +--- a/src/privsep-linux.c b/src/privsep-linux.c +@@ -328,6 +328,9 @@ static struct sock_filter ps_seccomp_filter[] = { + #ifdef __NR_nanosleep + SECCOMP_ALLOW(__NR_nanosleep), /* XXX should use ppoll instead */ + #endif ++#ifdef __NR_newfstatat ++ SECCOMP_ALLOW(__NR_newfstatat), ++#endif + #ifdef __NR_ppoll + SECCOMP_ALLOW(__NR_ppoll), + #endif +-- +2.17.1 + -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176242): https://lists.openembedded.org/g/openembedded-core/message/176242 Mute This Topic: https://lists.openembedded.org/mt/96406229/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 34/41] libpng: Enable NEON for aarch64 to enensure consistency with arm32.
From: leimaohui NEON is enabled for aarch64 by default, so, to ensure consistency with arm32, reference to libpng-1.6.38/configure, added enable_hardware_optimizations option for aarch64. Signed-off-by: Lei Maohui Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 12e68d5824849fa20f0e3fe8fc1921da111bb6fb) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/libpng/libpng_1.6.39.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.39.bb b/meta/recipes-multimedia/libpng/libpng_1.6.39.bb index d9dcf379e9..a6c229f5cf 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.39.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.39.bb @@ -22,7 +22,9 @@ BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" inherit autotools binconfig-disabled pkgconfig # Work around missing symbols -EXTRA_OECONF:append:class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}" +ARMNEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off", d)}" +ARMNEON:aarch64 = "--enable-hardware-optimizations=on" +EXTRA_OECONF += "${ARMNEON}" PACKAGES =+ "${PN}-tools" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176241): https://lists.openembedded.org/g/openembedded-core/message/176241 Mute This Topic: https://lists.openembedded.org/mt/96406227/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 33/41] opkg: ensure opkg uses private gpg.conf when applying keys.
From: Charlie Johnston Currently, the opkg-key utility calls gpg with --no-options, which uses /dev/null as the configuration file. This means any configurations in /etc/opkg/gpg/gpg.conf were being ignored. This change applies a patch to remove the --no-options flag. Signed-off-by: Charlie Johnston Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 3699096f3214e77fe4aa1daebe85308d02940f2f) Signed-off-by: Steve Sakoman --- ...emove-no-options-flag-from-gpg-calls.patch | 34 +++ meta/recipes-devtools/opkg/opkg_0.6.1.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch diff --git a/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch b/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch new file mode 100644 index 00..f216950002 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch @@ -0,0 +1,34 @@ +From a658e6402382250f0164c5b47b744740e04f3611 Mon Sep 17 00:00:00 2001 +From: Charlie Johnston +Date: Fri, 30 Dec 2022 15:21:14 -0600 +Subject: [PATCH] opkg-key: Remove --no-options flag from gpg calls. + +The opkg-key script was always passing the --no-options +flag to gpg, which uses /dev/null as the options file. +As a result, the opkg gpg.conf file was not getting +used. This change removes that flag so that gpg.conf +in the GPGHOMEDIR for opkg (currently /etc/opkg/gpg/) +will be used if present. + +Upstream-Status: Accepted [https://git.yoctoproject.org/opkg/commit/?id=cee294e72d257417b5e55ef7a76a0fd15313e46b] +Signed-off-by: Charlie Johnston +--- + utils/opkg-key | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/opkg-key b/utils/opkg-key +index e395a59..8645ebc 100755 +--- a/utils/opkg-key b/utils/opkg-key +@@ -53,7 +53,7 @@ else + exit 1 + fi + +-GPG="$GPGCMD --no-options --homedir $GPGHOMEDIR" ++GPG="$GPGCMD --homedir $GPGHOMEDIR" + + # Gpg home dir isn't created automatically when --homedir option is used + if [ ! -e "$GPGHOMEDIR" ]; then +-- +2.30.2 + diff --git a/meta/recipes-devtools/opkg/opkg_0.6.1.bb b/meta/recipes-devtools/opkg/opkg_0.6.1.bb index 50c9451a57..712f066f0e 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.1.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.1.bb @@ -15,6 +15,7 @@ PE = "1" SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ file://opkg.conf \ file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \ + file://0002-opkg-key-remove-no-options-flag-from-gpg-calls.patch \ file://run-ptest \ " -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176240): https://lists.openembedded.org/g/openembedded-core/message/176240 Mute This Topic: https://lists.openembedded.org/mt/96406226/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 32/41] librsvg: enable vapi build
From: Markus Volk Otherwise gnome-chess will fail like this: | error: Package `librsvg-2.0' not found in specified Vala API directories or GObject-Introspection GIR directories | Compilation failed: 1 error(s), 0 warning(s) Signed-off-by: Markus Volk Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ed814eff90677f894d9eb480d8d4389c64a35820) Signed-off-by: Steve Sakoman --- meta/recipes-gnome/librsvg/librsvg_2.54.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb index fc52ae61c5..b2e93a2684 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb @@ -42,6 +42,8 @@ do_configure[postfuncs] += "cargo_common_do_configure" inherit rust-target-config +EXTRA_OECONF:class-target = "--enable-vala" + # rust-cross writes the target linker binary into target json definition without any flags. # This breaks here because the linker isn't going to work without at least knowing where # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176239): https://lists.openembedded.org/g/openembedded-core/message/176239 Mute This Topic: https://lists.openembedded.org/mt/96406225/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 31/41] rust: Do not use default compiler flags defined in CC crate
From: Anton Antonov Rust crates build dependecy C libraries using "CC" crate. This crate adds some default compiler parameters depending on target arch. For some targets these parameters conflict with the parameters defined by OE. Warnings/errors like this can be seen in the case: cc1: error: switch '-mcpu=cortex-a15' conflicts with switch '-march=armv7-a+fp' [-Werror] Lets use only the OE parameters by exporting CRATE_CC_NO_DEFAULTS. https://github.com/rust-lang/cc-rs#external-configuration-via-environment-variables This patch fixes https://bugzilla.yoctoproject.org/show_bug.cgi?id=14947 Signed-off-by: Anton Antonov Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 0c07089bdf7e0d7d8f37552db0bcd75f860979d9) Signed-off-by: Steve Sakoman --- meta/classes-recipe/rust-common.bbclass | 28 +-- .../classes-recipe/rust-target-config.bbclass | 16 +++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/meta/classes-recipe/rust-common.bbclass b/meta/classes-recipe/rust-common.bbclass index 93bf6c8be6..5e70007377 100644 --- a/meta/classes-recipe/rust-common.bbclass +++ b/meta/classes-recipe/rust-common.bbclass @@ -94,7 +94,7 @@ RUST_BUILD_ARCH = "${@oe.rust.arch_to_rust_arch(d.getVar('BUILD_ARCH'))}" # Rust additionally will use two additional cases: # - undecorated (e.g. CC) - equivalent to TARGET # - triple suffix (e.g. CC:x86_64_unknown_linux_gnu) - both -# see: https://github.com/alexcrichton/gcc-rs +# see: https://github.com/rust-lang/cc-rs # The way that Rust's internal triples and Yocto triples are mapped together # its likely best to not use the triple suffix due to potential confusion. @@ -125,12 +125,22 @@ create_wrapper_rust () { shift extras="$1" shift + crate_cc_extras="$1" + shift cat <<- EOF > "${file}" #!/usr/bin/env python3 import os, sys orig_binary = "$@" extras = "${extras}" + + # Apply a required subset of CC crate compiler flags + # when we build a target recipe for a non-bare-metal target. + # https://github.com/rust-lang/cc-rs/blob/main/src/lib.rs#L1614 + if "CRATE_CC_NO_DEFAULTS" in os.environ.keys() and \ + "TARGET" in os.environ.keys() and not "-none-" in os.environ["TARGET"]: + orig_binary += "${crate_cc_extras}" + binary = orig_binary.split()[0] args = orig_binary.split() + sys.argv[1:] if extras: @@ -154,22 +164,22 @@ do_rust_create_wrappers () { mkdir -p "${WRAPPER_DIR}" # Yocto Build / Rust Host C compiler - create_wrapper_rust "${RUST_BUILD_CC}" "" "${BUILD_CC}" + create_wrapper_rust "${RUST_BUILD_CC}" "" "${CRATE_CC_FLAGS}" "${BUILD_CC}" # Yocto Build / Rust Host C++ compiler - create_wrapper_rust "${RUST_BUILD_CXX}" "" "${BUILD_CXX}" + create_wrapper_rust "${RUST_BUILD_CXX}" "" "${CRATE_CC_FLAGS}" "${BUILD_CXX}" # Yocto Build / Rust Host linker - create_wrapper_rust "${RUST_BUILD_CCLD}" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}" + create_wrapper_rust "${RUST_BUILD_CCLD}" "" "" "${BUILD_CCLD}" "${BUILD_LDFLAGS}" # Yocto Build / Rust Host archiver - create_wrapper_rust "${RUST_BUILD_AR}" "" "${BUILD_AR}" + create_wrapper_rust "${RUST_BUILD_AR}" "" "" "${BUILD_AR}" # Yocto Target / Rust Target C compiler - create_wrapper_rust "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}" + create_wrapper_rust "${RUST_TARGET_CC}" "${WRAPPER_TARGET_EXTRALD}" "${CRATE_CC_FLAGS}" "${WRAPPER_TARGET_CC}" "${WRAPPER_TARGET_LDFLAGS}" # Yocto Target / Rust Target C++ compiler - create_wrapper_rust "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}" + create_wrapper_rust "${RUST_TARGET_CXX}" "${WRAPPER_TARGET_EXTRALD}" "${CRATE_CC_FLAGS}" "${WRAPPER_TARGET_CXX}" "${CXXFLAGS}" # Yocto Target / Rust Target linker - create_wrapper_rust "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}" + create_wrapper_rust "${RUST_TARGET_CCLD}" "${WRAPPER_TARGET_EXTRALD}" "" "${WRAPPER_TARGET_CCLD}" "${WRAPPER_TARGET_LDFLAGS}" # Yocto Target / Rust Target archiver - create_wrapper_rust "${RUST_TARGET_AR}" "" "${WRAPPER_TARGET_AR}" + create_wrapper_rust "${RUST_TARGET_AR}" "" "" "${WRAPPER_TARGET_AR}" } diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 2710b4325d..9158b1918e 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass @@ -401,3 +401,19 @@ python do_rust_gen_targets () { addtask rust_gen_targets after do_patch before do_compile do_rust_gen_targets[dirs] += "${RUST_TARGETS_DIR}" +# For building target C dependecies use only compile
[OE-core][langdale 30/41] harfbuzz: remove bindir only if it exists
From: Petr Kubizňák In some scenarios (e.g. when "glib" removed from PACKAGECONFIG), "${D}${bindir}" might not exist which caused `rmdir` to fail. Signed-off-by: Petr Kubizňák Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 21261072cbe0056e85550a0710de142fab8943e4) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb index 4905e8e2ad..8e06acc011 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_5.1.0.bb @@ -32,9 +32,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" LEAD_SONAME = "libharfbuzz.so" do_install:append() { -# If no tools are installed due to PACKAGECONFIG then this directory is -#still installed, so remove it to stop packaging wanings. -rmdir --ignore-fail-on-non-empty ${D}${bindir} +# If no tools are installed due to PACKAGECONFIG then this directory might +# still be installed, so remove it to stop packaging warnings. +[ ! -d ${D}${bindir} ] || rmdir --ignore-fail-on-non-empty ${D}${bindir} } FILES:${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176237): https://lists.openembedded.org/g/openembedded-core/message/176237 Mute This Topic: https://lists.openembedded.org/mt/96406222/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 28/41] tiff: Add packageconfig knob for webp
From: Khem Raj tiff-native otherwise falsely detects webp if its installed on build host. This ensures deterministic behavior regardless of host. Signed-off-by: Khem Raj Signed-off-by: Richard Purdie (cherry picked from commit 718c44f282310b2ca85877fed706460ccc1eebea) Signed-off-by: Steve Sakoman --- meta/recipes-multimedia/libtiff/tiff_4.4.0.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb index 970aab5433..831014bff1 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.4.0.bb @@ -45,6 +45,7 @@ PACKAGECONFIG[jbig] = "--enable-jbig,--disable-jbig,jbig," PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg," PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib," PACKAGECONFIG[lzma] = "--enable-lzma,--disable-lzma,xz," +PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp," # Convert single-strip uncompressed images to multiple strips of specified # size (default: 8192) to reduce memory usage -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176235): https://lists.openembedded.org/g/openembedded-core/message/176235 Mute This Topic: https://lists.openembedded.org/mt/96406220/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 29/41] oeqa/selftest/debuginfod: improve testcase
From: Ross Burton Primarily, before running the debuginfod-find tool, check that the debuginfod server has finished sweeping the deploy directory. If we make the request too soon then there's a rare chance that we run the client before it has scanned the right packages, and the log gets swamped with warnings from sqlite due to a race. Also: - unset DEBUGINFOD_URLS so the debuginfod doesn't proxy to an upstream server provided by the host distro - Lower concurrency to reduce system load and handle systems with lower maximum open file counts but lots of cores (as the concurrency means cores*2*2 open files) - Set the refresh times to 0 so we never rescan during the test - Only scan the packages for the format which the image is using - Log the commands that are being invoked Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit d65729748253eaa640333198ca8aec05946cb9e8) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/debuginfod.py | 67 +++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/debuginfod.py b/meta/lib/oeqa/selftest/cases/debuginfod.py index 3c40119282..37f51760fb 100644 --- a/meta/lib/oeqa/selftest/cases/debuginfod.py +++ b/meta/lib/oeqa/selftest/cases/debuginfod.py @@ -12,6 +12,36 @@ from oeqa.utils.commands import bitbake, get_bb_var, runqemu class Debuginfod(OESelftestTestCase): + +def wait_for_debuginfod(self, port): +""" +debuginfod takes time to scan the packages and requesting too early may +result in a test failure if the right packages haven't been scanned yet. + +Request the metrics endpoint periodically and wait for there to be no +busy scanning threads. + +Returns True if debuginfod is ready, False if we timed out +""" +import time, urllib + +# Wait a minute +countdown = 6 +delay = 10 + +while countdown: +time.sleep(delay) +try: +with urllib.request.urlopen("http://localhost:%d/metrics"; % port) as f: +lines = f.read().decode("ascii").splitlines() +if "thread_busy{role=\"scan\"} 0" in lines: +return True +except urllib.error.URLError as e: +self.logger.error(e) +countdown -= 1 +return False + + def test_debuginfod(self): self.write_config( """ @@ -25,29 +55,50 @@ CORE_IMAGE_EXTRA_INSTALL += "elfutils" cmd = [ os.path.join(native_sysroot, "usr", "bin", "debuginfod"), "--verbose", +# In-memory database, this is a one-shot test "--database=:memory:", +# Don't use all the host cores +"--concurrency=8", +"--connection-pool=8", +# Disable rescanning, this is a one-shot test +"--rescan-time=0", +"--groom-time=0", get_bb_var("DEPLOY_DIR"), ] -for format in get_bb_var("PACKAGE_CLASSES").split(): -if format == "package_deb": -cmd.append("--scan-deb-dir") -elif format == "package_ipk": -cmd.append("--scan-deb-dir") -elif format == "package_rpm": -cmd.append("--scan-rpm-dir") + +format = get_bb_var("PACKAGE_CLASSES").split()[0] +if format == "package_deb": +cmd.append("--scan-deb-dir") +elif format == "package_ipk": +cmd.append("--scan-deb-dir") +elif format == "package_rpm": +cmd.append("--scan-rpm-dir") +else: +self.fail("Unknown package class %s" % format) + # Find a free port with socketserver.TCPServer(("localhost", 0), None) as s: port = s.server_address[1] cmd.append("--port=%d" % port) try: -debuginfod = subprocess.Popen(cmd) +# Remove DEBUGINFOD_URLS from the environment so we don't try +# looking in the distro debuginfod +env = os.environ.copy() +if "DEBUGINFOD_URLS" in env: +del env["DEBUGINFOD_URLS"] + +self.logger.info(f"Starting server {cmd}") +debuginfod = subprocess.Popen(cmd, env=env) with runqemu("core-image-minimal", runqemuparams="nographic") as qemu: +self.assertTrue(self.wait_for_debuginfod(port)) + cmd = ( "DEBUGINFOD_URLS=http://%s:%d/ debuginfod-find debuginfo /usr/bin/debuginfod" % (qemu.server_ip, port) ) +self.logger.info(f"Starting client {cmd}") status, output = qemu.run_serial(cmd) # This should be more comprehensive self.assertIn("/.cache/debuginfod_client/", output) -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You
[OE-core][langdale 27/41] kernel-fitimage: Allow user to select dtb when multiple dtb exists
From: Sandeep Gundlupet Raju Allow user to select the default DTB for FIT image when multiple dtb's exists. >From machine.conf or local.conf user can specify the default dtb for FIT image as shown below. FIT_CONF_DEFAULT_DTB = "board-default.dtb" Also fallback to avaialable dtb when FIT_CONF_DEFAULT_DTB doesn't exits or empty. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-fitimage.bbclass | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 06cdc4f1ec..f6d82ce061 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -73,6 +73,9 @@ FIT_CONF_PREFIX[doc] = "Prefix to use for FIT configuration node name" FIT_SUPPORTED_INITRAMFS_FSTYPES ?= "cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio" +# Allow user to select the default DTB for FIT image when multiple dtb's exists. +FIT_CONF_DEFAULT_DTB ?= "" + # Keys used to sign individually image nodes. # The keys to sign image nodes must be different from those used to sign # configuration nodes, otherwise the "required" property, from @@ -375,6 +378,7 @@ fitimage_emit_section_config() { bootscr_line="" setup_line="" default_line="" + default_dtb_image="${FIT_CONF_DEFAULT_DTB}" # conf node name is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID @@ -417,7 +421,17 @@ fitimage_emit_section_config() { # default node is selected based on dtb ID if it is present, # otherwise its selected based on kernel ID if [ -n "$dtb_image" ]; then - default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" + # Select default node as user specified dtb when + # multiple dtb exists. + if [ -n "$default_dtb_image" ]; then + if [ -s "${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image" ]; then + default_line="default = \"${FIT_CONF_PREFIX}$default_dtb_image\";" + else + bbwarn "Couldn't find a valid user specified dtb in ${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image" + fi + else + default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" + fi else default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";" fi -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176234): https://lists.openembedded.org/g/openembedded-core/message/176234 Mute This Topic: https://lists.openembedded.org/mt/96406218/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 26/41] kernel-fitimage: Adjust order of dtb/dtbo files
From: Sandeep Gundlupet Raju The dtb files must be before the dtbo files, otherwise the overlays may not be applied correctly. >From Bruce Ashfield: We can split between dtbs and dtbos, they just need to be sorted for reproducibility reasons. Of course, this was only working by luck previously (before the sort), since it has always been gathering dtbs and dtbo's with find, depending on filesystem ordering for the order in the fitimage). Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel-fitimage.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 8ddebf8dd8..06cdc4f1ec 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -546,10 +546,11 @@ fitimage_assemble() { if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then dtbcount=1 - for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do + for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \ + $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do DTB=$(echo "$DTB" | tr '/' '_') - # Skip DTB if we've picked it up previously + # Skip DTB/DTBO if we've picked it up previously echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue DTBS="$DTBS $DTB" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176233): https://lists.openembedded.org/g/openembedded-core/message/176233 Mute This Topic: https://lists.openembedded.org/mt/96406217/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 25/41] busybox: rm temporary files if do_compile was interrupted
From: Antonin Godard To avoid working with undeterministic config files, remove all the temporary files to start from scratch. Signed-off-by: Richard Purdie (cherry picked from commit 74cd440c4e3df0ed3b81cf5c60a3f92e0dd3fe6c) Signed-off-by: Steve Sakoman --- meta/recipes-core/busybox/busybox.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index dff4a5dec9..62dc839245 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -154,6 +154,9 @@ do_compile() { cp include/autoconf.h.orig include/autoconf.h if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then + # Guard againt interrupted do_compile: clean temporary files. + rm -f .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps + # split the .config into two parts, and make two busybox binaries oe_runmake busybox.cfg.suid oe_runmake busybox.cfg.nosuid -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176232): https://lists.openembedded.org/g/openembedded-core/message/176232 Mute This Topic: https://lists.openembedded.org/mt/96406216/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 24/41] busybox: always start do_compile with orig config files
From: Antonin Godard When compiling busybox a second time (e.g. with `compile -f`), busybox can use an altered autoconf.h file for compiling, which can ultimately produces different and unwanted binaries. This can produce errors like this one: ERROR: busybox-1.35.0-r0 do_package: Error executing a python function in exec_func_python() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_func_python() autogenerated', lineno: 2, function: 0001: *** 0002:ptest_update_alternatives(d) 0003: File: '…/poky/meta/classes/ptest.bbclass', lineno: 100, function: ptest_update_alternatives 0096:for alt_name, alt_link, alt_target, _ in alternatives: 0097:# Some alternatives are for man pages, 0098:# check if the alternative is in PATH 0099:if os.path.dirname(alt_link) in bin_paths: *** 0100:os.symlink(alt_target, os.path.join(ptest_bindir, alt_name)) 0101:} 0102: 0103:do_configure_ptest_base[dirs] = "${B}" 0104:do_compile_ptest_base[dirs] = "${B}" Exception: FileExistsError: [Errno 17] File exists: '/bin/busybox.suid' -> '…/busybox/1.35.0-r0/package/usr/lib/busybox/ptest/bin/login' This happens because ALTERNATIVE:busybox contains `/bin/login` twice, initially that's because `/bin/login` is present in both busybox.links.suid and busybox.links.nosuid. The reason for that is because of the altered autoconf.h. Steps to reproduce above error: bitbake busybox -c clean bitbake busybox -c package -f bitbake busybox -c compile -f bitbake busybox -c package -f This patch guards against potential bugs by: - making a backup of .config and autoconf.h that have matching timestamps. - make sure do_compile always starts with these files. - restore .config and autoconf.h at the end of do_compile. Signed-off-by: Richard Purdie (cherry picked from commit 6b4a0f063edcfe0a5a4f418842e86ac0c46d9cad) Signed-off-by: Steve Sakoman --- meta/recipes-core/busybox/busybox.inc | 23 +++ 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 5f1c473d5e..dff4a5dec9 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -138,19 +138,23 @@ do_configure () { do_prepare_config merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure + + # Save a copy of .config and autoconf.h. + cp .config .config.orig + cp include/autoconf.h include/autoconf.h.orig } do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS export KCONFIG_NOTIMESTAMP=1 + # Ensure we start do_compile with the original .config and autoconf.h. + # These files should always have matching timestamps. + cp .config.orig .config + cp include/autoconf.h.orig include/autoconf.h + if [ "${BUSYBOX_SPLIT_SUID}" = "1" -a x`grep "CONFIG_FEATURE_INDIVIDUAL=y" .config` = x ]; then # split the .config into two parts, and make two busybox binaries - if [ -e .config.orig ]; then - # Need to guard again an interrupted do_compile - restore any backup - cp .config.orig .config - fi - cp .config .config.orig oe_runmake busybox.cfg.suid oe_runmake busybox.cfg.nosuid @@ -187,15 +191,18 @@ do_compile() { bbfatal "busybox suid binary incorrectly provides /bin/sh" fi - # copy .config.orig back to .config, because the install process may check this file - cp .config.orig .config # cleanup - rm .config.orig .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps + rm .config.app.suid .config.app.nosuid .config.disable.apps .config.nonapps else oe_runmake busybox_unstripped cp busybox_unstripped busybox oe_runmake busybox.links fi + + # restore original .config and autoconf.h, because the install process + # may check these files + cp .config.orig .config + cp include/autoconf.h.orig include/autoconf.h } do_install () { -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176231): https://lists.openembedded.org/g/openembedded-core/message/176231 Mute This Topic: https://lists.openembedded.org/mt/96406215/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 23/41] classes: image: Set empty weak default IMAGE_LINGUAS
From: Alex Kiernan This is already set in default-distrovars.inc and so this assignment will almost never succeed. Rather than leaving it to confuse, set an empty weak default. Signed-off-by: Alex Kiernan Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit eb402948158659da7de0fbbb1bb403c8dad06e2b) Signed-off-by: Steve Sakoman --- meta/classes-recipe/image.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index e387645503..d4bf02784a 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -182,8 +182,7 @@ python () { IMAGE_POSTPROCESS_COMMAND ?= "" -# some default locales -IMAGE_LINGUAS ?= "de-de fr-fr en-gb" +IMAGE_LINGUAS ??= "" LINGUAS_INSTALL ?= "${@" ".join(map(lambda s: "locale-base-%s" % s, d.getVar('IMAGE_LINGUAS').split()))}" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176230): https://lists.openembedded.org/g/openembedded-core/message/176230 Mute This Topic: https://lists.openembedded.org/mt/96406213/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 22/41] bitbake-layers: fix a typo
From: Enguerrand de Ribaucourt Signed-off-by: Enguerrand de Ribaucourt Signed-off-by: Richard Purdie (cherry picked from commit fab3aa7b1b7003bb03678c5cfc62ad2b597f0932) Signed-off-by: Steve Sakoman --- meta/lib/bblayers/makesetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/bblayers/makesetup.py b/meta/lib/bblayers/makesetup.py index 22f89d81a4..834e9338bc 100644 --- a/meta/lib/bblayers/makesetup.py +++ b/meta/lib/bblayers/makesetup.py @@ -46,7 +46,7 @@ class MakeSetupPlugin(LayerPlugin): return describe.strip() def make_repo_config(self, destdir): -""" This is a helper function for the writer plugins that discovers currently confugured layers. +""" This is a helper function for the writer plugins that discovers currently configured layers. The writers do not have to use it, but it can save a bit of work and avoid duplicated code, hence it is available here. """ repos = {} -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176229): https://lists.openembedded.org/g/openembedded-core/message/176229 Mute This Topic: https://lists.openembedded.org/mt/96406212/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 21/41] mesa-gl: gallium is required when enabling x11
From: Carlos Alberto Lopez Perez Otherwise Meson will fail wit this error: - meson.build:555:6: ERROR: Problem encountered: xlib based GLX requires at least one gallium driver Related: https://github.com/agherzan/meta-raspberrypi/pull/1119 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit e7ee2dd98148e5104c52735a9a43e519dc24abfd) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb b/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb index f2bc8f6b5b..c7c7aa7ac3 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb @@ -8,6 +8,6 @@ S = "${WORKDIR}/mesa-${PV}" # At least one DRI rendering engine is required to build mesa. # When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" -PACKAGECONFIG:class-target = "opengl ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa gallium', d)}" +PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" +PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176228): https://lists.openembedded.org/g/openembedded-core/message/176228 Mute This Topic: https://lists.openembedded.org/mt/96406211/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 20/41] uninative: Upgrade to 3.8.1 to include libgcc
From: Michael Halstead Including libgcc solves issues with libpthread. Signed-off-by: Michael Halstead Signed-off-by: Richard Purdie (cherry picked from commit 36eb46589fb01374d4738a2c376386c68d06aa83) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index 7012db441b..51c0cdee43 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -7,9 +7,9 @@ # UNINATIVE_MAXGLIBCVERSION = "2.36" -UNINATIVE_VERSION = "3.7" +UNINATIVE_VERSION = "3.8.1" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/"; -UNINATIVE_CHECKSUM[aarch64] ?= "6a29bcae4b5b716d2d520e18800b33943b65f8a835eac1ff8793fc5ee65b4be6" -UNINATIVE_CHECKSUM[i686] ?= "3f6d52e64996570c716108d49f8108baccf499a283bbefae438c7266b7a93305" -UNINATIVE_CHECKSUM[x86_64] ?= "b110bf2e10fe420f5ca2f3ec55f048ee5f0a54c7e34856a3594e51eb2aea0570" +UNINATIVE_CHECKSUM[aarch64] ?= "3f15d420049b21854bd7a8843da0f42f17064559492c8b752d7a6f998ff5ea65" +UNINATIVE_CHECKSUM[i686] ?= "a6dcf316d738ade2e5e463bd3b33a270b4bfc25bba41770ad5cbdc3b0e24044c" +UNINATIVE_CHECKSUM[x86_64] ?= "5fab9a5c97fc73a21134e5a81f74498cbaecda75d56aab971c934e0b803bcc00" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176227): https://lists.openembedded.org/g/openembedded-core/message/176227 Mute This Topic: https://lists.openembedded.org/mt/96406210/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 19/41] vim: upgrade 9.0.0947 -> 9.0.1211
From: Randy MacLeod Includes fixes for: https://nvd.nist.gov/vuln/detail/CVE-2023-0049 https://nvd.nist.gov/vuln/detail/CVE-2023-0051 https://nvd.nist.gov/vuln/detail/CVE-2023-0054 https://nvd.nist.gov/vuln/detail/CVE-2023-0288 Signed-off-by: Randy MacLeod Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 1c51068c78d12ee02789a6dbecf5e7e91d141af5) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index d86841efaa..9bc6881fce 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".0947" -SRCREV = "cc762a48d42b579fb7bdec2c614636b830342dd5" +PV .= ".1211" +SRCREV = "f7d1c6e1884c76680980571f1cf15e0928d247b5" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176226): https://lists.openembedded.org/g/openembedded-core/message/176226 Mute This Topic: https://lists.openembedded.org/mt/96406209/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v3 1/3] binutils: Upgrade to 2.40 release
On Fri, Jan 20, 2023 at 3:47 AM Luca Ceresoli wrote: > > Hi Khem, > > On Thu, 19 Jan 2023 15:51:39 -0800 > "Khem Raj" wrote: > > > Signed-off-by: Khem Raj > > I'm afraid this time the patch does _really_ not apply, and the simple > sorcery I did for v1 and v2 is not working anymore. If you could > recreate the patches based on a clean oe-core master branch that would > be good. I have pushed the related patchset to a branch on poky-contrib here https://git.yoctoproject.org/poky-contrib/log/?h=kraj/binutils-2.40 Let me know how it goes. > > Thank you! > > -- > Luca Ceresoli, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176225): https://lists.openembedded.org/g/openembedded-core/message/176225 Mute This Topic: https://lists.openembedded.org/mt/96390083/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 18/41] git: Upgrade to 2.37.4
From: Lee Chee Yang upgrade include fixes for CVE-2022-39253 CVE-2022-39260 Release notes: https://github.com/git/git/blob/master/Documentation/RelNotes/2.37.4.txt Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/{git_2.37.3.bb => git_2.37.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/git/{git_2.37.3.bb => git_2.37.4.bb} (98%) diff --git a/meta/recipes-devtools/git/git_2.37.3.bb b/meta/recipes-devtools/git/git_2.37.4.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.37.3.bb rename to meta/recipes-devtools/git/git_2.37.4.bb index 2eed85e807..2205a50d16 100644 --- a/meta/recipes-devtools/git/git_2.37.3.bb +++ b/meta/recipes-devtools/git/git_2.37.4.bb @@ -165,4 +165,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "181f65587155ea48c682f63135678ec53055adf1532428752912d356e46b64a8" +SRC_URI[tarball.sha256sum] = "a638c9bf9e45e8d48592076266adaa9b7aa272a99ee2aee2e166a649a9ba8a03" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176224): https://lists.openembedded.org/g/openembedded-core/message/176224 Mute This Topic: https://lists.openembedded.org/mt/96406208/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 17/41] linux-yocto/5.19: powerpc: Fix reschedule bug in KUAP-unlocked user copy
From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.19: 84f2f8e7a625 powerpc: Fix reschedule bug in KUAP-unlocked user copy Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 438b3523625807e2deca1797ce20649531270676) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.19.bb | 2 +- .../linux/linux-yocto-tiny_5.19.bb| 2 +- meta/recipes-kernel/linux/linux-yocto_5.19.bb | 20 +-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb index 8fb4a6b665..f4d205e613 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb @@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "8385624e99ac8f15de12a2253e8537dd25fbb082" +SRCREV_machine ?= "3101c367eab8952721086b545ad37c301b2a7452" SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb index 92214b4d90..95a8a46bbc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb @@ -14,7 +14,7 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.19.bb b/meta/recipes-kernel/linux/linux-yocto_5.19.bb index 2462f5cac3..5baa0c1130 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.19.bb @@ -13,16 +13,16 @@ KBRANCH:qemux86 ?= "v5.19/standard/base" KBRANCH:qemux86-64 ?= "v5.19/standard/base" KBRANCH:qemumips64 ?= "v5.19/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "6a3ad6f786482c60fa0619935fe48dbb44673084" -SRCREV_machine:qemuarm64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemumips ?= "6722056dc4ccc7ccb7ca6a9d3dd840031c83d66d" -SRCREV_machine:qemuppc ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemuriscv64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemuriscv32 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemux86 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemux86-64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" -SRCREV_machine:qemumips64 ?= "d5bdf10616a90465afaef449feeaf31a51748220" -SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemuarm ?= "f30404d233fc4cc461a0800fd635f4e9650a20a5" +SRCREV_machine:qemuarm64 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemumips ?= "ceaf2134635845794c24b750f15004096a597256" +SRCREV_machine:qemuppc ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemuriscv64 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemuriscv32 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemux86 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemux86-64 ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" +SRCREV_machine:qemumips64 ?= "acf9ebb1e7d1ceb61a89ec33ca4cc3613287630b" +SRCREV_machine ?= "84f2f8e7a625aae0fa9e7027a2e774b99b646cf7" SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176223): https://lists.openembedded.org/g/openembedded-core/message/176223 Mute This Topic: https://lists.openembedded.org/mt/96406207/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 15/41] linux-yocto/5.15: update to v5.15.84
From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: d68f50bfb00f Linux 5.15.84 972707bae3d7 net: fec: properly guard irq coalesce setup 289721fe0993 ASoC: ops: Correct bounds check for second channel on SX controls de0866b94a64 nvme-pci: clear the prp2 field when not used 8bffa95ac19f perf: Fix perf_pending_task() UaF 825bd2af4227 ASoC: cs42l51: Correct PGA Volume minimum value 91582b3a1ab2 net: fec: don't reset irq coalesce settings to defaults on "ip link up" c772dab247f1 can: mcba_usb: Fix termination command argument aa822de7de3b can: sja1000: fix size of OCR_MODE_MASK define 09e08740d78c pinctrl: meditatek: Startup with the IRQs disabled 172a95026f06 libbpf: Use page size as max_entries when probing ring buffer map cf611d786796 ASoC: ops: Check bounds for second channel in snd_soc_put_volsw_sx() a74b88e17025 ASoC: fsl_micfil: explicitly clear CHnF flags afac1e7d78eb ASoC: fsl_micfil: explicitly clear software reset bit 9d933af8fef3 nfp: fix use-after-free in area_cache_get() e1a4f5880d00 vfs: fix copy_file_range() averts filesystem freeze protection 86e28ed25b00 x86/vdso: Conditionally export __vdso_sgx_enter_enclave() fd6d66840b42 Linux 5.15.83 f895511de9d2 io_uring: Fix a null-ptr-deref in io_tctx_exit_cb() f435c66d2336 io_uring: move to separate directory d9e1e5d8a74c block: move CONFIG_BLOCK guard to top Makefile e5c0bc4ff5b0 can: esd_usb: Allow REC and TEC to return to zero db6343a5b0d9 s390/qeth: fix use-after-free in hsci a56c1cebe4a0 s390/qeth: fix various format strings a6dba316c93e macsec: add missing attribute validation for offload 40500f1f4745 net: mvneta: Fix an out of bounds check b9274dbe3999 net: thunderbolt: fix memory leak in tbnet_open() 7390c70bd431 ipv6: avoid use-after-free in ip6_fragment() 1beb475892f7 net: plip: don't call kfree_skb/dev_kfree_skb() under spin_lock_irq() b08412a9cf26 net: phy: mxl-gpy: fix version reporting dec5abd91abc xen/netback: fix build warning 54d830e24247 dpaa2-switch: Fix memory leak in dpaa2_switch_acl_entry_add() and dpaa2_switch_acl_entry_remove() c7adcbd0fd3f ethernet: aeroflex: fix potential skb leak in greth_init_rings() d962d42d6376 tipc: call tipc_lxc_xmit without holding node_read_lock f3b5dda26cd0 net: dsa: sja1105: fix memory leak in sja1105_setup_devlink_regions() 5dab6fa068d7 ipv4: Fix incorrect route flushing when table ID 0 is used ac566bd5770f ipv4: Fix incorrect route flushing when source address is deleted af4ccae4b704 tipc: Fix potential OOB in tipc_link_proto_rcv() b8ce0e6f9f88 net: hisilicon: Fix potential use-after-free in hix5hd2_rx() 16854177745a net: mdio: fix unbalanced fwnode reference count in mdio_device_release() 6f4798ac9c9e net: hisilicon: Fix potential use-after-free in hisi_femac_rx() 114e65a22189 net: thunderx: Fix missing destroy_workqueue of nicvf_rx_mode_wq 51c04945756a net: microchip: sparx5: Fix missing destroy_workqueue of mact_queue 99eec0a766f9 ip_gre: do not report erspan version on GRE interface 2891957853f2 net: stmmac: fix "snps,axi-config" node property parsing 5cb8f1a784fd gpio/rockchip: fix refcount leak in rockchip_gpiolib_register() b8c2f0392d1d nvme initialize core quirks before calling nvme_init_subsystem 908b2da426fe NFC: nci: Bounds check struct nfc_target arrays d841cc156304 i40e: Disallow ip4 and ip6 l4_4_bytes 625a13850b31 i40e: Fix for VF MAC address 0 5538794dbd42 i40e: Fix not setting default xps_cpus after reset a6b30598fec8 net: mvneta: Prevent out of bounds read in mvneta_config_rss() e6e897d4fe2f xen-netfront: Fix NULL sring after live migration eefd8953a748 octeontx2-pf: Fix potential memory leak in otx2_init_tc() f88acaed07b1 net: mdiobus: fix double put fwnode in the error path cc62d76928e0 net: mdiobus: fwnode_mdiobus_register_phy() rework error handling ea113b570eee net: encx24j600: Fix invalid logic in reading of MISTAT register 8aae746d065c net: encx24j600: Add parentheses to fix precedence a110287ef4a4 mac802154: fix missing INIT_LIST_HEAD in ieee802154_if_add() e046421bed5a selftests: rtnetlink: correct xfrm policy rule in kci_test_ipsec_offload 4fa8988a36d5 net: dsa: sja1105: Check return value b35be171dfe6 net: dsa: hellcreek: Check return value a4c342e645d6 net: dsa: ksz: Check return value edf7284a9829 Bluetooth: Fix not cleanup led when bt_init fails 3322193949ac Bluetooth: 6LoWPAN: add missing hci_dev_put() in get_l2cap_conn() 6c88c764e0c4 vmxnet3: use correct intrConf reference when using extended queues 5ad0d85757f8 vmxnet3: correctly report encapsulated LRO packet 5c014eb0ed6c af_unix: Get user_ns from in_skb in unix_diag_get_exact(). 807a01a32979 drm: bridge: dw_hdmi: fix preference of RGB modes over YUV420 eb96fd3983b2 ne
[OE-core][langdale 16/41] linux-yocto/5.15: powerpc: Fix reschedule bug in KUAP-unlocked user copy
From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: f100c753aa1f powerpc: Fix reschedule bug in KUAP-unlocked user copy Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b457e6976e9e64a737517f9d9142ab290cdce214) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb| 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 +-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index dd9f940c7c..122fc0feac 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "6a972b54f014ca67588d73f32058c42af0bd856e" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine ?= "e53e73b907707b92b3433de7c9c776aa504b2d0b" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 8aa2ee14f2..f060e22e84 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "6e85c80a960287ec238f53c91eeade3456044fa3" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine ?= "ae2415ee19511e205a983bc8024700c1f794076a" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index f28dae716b..bb48e158ab 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "24c30a8e9f8385f6d74785aa345f5731321b6c41" -SRCREV_machine:qemuarm64 ?= "c3caed57192735dc74adff939ea35af248a11177" -SRCREV_machine:qemumips ?= "3bed92886dc9177ce0076dada5056cbe83ec11f0" -SRCREV_machine:qemuppc ?= "45cbeb05d362ee51b7836a7faa07958670110c38" -SRCREV_machine:qemuriscv64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemuriscv32 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemux86 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemux86-64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_machine:qemumips64 ?= "2642cdd862a63f5a8c2774f372f3d3424991b1b9" -SRCREV_machine ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" -SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" +SRCREV_machine:qemuarm ?= "8c0f02ba7db6a463ca3aef969441906706edb350" +SRCREV_machine:qemuarm64 ?= "42a14881ba8145b2d1bdfc019c603abe79aeafd4" +SRCREV_machine:qemumips ?= "1ea321a5c9c66edba818ddffcef2aa9910de552e" +SRCREV_machine:qemuppc ?= "14da484e7f2fc95e10abb4db96bc5fd6b444cb60" +SRCREV_machine:qemuriscv64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemuriscv32 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemux86 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemux86-64 ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_machine:qemumips64 ?= "8db5fd5c032f44486ef52f34724d0452aa3a6fea" +SRCREV_machine ?= "f100c753aa1f9638bfd476da0498b09fdee569d6" +SRCREV_meta ?= "e77e5259a3d11efe417b164a0f3341c07ba2bc46" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176222): https://lists.openembedded.org/g/openembedded-core/message/176222 Mute This Topic: https://lists.openembedded.org/mt/96406206/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 14/41] linux-yocto/5.15: libbpf: Fix build warning on ref_ctr_off
From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: da5513f30187 libbpf: Fix build warning on ref_ctr_off Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit eb75d561256c794baf6c89c1975967343145da87) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb| 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 24 +-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index 63294f5bb6..3dac2fbcd2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "dcd3b533c5f6bc4698d5b09aa83ce9a4695df3b0" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine ?= "6a972b54f014ca67588d73f32058c42af0bd856e" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 12e462228f..3dd2ecdf6f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "c7e10f06a33a546bcdd0b2e2909459b7572b5443" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine ?= "6e85c80a960287ec238f53c91eeade3456044fa3" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 4e341713f6..dabbb82822 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "e5f2cf3560139bbaad54796c323d60e66cc19374" -SRCREV_machine:qemuarm64 ?= "d8835a4d4e9d4ea835316cd1843d62e30c5fef33" -SRCREV_machine:qemumips ?= "0f802d6525c21abe586c833074fece3e665a9ed9" -SRCREV_machine:qemuppc ?= "84f529230ca9f2ec20517821f7422d62e43ab808" -SRCREV_machine:qemuriscv64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemuriscv32 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemux86 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemux86-64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_machine:qemumips64 ?= "ea2140a5f0cf7b8351982f60d3b30a4657ab0919" -SRCREV_machine ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" -SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" +SRCREV_machine:qemuarm ?= "24c30a8e9f8385f6d74785aa345f5731321b6c41" +SRCREV_machine:qemuarm64 ?= "c3caed57192735dc74adff939ea35af248a11177" +SRCREV_machine:qemumips ?= "3bed92886dc9177ce0076dada5056cbe83ec11f0" +SRCREV_machine:qemuppc ?= "45cbeb05d362ee51b7836a7faa07958670110c38" +SRCREV_machine:qemuriscv64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemuriscv32 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemux86 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemux86-64 ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_machine:qemumips64 ?= "2642cdd862a63f5a8c2774f372f3d3424991b1b9" +SRCREV_machine ?= "da5513f301871b972d5bc6fab284d3cb277e0a28" +SRCREV_meta ?= "72756ee16d7230f04fb6bbf0bb115e32a9d73d8d" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "71e496bd338221709b180b60ba419fa542c2b320" +SRCREV_machine:class-devupstream ?= "d68f50bfb00f6288e812be895ea5c77932a4b9dd" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176220): https://lists.openembedded.org/g/openembedded-core/message/176220 Mute This Topic: https://lists.openembedded.org/mt/96406204/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=
[OE-core][langdale 13/41] linux-yocto/5.15: fix perf build with clang
From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: 4c5a089621a8 perf python: Account for multiple words in CC Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 1cf78a856beb42a2d68e6c49bfdbc33fea68ebb5) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb| 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 22 +-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index bd57d7c47e..63294f5bb6 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "9860fe27332e09dd4f0f3b303e40377de083be9a" -SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" +SRCREV_machine ?= "dcd3b533c5f6bc4698d5b09aa83ce9a4695df3b0" +SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 8b83b5a8de..12e462228f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "86627fc3da74aefec1338724a597356e6b8ad88b" -SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" +SRCREV_machine ?= "c7e10f06a33a546bcdd0b2e2909459b7572b5443" +SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 0b373c40fe..4e341713f6 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "4915b05912ee7d15224eb9064ca63678f0bc6815" -SRCREV_machine:qemuarm64 ?= "660bf605998f60fd77f24d3316b95b14ef2fa035" -SRCREV_machine:qemumips ?= "38bf282c052b70c1c6dd79dc6ae49da1ec1c7de8" -SRCREV_machine:qemuppc ?= "ac4a5d99364cede21dc1838213f7fb29e1735969" -SRCREV_machine:qemuriscv64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemuriscv32 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemux86 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemux86-64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_machine:qemumips64 ?= "2923c39cc815e2109c9bfc0985adcd8d342fc415" -SRCREV_machine ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" -SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" +SRCREV_machine:qemuarm ?= "e5f2cf3560139bbaad54796c323d60e66cc19374" +SRCREV_machine:qemuarm64 ?= "d8835a4d4e9d4ea835316cd1843d62e30c5fef33" +SRCREV_machine:qemumips ?= "0f802d6525c21abe586c833074fece3e665a9ed9" +SRCREV_machine:qemuppc ?= "84f529230ca9f2ec20517821f7422d62e43ab808" +SRCREV_machine:qemuriscv64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemuriscv32 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemux86 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemux86-64 ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_machine:qemumips64 ?= "ea2140a5f0cf7b8351982f60d3b30a4657ab0919" +SRCREV_machine ?= "4c5a089621a8f395f020f6c2f4c578aafa155011" +SRCREV_meta ?= "66de7a6f2687cdaf5169ce5b57dd35f508be1682" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176219): https://lists.openembedded.org/g/openembedded-core/message/176219 Mute This Topic: https://lists.openembedded.org/mt/96406203/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 12/41] linux-yocto/5.15: ltp and squashfs fixes
From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.15: 1c5699ee85d4 fs: move S_ISGID stripping into the vfs_*() helpers 838f5d0701d8 fs: add mode_strip_sgid() helper d97172683641 squashfs: provide backing_dev_info in order to disable read-ahead Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 474ddb758dd1b327540e48ccfe1500fb4231f30b) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 4 ++-- .../linux/linux-yocto-tiny_5.15.bb| 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 24 +-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index fc1ccd9b39..bd57d7c47e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "a0d36398b257c555381e735cd721cd8479d6762d" -SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" +SRCREV_machine ?= "9860fe27332e09dd4f0f3b303e40377de083be9a" +SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index 087c30b5a5..8b83b5a8de 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "1c3448ff6cc6d24d16c6ef6065cb642245cac627" -SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" +SRCREV_machine ?= "86627fc3da74aefec1338724a597356e6b8ad88b" +SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index d5f21daf35..0b373c40fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "d3aa5916b2b02966ef37bfe3fc527c99754571ec" -SRCREV_machine:qemuarm64 ?= "a1d364fbe3d8a916426a107f07b89fd0338923c7" -SRCREV_machine:qemumips ?= "904de7b55a7e8edf4cd894fb0558efee799a314a" -SRCREV_machine:qemuppc ?= "35d547b91124bef128a13402190ca05f54a2392e" -SRCREV_machine:qemuriscv64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemuriscv32 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemux86 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemux86-64 ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_machine:qemumips64 ?= "ae8ab2e3acaf9e14cd75a6c96f1ba43c66a1babd" -SRCREV_machine ?= "8cd3f1c8dc13e8fa2d9a25ce0285d3526705eea7" -SRCREV_meta ?= "f475b1a9deddbde23f48d7d535abdd5fb133b837" +SRCREV_machine:qemuarm ?= "4915b05912ee7d15224eb9064ca63678f0bc6815" +SRCREV_machine:qemuarm64 ?= "660bf605998f60fd77f24d3316b95b14ef2fa035" +SRCREV_machine:qemumips ?= "38bf282c052b70c1c6dd79dc6ae49da1ec1c7de8" +SRCREV_machine:qemuppc ?= "ac4a5d99364cede21dc1838213f7fb29e1735969" +SRCREV_machine:qemuriscv64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemuriscv32 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemux86 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemux86-64 ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_machine:qemumips64 ?= "2923c39cc815e2109c9bfc0985adcd8d342fc415" +SRCREV_machine ?= "1c5699ee85d4ffe1be2bea17f4587375bf3877f6" +SRCREV_meta ?= "c2d64b008142d2a2bc9c8cca8a3d579a62275122" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "509a32764e1a5692935c4f26ed96fbe94c480186" +SRCREV_machine:class-devupstream ?= "71e496bd338221709b180b60ba419fa542c2b320" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176218): https://lists.openembedded.org/g/openembedded-core/message/176218 Mute This Topic: https://lists.openembedded.org/mt/96406202/21656 Group Owner: openembedded
[OE-core][langdale 11/41] linux-yocto/5.19: fix perf build with clang
From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/5.19: 3326dff489c8 tools: Remove some options from CLANG_CROSS_FLAGS 5b92f7def854 libbpf: Fix build warning on ref_ctr_off b7cd8e00afcd perf python: Account for multiple words in CC Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit b734bd73763548e3991803c03b8bcc3b4bea6432) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.19.bb | 4 ++-- .../linux/linux-yocto-tiny_5.19.bb| 4 ++-- meta/recipes-kernel/linux/linux-yocto_5.19.bb | 22 +-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb index de087eabd4..8fb4a6b665 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.19.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "7883e2f6464fb14e4652769c0294b2eef8075f5f" -SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" +SRCREV_machine ?= "8385624e99ac8f15de12a2253e8537dd25fbb082" +SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.19;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb index 20ee864401..92214b4d90 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.19.bb @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" +SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.19.bb b/meta/recipes-kernel/linux/linux-yocto_5.19.bb index 8d891fe01c..2462f5cac3 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.19.bb @@ -13,17 +13,17 @@ KBRANCH:qemux86 ?= "v5.19/standard/base" KBRANCH:qemux86-64 ?= "v5.19/standard/base" KBRANCH:qemumips64 ?= "v5.19/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "dee954e39057710f00e5b3ea23514d01f3a4d940" -SRCREV_machine:qemuarm64 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemumips ?= "fe2b95c83e022371019027da3dd068ab33576d3f" -SRCREV_machine:qemuppc ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemuriscv64 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemuriscv32 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemux86 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemux86-64 ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_machine:qemumips64 ?= "a5f29b9c64f2b3b47f74fee38f298d8a6b17a8b3" -SRCREV_machine ?= "aaf4490d1807c49e3e0ceab1372533937ef2c82b" -SRCREV_meta ?= "0cba9aa40445bf59bfa651e1bd43a31c2ca7d524" +SRCREV_machine:qemuarm ?= "6a3ad6f786482c60fa0619935fe48dbb44673084" +SRCREV_machine:qemuarm64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemumips ?= "6722056dc4ccc7ccb7ca6a9d3dd840031c83d66d" +SRCREV_machine:qemuppc ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemuriscv64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemuriscv32 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemux86 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemux86-64 ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_machine:qemumips64 ?= "d5bdf10616a90465afaef449feeaf31a51748220" +SRCREV_machine ?= "3326dff489c84262dc81b7e96cae4c359cab38b2" +SRCREV_meta ?= "239a6c0d3c3b046971909f1e066380465b0c331d" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176217): https://lists.openembedded.org/g/openembedded-core/message/176217 Mute This Topic: https://lists.openembedded.org/mt/96406199/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 09/41] xwayland: upgrade 22.1.5 -> 22.1.7
From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit c37ec8b2d91605d6eb5228f0a447fb83f111edc3) Signed-off-by: Steve Sakoman --- .../xwayland/{xwayland_22.1.5.bb => xwayland_22.1.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_22.1.5.bb => xwayland_22.1.7.bb} (95%) diff --git a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb b/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb similarity index 95% rename from meta/recipes-graphics/xwayland/xwayland_22.1.5.bb rename to meta/recipes-graphics/xwayland/xwayland_22.1.7.bb index 51d847a093..dd32bd0111 100644 --- a/meta/recipes-graphics/xwayland/xwayland_22.1.5.bb +++ b/meta/recipes-graphics/xwayland/xwayland_22.1.7.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz"; -SRC_URI[sha256sum] = "e317ac1f119f8321654921761420901e4abd95585a8c763ce26af3b045ac1672" +SRC_URI[sha256sum] = "d53afac6c71953f5cf66d03d289dacd8961da5bd309c1dff125d5955d9db5f76" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176215): https://lists.openembedded.org/g/openembedded-core/message/176215 Mute This Topic: https://lists.openembedded.org/mt/96406197/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 10/41] xserver-xorg: upgrade 21.1.4 -> 21.1.6
From: Alexander Kanavin Changelog: https://fossies.org/linux/misc/xorg-server-21.1.6.tar.xz/xorg-server-21.1.6/ChangeLog Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 009e8d6a292690a0c355d12be2368a9677c701f5) Signed-off-by: Steve Sakoman --- ...possible-memleaks-in-XkbGetKbdByName.patch | 63 --- ...ntedString-against-request-length-at.patch | 38 --- ...-xorg_21.1.4.bb => xserver-xorg_21.1.6.bb} | 4 +- 3 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch rename meta/recipes-graphics/xorg-xserver/{xserver-xorg_21.1.4.bb => xserver-xorg_21.1.6.bb} (80%) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch deleted file mode 100644 index 0e61ec5953..00 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-fix-some-possible-memleaks-in-XkbGetKbdByName.patch +++ /dev/null @@ -1,63 +0,0 @@ -CVE: CVE-2022-3551 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 18f91b950e22c2a342a4fbc55e9ddf7534a707d2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 13 Jul 2022 11:23:09 +1000 -Subject: [PATCH] xkb: fix some possible memleaks in XkbGetKbdByName - -GetComponentByName returns an allocated string, so let's free that if we -fail somewhere. - -Signed-off-by: Peter Hutterer - xkb/xkb.c | 26 -- - 1 file changed, 20 insertions(+), 6 deletions(-) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index 4692895db..b79a269e3 100644 a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5935,18 +5935,32 @@ ProcXkbGetKbdByName(ClientPtr client) - xkb = dev->key->xkbInfo->desc; - status = Success; - str = (unsigned char *) &stuff[1]; --if (GetComponentSpec(&str, TRUE, &status)) /* keymap, unsupported */ --return BadMatch; -+{ -+char *keymap = GetComponentSpec(&str, TRUE, &status); /* keymap, unsupported */ -+if (keymap) { -+free(keymap); -+return BadMatch; -+} -+} - names.keycodes = GetComponentSpec(&str, TRUE, &status); - names.types = GetComponentSpec(&str, TRUE, &status); - names.compat = GetComponentSpec(&str, TRUE, &status); - names.symbols = GetComponentSpec(&str, TRUE, &status); - names.geometry = GetComponentSpec(&str, TRUE, &status); --if (status != Success) -+if (status == Success) { -+len = str - ((unsigned char *) stuff); -+if ((XkbPaddedSize(len) / 4) != stuff->length) -+status = BadLength; -+} -+ -+if (status != Success) { -+free(names.keycodes); -+free(names.types); -+free(names.compat); -+free(names.symbols); -+free(names.geometry); - return status; --len = str - ((unsigned char *) stuff); --if ((XkbPaddedSize(len) / 4) != stuff->length) --return BadLength; -+} - - CHK_MASK_LEGAL(0x01, stuff->want, XkbGBN_AllComponentsMask); - CHK_MASK_LEGAL(0x02, stuff->need, XkbGBN_AllComponentsMask); --- -2.34.1 - diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch deleted file mode 100644 index 6f862e82f9..00 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xkb-proof-GetCountedString-against-request-length-at.patch +++ /dev/null @@ -1,38 +0,0 @@ -CVE: CVE-2022-3550 -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From 11beef0b7f1ed290348e45618e5fa0d2bffcb72e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 5 Jul 2022 12:06:20 +1000 -Subject: [PATCH] xkb: proof GetCountedString against request length attacks - -GetCountedString did a check for the whole string to be within the -request buffer but not for the initial 2 bytes that contain the length -field. A swapped client could send a malformed request to trigger a -swaps() on those bytes, writing into random memory. - -Signed-off-by: Peter Hutterer - xkb/xkb.c | 5 + - 1 file changed, 5 insertions(+) - -diff --git a/xkb/xkb.c b/xkb/xkb.c -index f42f59ef3..1841cff26 100644 a/xkb/xkb.c -+++ b/xkb/xkb.c -@@ -5137,6 +5137,11 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) - CARD16 len; - - wire = *wire_inout; -+ -+if (client->req_len < -+bytes_to_int32(wire + 2 - (char *) client->requestBuffer)) -+return BadValue; -+ - len = *(CARD16 *) wire; - if (client->swapped) { -
[OE-core][langdale 08/41] linux-firmware: upgrade 20221109 -> 20221214
From: Alexander Kanavin License-Update: additional files Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 15f3a9f6c4406ddc00f7dc0ca7e1beafe9c71a9f) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20221109.bb => linux-firmware_20221214.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20221109.bb => linux-firmware_20221214.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb index b05b960ebd..c2354e627f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20221109.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "ab4ba608dc4b757716871f9be033f0f1" +WHENCE_CHKSUM = "bf7c716d16e48fe118c6209f99b13253" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -209,7 +209,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701" +SRC_URI[sha256sum] = "e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331" inherit allarch -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176214): https://lists.openembedded.org/g/openembedded-core/message/176214 Mute This Topic: https://lists.openembedded.org/mt/96406196/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 07/41] libksba: update 1.6.2 -> 1.6.3
From: Alexander Kanavin Noteworthy changes in version 1.6.3 (2022-12-06) Fix another integer overflow in the CRL parser. [T6284,CVE-2022-47629] Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 83f3f21b1b84ab9e7b461ac966691c80f4ed4e97) Signed-off-by: Steve Sakoman --- .../libksba/libksba/ksba-add-pkgconfig-support.patch| 6 +++--- .../libksba/{libksba_1.6.2.bb => libksba_1.6.3.bb} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta/recipes-support/libksba/{libksba_1.6.2.bb => libksba_1.6.3.bb} (94%) diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch index af96bd57cd..bdb80ff34d 100644 --- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch +++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch @@ -1,4 +1,4 @@ -From 6081640895b6d566fa21123e2de7d111eeab5c4c Mon Sep 17 00:00:00 2001 +From ca8174aa81d7bf364b33f7254a9e887735c4996d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Mon, 3 Dec 2012 18:17:31 +0800 Subject: [PATCH] libksba: add pkgconfig support @@ -16,7 +16,7 @@ Signed-off-by: Chen Qi 1 file changed, 4 insertions(+), 86 deletions(-) diff --git a/src/ksba.m4 b/src/ksba.m4 -index 6b55bb8..6e7336f 100644 +index 452c245..aa96255 100644 --- a/src/ksba.m4 +++ b/src/ksba.m4 @@ -23,37 +23,6 @@ dnl with a changed API. @@ -44,7 +44,7 @@ index 6b55bb8..6e7336f 100644 - fi - - use_gpgrt_config="" -- if test x"$KSBA_CONFIG" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then +- if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then -if $GPGRT_CONFIG ksba --exists; then - KSBA_CONFIG="$GPGRT_CONFIG ksba" - AC_MSG_NOTICE([Use gpgrt-config as ksba-config]) diff --git a/meta/recipes-support/libksba/libksba_1.6.2.bb b/meta/recipes-support/libksba/libksba_1.6.3.bb similarity index 94% rename from meta/recipes-support/libksba/libksba_1.6.2.bb rename to meta/recipes-support/libksba/libksba_1.6.3.bb index f6ecb9aec4..dc39693be4 100644 --- a/meta/recipes-support/libksba/libksba_1.6.2.bb +++ b/meta/recipes-support/libksba/libksba_1.6.3.bb @@ -24,7 +24,7 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"; SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ file://ksba-add-pkgconfig-support.patch" -SRC_URI[sha256sum] = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971" +SRC_URI[sha256sum] = "3f72c68db30971ebbf14367527719423f0a4d5f8103fc9f4a1c01a9fa440de5c" do_configure:prepend () { # Else these could be used in preference to those in aclocal-copy -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176213): https://lists.openembedded.org/g/openembedded-core/message/176213 Mute This Topic: https://lists.openembedded.org/mt/96406195/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 06/41] pango: upgrade 1.50.11 -> 1.50.12
From: Ross Burton Overview of changes in 1.50.12, 18-11-2022 == - Fix weight conversion on MacOS - Update to Unicode 15 - Some introspection annotation fixes - Improve PangoAttrList serialization - Fix char offset calculatiosn in multi-paragraph layouts Signed-off-by: Ross Burton Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 35fc61a1dd63a0555b67da899418010d595b545c) Signed-off-by: Steve Sakoman --- ...d-install-nofonts-fonts.conf-as-it-i.patch | 35 --- .../{pango_1.50.11.bb => pango_1.50.12.bb}| 3 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch rename meta/recipes-graphics/pango/{pango_1.50.11.bb => pango_1.50.12.bb} (90%) diff --git a/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch b/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch deleted file mode 100644 index 8dacd62138..00 --- a/meta/recipes-graphics/pango/pango/0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 13f8ba5d5b699df1f88eeea859406daba6d6941f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 8 Nov 2022 18:08:51 +0100 -Subject: [PATCH] tests/meson.build: install nofonts/fonts.conf as it is - required by tests - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/-/merge_requests/654] -Signed-off-by: Alexander Kanavin - tests/meson.build | 5 + - 1 file changed, 5 insertions(+) - -diff --git a/tests/meson.build b/tests/meson.build -index 8b4bfa38..6c1c461b 100644 a/tests/meson.build -+++ b/tests/meson.build -@@ -250,6 +250,10 @@ foreach d: test_items_data - installed_test_items_data += d + '.expected' - endforeach - -+installed_test_nofonts_data = [ -+ 'nofonts/fonts.conf', -+] -+ - installed_test_datadir = join_paths(pango_datadir, 'installed-tests', 'pango') - installed_test_bindir = join_paths(pango_libexecdir, 'installed-tests', 'pango') - -@@ -261,6 +265,7 @@ if get_option('install-tests') - install_data(installed_test_breaks_data, install_dir: join_paths(installed_test_bindir, 'breaks')) - install_data(installed_test_items_data, install_dir: join_paths(installed_test_bindir, 'itemize')) - install_data(installed_test_fontsets_data, install_dir: join_paths(installed_test_bindir, 'fontsets')) -+ install_data(installed_test_nofonts_data, install_dir: join_paths(installed_test_bindir, 'nofonts')) - endif - - gen_installed_test = files([ 'gen-installed-test.py' ]) diff --git a/meta/recipes-graphics/pango/pango_1.50.11.bb b/meta/recipes-graphics/pango/pango_1.50.12.bb similarity index 90% rename from meta/recipes-graphics/pango/pango_1.50.11.bb rename to meta/recipes-graphics/pango/pango_1.50.12.bb index 6f599f5b78..6779f39c4f 100644 --- a/meta/recipes-graphics/pango/pango_1.50.11.bb +++ b/meta/recipes-graphics/pango/pango_1.50.12.bb @@ -22,10 +22,9 @@ GIR_MESON_DISABLE_FLAG = "disabled" SRC_URI += "file://run-ptest \ file://0001-Skip-running-test-layout-test.patch \ - file://0001-tests-meson.build-install-nofonts-fonts.conf-as-it-i.patch \ " -SRC_URI[archive.sha256sum] = "8800f812d89ee61388188703203f3a7878963c22f8695aaf1fa0a1a1428d17ae" +SRC_URI[archive.sha256sum] = "caef96d27bbe792a6be92727c73468d832b13da57c8071ef79b9df69ee058fe3" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176212): https://lists.openembedded.org/g/openembedded-core/message/176212 Mute This Topic: https://lists.openembedded.org/mt/96406193/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 05/41] curl: Fix CVE-2022-43551 and CVE-2022-43552
From: Robert Joslyn Backport patches to address these CVEs. * https://curl.se/docs/CVE-2022-43551.html * https://curl.se/docs/CVE-2022-43552.html Signed-off-by: Robert Joslyn Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2022-43551.patch| 32 .../curl/curl/CVE-2022-43552.patch| 78 +++ meta/recipes-support/curl/curl_7.85.0.bb | 2 + 3 files changed, 112 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2022-43551.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2022-43552.patch diff --git a/meta/recipes-support/curl/curl/CVE-2022-43551.patch b/meta/recipes-support/curl/curl/CVE-2022-43551.patch new file mode 100644 index 00..7c617ef1db --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2022-43551.patch @@ -0,0 +1,32 @@ +From 08aa76b7b24454a89866aaef661ea90ae3d57900 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 19 Dec 2022 08:36:55 +0100 +Subject: [PATCH] http: use the IDN decoded name in HSTS checks + +Otherwise it stores the info HSTS into the persistent cache for the IDN +name which will not match when the HSTS status is later checked for +using the decoded name. + +Reported-by: Hiroki Kurosawa + +Closes #10111 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/9e71901634e276dd] +Signed-off-by: Robert Joslyn +--- + lib/http.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/http.c b/lib/http.c +index b0ad28e..8b18e8d 100644 +--- a/lib/http.c b/lib/http.c +@@ -3654,7 +3654,7 @@ CURLcode Curl_http_header(struct Curl_easy *data, struct connectdata *conn, + else if(data->hsts && checkprefix("Strict-Transport-Security:", headp) && + (conn->handler->flags & PROTOPT_SSL)) { + CURLcode check = +- Curl_hsts_parse(data->hsts, data->state.up.hostname, ++ Curl_hsts_parse(data->hsts, conn->host.name, + headp + strlen("Strict-Transport-Security:")); + if(check) + infof(data, "Illegal STS header skipped"); diff --git a/meta/recipes-support/curl/curl/CVE-2022-43552.patch b/meta/recipes-support/curl/curl/CVE-2022-43552.patch new file mode 100644 index 00..059dad17d8 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2022-43552.patch @@ -0,0 +1,78 @@ +From 6ae56c9c47b02106373c9482f09c510fd5c50a84 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 19 Dec 2022 08:38:37 +0100 +Subject: [PATCH] smb/telnet: do not free the protocol struct in *_done() + +It is managed by the generic layer. + +Reported-by: Trail of Bits + +Closes #10112 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/4f20188ac644afe1] +Signed-off-by: Robert Joslyn +--- + lib/smb.c| 14 ++ + lib/telnet.c | 3 --- + 2 files changed, 2 insertions(+), 15 deletions(-) + +diff --git a/lib/smb.c b/lib/smb.c +index 039d680..f682c1f 100644 +--- a/lib/smb.c b/lib/smb.c +@@ -62,8 +62,6 @@ static CURLcode smb_connect(struct Curl_easy *data, bool *done); + static CURLcode smb_connection_state(struct Curl_easy *data, bool *done); + static CURLcode smb_do(struct Curl_easy *data, bool *done); + static CURLcode smb_request_state(struct Curl_easy *data, bool *done); +-static CURLcode smb_done(struct Curl_easy *data, CURLcode status, +- bool premature); + static CURLcode smb_disconnect(struct Curl_easy *data, +struct connectdata *conn, bool dead); + static int smb_getsock(struct Curl_easy *data, struct connectdata *conn, +@@ -78,7 +76,7 @@ const struct Curl_handler Curl_handler_smb = { + "SMB",/* scheme */ + smb_setup_connection, /* setup_connection */ + smb_do, /* do_it */ +- smb_done, /* done */ ++ ZERO_NULL,/* done */ + ZERO_NULL,/* do_more */ + smb_connect, /* connect_it */ + smb_connection_state, /* connecting */ +@@ -105,7 +103,7 @@ const struct Curl_handler Curl_handler_smbs = { + "SMBS", /* scheme */ + smb_setup_connection, /* setup_connection */ + smb_do, /* do_it */ +- smb_done, /* done */ ++ ZERO_NULL,/* done */ + ZERO_NULL,/* do_more */ + smb_connect, /* connect_it */ + smb_connection_state, /* connecting */ +@@ -941,14 +939,6 @@ static CURLcode smb_request_state(struct Curl_easy *data, bool *done) + return CURLE_OK; + } + +-static CURLcode smb_done(struct Curl_easy *data, CURLcode status, +- bool premature) +-{ +- (void) premature; +- Curl_safefree(data->req.p.smb); +- return status; +-} +- + static CURLcode smb_disconnect(struct Curl_easy *data, +
[OE-core][langdale 04/41] cairo: fix CVE patches assigned wrong CVE number
From: Quentin Schulz CVE-2019-6461 and CVE-2019-6462 are fixed, but the reporting is incorrect as the patch for CVE-2019-6461 is actually for CVE-2019-6462 and vice-versa. This swaps both files and edit the CVE field to report the correct identifier. Cc: Quentin Schulz Signed-off-by: Quentin Schulz Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit f12c2a5ac94cb29f473f3c7e335463c7fb6d8a6e) Signed-off-by: Steve Sakoman --- .../cairo/cairo/CVE-2019-6461.patch | 46 ++- .../cairo/cairo/CVE-2019-6462.patch | 46 +-- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch index 0b7d9a0c36..a2dba6cb20 100644 --- a/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch +++ b/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch @@ -1,40 +1,20 @@ -CVE: CVE-2019-6461 -Upstream-Status: Backport -Signed-off-by: Quentin Schulz - -From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin -Date: Sun, 1 Aug 2021 11:16:03 + -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop +There is an assertion in function _cairo_arc_in_direction(). - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) +CVE: CVE-2019-6461 +Upstream-Status: Pending +Signed-off-by: Ross Burton diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 +index 390397bae..1bde774a4 100644 --- a/src/cairo-arc.c +++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ +@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, + if (cairo_status (cr)) + return; - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; +-assert (angle_max >= angle_min); ++if (angle_max < angle_min) ++ return; - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); --} while (error > tolerance); -+} while (error > tolerance && i < max_segments); - - return angle; - } --- -2.38.1 - + if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { + angle_max = fmod (angle_max - angle_min, 2 * M_PI); diff --git a/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch b/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch index 4e4598c5b5..7c3209291b 100644 --- a/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch +++ b/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch @@ -1,20 +1,40 @@ -There is an assertion in function _cairo_arc_in_direction(). - CVE: CVE-2019-6462 -Upstream-Status: Pending -Signed-off-by: Ross Burton +Upstream-Status: Backport +Signed-off-by: Quentin Schulz + +From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Sun, 1 Aug 2021 11:16:03 + +Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop + +--- + src/cairo-arc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1bde774a4 100644 +index 390397bae..1c891d1a0 100644 --- a/src/cairo-arc.c +++ b/src/cairo-arc.c -@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, - if (cairo_status (cr)) - return; +@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) + { M_PI / 11.0, 9.81410988043554039085e-09 }, + }; + int table_size = ARRAY_LENGTH (table); ++const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ --assert (angle_max >= angle_min); -+if (angle_max < angle_min) -+ return; + for (i = 0; i < table_size; i++) + if (table[i].error < tolerance) + return table[i].angle; - if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { - angle_max = fmod (angle_max - angle_min, 2 * M_PI); + ++i; ++ + do { + angle = M_PI / i++; + error = _arc_error_normalized (angle); +-} while (error > tolerance); ++} while (error > tolerance && i < max_segments); + + return angle; + } +-- +2.38.1 + -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176210): https://lists.openembedded.org/g/openembedded-core/message/176210 Mute This Topic: https://lists.openembedded.org/mt/96406191/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 03/41] cve-check: write the cve manifest to IMGDEPLOYDIR
From: Jermain Horsman When building an image cve_check_write_rootfs_manifest() would sometimes fail with a FileNotFoundError when writing the manifest.cve due to the parent directory (DEPLOY_DIR_IMAGE) not (yet) existing. The image task will provide the manifest in the deploy directory afterwards, so other recipes depending on the manifest being in DEPLOY_DIR_IMAGE should continue to function properly. Signed-off-by: Jermain Horsman Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 00fb2aae22ce0d7ff5f3f8766fa770eeb4e73483) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index 4b4ea7893e..41fdf8363f 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -48,8 +48,8 @@ CVE_CHECK_LOG_JSON ?= "${T}/cve.json" CVE_CHECK_DIR ??= "${DEPLOY_DIR}/cve" CVE_CHECK_RECIPE_FILE ?= "${CVE_CHECK_DIR}/${PN}" CVE_CHECK_RECIPE_FILE_JSON ?= "${CVE_CHECK_DIR}/${PN}_cve.json" -CVE_CHECK_MANIFEST ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cve" -CVE_CHECK_MANIFEST_JSON ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.json" +CVE_CHECK_MANIFEST ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cve" +CVE_CHECK_MANIFEST_JSON ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.json" CVE_CHECK_COPY_FILES ??= "1" CVE_CHECK_CREATE_MANIFEST ??= "1" @@ -202,7 +202,7 @@ python cve_check_write_rootfs_manifest () { recipies.add(pkg_data["PN"]) bb.note("Writing rootfs CVE manifest") -deploy_dir = d.getVar("DEPLOY_DIR_IMAGE") +deploy_dir = d.getVar("IMGDEPLOYDIR") link_name = d.getVar("IMAGE_LINK_NAME") json_data = {"version":"1", "package": []} -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176209): https://lists.openembedded.org/g/openembedded-core/message/176209 Mute This Topic: https://lists.openembedded.org/mt/96406190/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 02/41] cve-update-db-native: show IP on failure
From: Ross Burton We get random SSL failures when fetching the CVE database, and it's notable that the NVD server is behind a DNS round-robin or geographically diverse servers. On a hunch that there is one misconfigured server, dump the IP that we connected to. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 91f46d431dc8f40e8c6475c800bb61cb08b82b0a) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/cve-update-db-native.bb | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 079f062f79..e042e67b09 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -130,7 +130,10 @@ def update_db_file(db_tmp_file, d): response = urllib.request.urlopen(meta_url, timeout=cve_socket_timeout) except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') -bb.warn("Failed to fetch CVE data (%s)" % e.reason) +bb.warn("Failed to fetch CVE data (%s)" % e) +import socket +result = socket.getaddrinfo("nvd.nist.gov", 443, proto=socket.IPPROTO_TCP) +bb.warn("Host IPs are %s" % (", ".join(t[4][0] for t in result))) return False if response: -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176208): https://lists.openembedded.org/g/openembedded-core/message/176208 Mute This Topic: https://lists.openembedded.org/mt/96406188/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core][langdale 01/41] cve-update-db-native: avoid incomplete updates
From: Marta Rybczynska The database update has been done on the original file. In case of network connection issues, temporary outage of the NVD server or a similar situation, the function could exit with incomplete data in the database. This patch solves the issue by performing the update on a copy of the database. It replaces the main one only if the whole update was successful. See https://bugzilla.yoctoproject.org/show_bug.cgi?id=14929 Reported-by: Alberto Pianon Signed-off-by: Marta Rybczynska Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 8efe99214d8b005f0ecac690ce5ba17b31758f92) Signed-off-by: Steve Sakoman --- .../recipes-core/meta/cve-update-db-native.bb | 83 ++- 1 file changed, 61 insertions(+), 22 deletions(-) diff --git a/meta/recipes-core/meta/cve-update-db-native.bb b/meta/recipes-core/meta/cve-update-db-native.bb index 9b9dbbd75f..079f062f79 100644 --- a/meta/recipes-core/meta/cve-update-db-native.bb +++ b/meta/recipes-core/meta/cve-update-db-native.bb @@ -21,6 +21,8 @@ CVE_DB_UPDATE_INTERVAL ?= "86400" # Timeout for blocking socket operations, such as the connection attempt. CVE_SOCKET_TIMEOUT ?= "60" +CVE_DB_TEMP_FILE ?= "${CVE_CHECK_DB_DIR}/temp_nvdcve_1.1.db" + python () { if not bb.data.inherits_class("cve-check", d): raise bb.parse.SkipRecipe("Skip recipe when cve-check class is not loaded.") @@ -32,25 +34,15 @@ python do_fetch() { """ import bb.utils import bb.progress -import sqlite3, urllib, urllib.parse, gzip -from datetime import date +import shutil bb.utils.export_proxies(d) -YEAR_START = 2002 - db_file = d.getVar("CVE_CHECK_DB_FILE") db_dir = os.path.dirname(db_file) +db_tmp_file = d.getVar("CVE_DB_TEMP_FILE") -cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) - -if os.path.exists("{0}-journal".format(db_file)): -# If a journal is present the last update might have been interrupted. In that case, -# just wipe any leftovers and force the DB to be recreated. -os.remove("{0}-journal".format(db_file)) - -if os.path.exists(db_file): -os.remove(db_file) +cleanup_db_download(db_file, db_tmp_file) # The NVD database changes once a day, so no need to update more frequently # Allow the user to force-update @@ -68,9 +60,60 @@ python do_fetch() { pass bb.utils.mkdirhier(db_dir) +if os.path.exists(db_file): +shutil.copy2(db_file, db_tmp_file) + +if update_db_file(db_tmp_file, d) == True: +# Update downloaded correctly, can swap files +shutil.move(db_tmp_file, db_file) +else: +# Update failed, do not modify the database +bb.note("CVE database update failed") +os.remove(db_tmp_file) +} + +do_fetch[lockfiles] += "${CVE_CHECK_DB_FILE_LOCK}" +do_fetch[file-checksums] = "" +do_fetch[vardeps] = "" + +def cleanup_db_download(db_file, db_tmp_file): +""" +Cleanup the download space from possible failed downloads +""" + +# Clean up the updates done on the main file +# Remove it only if a journal file exists - it means a complete re-download +if os.path.exists("{0}-journal".format(db_file)): +# If a journal is present the last update might have been interrupted. In that case, +# just wipe any leftovers and force the DB to be recreated. +os.remove("{0}-journal".format(db_file)) + +if os.path.exists(db_file): +os.remove(db_file) + +# Clean-up the temporary file downloads, we can remove both journal +# and the temporary database +if os.path.exists("{0}-journal".format(db_tmp_file)): +# If a journal is present the last update might have been interrupted. In that case, +# just wipe any leftovers and force the DB to be recreated. +os.remove("{0}-journal".format(db_tmp_file)) + +if os.path.exists(db_tmp_file): +os.remove(db_tmp_file) + +def update_db_file(db_tmp_file, d): +""" +Update the given database file +""" +import bb.utils, bb.progress +from datetime import date +import urllib, gzip, sqlite3 + +YEAR_START = 2002 +cve_socket_timeout = int(d.getVar("CVE_SOCKET_TIMEOUT")) # Connect to database -conn = sqlite3.connect(db_file) +conn = sqlite3.connect(db_tmp_file) initialize_db(conn) with bb.progress.ProgressHandler(d) as ph, open(os.path.join(d.getVar("TMPDIR"), 'cve_check'), 'a') as cve_f: @@ -88,7 +131,7 @@ python do_fetch() { except urllib.error.URLError as e: cve_f.write('Warning: CVE db update error, Unable to fetch CVE data.\n\n') bb.warn("Failed to fetch CVE data (%s)" % e.reason) -return +return False if response: for l in response.read().decode("utf-8").splitlines(): @@ -98,7 +141,7 @@ python do_fetch() {
[OE-core][langdale 00/41] Patch review
Please review this set of patches for langdale and have comments back by end of day Tuesday. Passed a-full on autobuilder: https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/4817 The following changes since commit b2dfb2fe86de887d0239078ded0a4f9e8c677d83: devtool: process local files only for the main branch (2023-01-11 06:07:36 -1000) are available in the Git repository at: https://git.openembedded.org/openembedded-core-contrib stable/langdale-nut http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut Alex Kiernan (1): classes: image: Set empty weak default IMAGE_LINGUAS Alexander Kanavin (5): libksba: update 1.6.2 -> 1.6.3 linux-firmware: upgrade 20221109 -> 20221214 xwayland: upgrade 22.1.5 -> 22.1.7 xserver-xorg: upgrade 21.1.4 -> 21.1.6 selftest/virgl: use pkg-config from the host Anton Antonov (1): rust: Do not use default compiler flags defined in CC crate Antonin Godard (2): busybox: always start do_compile with orig config files busybox: rm temporary files if do_compile was interrupted Benoît Mauduit (1): lib/oe/reproducible: Use git log without gpg signature Bruce Ashfield (7): linux-yocto/5.19: fix perf build with clang linux-yocto/5.15: ltp and squashfs fixes linux-yocto/5.15: fix perf build with clang linux-yocto/5.15: libbpf: Fix build warning on ref_ctr_off linux-yocto/5.15: update to v5.15.84 linux-yocto/5.15: powerpc: Fix reschedule bug in KUAP-unlocked user copy linux-yocto/5.19: powerpc: Fix reschedule bug in KUAP-unlocked user copy Carlos Alberto Lopez Perez (1): mesa-gl: gallium is required when enabling x11 Charlie Johnston (1): opkg: ensure opkg uses private gpg.conf when applying keys. Chen Qi (2): dhcpcd: backport two patches to fix runtime error libseccomp: fix typo in DESCRIPTION Enguerrand de Ribaucourt (1): bitbake-layers: fix a typo Jan Kircher (1): toolchain-scripts: compatibility with unbound variable protection Jermain Horsman (1): cve-check: write the cve manifest to IMGDEPLOYDIR Khem Raj (1): tiff: Add packageconfig knob for webp Lee Chee Yang (1): git: Upgrade to 2.37.4 Markus Volk (1): librsvg: enable vapi build Marta Rybczynska (1): cve-update-db-native: avoid incomplete updates Michael Halstead (1): uninative: Upgrade to 3.8.1 to include libgcc Petr Kubizňák (1): harfbuzz: remove bindir only if it exists Quentin Schulz (1): cairo: fix CVE patches assigned wrong CVE number Randy MacLeod (1): vim: upgrade 9.0.0947 -> 9.0.1211 Robert Joslyn (1): curl: Fix CVE-2022-43551 and CVE-2022-43552 Ross Burton (4): cve-update-db-native: show IP on failure pango: upgrade 1.50.11 -> 1.50.12 oeqa/selftest/debuginfod: improve testcase curl: don't enable debug builds Sandeep Gundlupet Raju (2): kernel-fitimage: Adjust order of dtb/dtbo files kernel-fitimage: Allow user to select dtb when multiple dtb exists Saul Wold (1): at: Change when files are copied leimaohui (1): libpng: Enable NEON for aarch64 to enensure consistency with arm32. meta/classes-recipe/image.bbclass | 3 +- meta/classes-recipe/kernel-fitimage.bbclass | 21 - meta/classes-recipe/rust-common.bbclass | 28 -- .../classes-recipe/rust-target-config.bbclass | 16 meta/classes-recipe/toolchain-scripts.bbclass | 2 +- meta/classes/cve-check.bbclass| 6 +- meta/conf/distro/include/yocto-uninative.inc | 8 +- meta/lib/bblayers/makesetup.py| 2 +- meta/lib/oe/reproducible.py | 3 +- meta/lib/oeqa/selftest/cases/debuginfod.py| 67 -- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 +- .../dhcpcd/dhcpcd_9.4.1.bb| 2 + ...low-getrandom-sysctl-for-newer-glibc.patch | 30 +++ ...sep-Allow-newfstatat-syscall-as-well.patch | 31 +++ meta/recipes-core/busybox/busybox.inc | 26 -- .../recipes-core/meta/cve-update-db-native.bb | 88 ++- .../git/{git_2.37.3.bb => git_2.37.4.bb} | 2 +- ...emove-no-options-flag-from-gpg-calls.patch | 34 +++ meta/recipes-devtools/opkg/opkg_0.6.1.bb | 1 + meta/recipes-extended/at/at_3.2.5.bb | 6 +- meta/recipes-gnome/librsvg/librsvg_2.54.5.bb | 2 + .../cairo/cairo/CVE-2019-6461.patch | 46 +++--- .../cairo/cairo/CVE-2019-6462.patch | 46 +++--- .../harfbuzz/harfbuzz_5.1.0.bb| 6 +- meta/recipes-graphics/mesa/mesa-gl_22.2.3.bb | 4 +- ...d-install-nofonts-fonts.conf-as-it-i.patch | 35 .../{pango_1.50.11.bb => pango_1.50.12.bb}| 3 +- ...possible-memleaks-in-XkbGetKbdByName.patch | 63 - ...ntedString-against-request-length-at.patch | 38 ...-xorg_21.1.4.bb => xserver-xorg_21.1.6.bb} | 4 +- ...{xwayland_22.1.5.bb => xwayland_22.1.7.bb} | 2 +- ...20221109.bb => linux-firmware_20221214.bb} | 4 +- .../linux/linux-yocto-rt_5.15.bb | 6 +- .../linux
[OE-core] [PATCH 13/14] oeqa qemurunner.py: add debug output to run_serial()
Add debug output which is useful if qemu system hangs and doesn't respond in time. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 494b4e03da..0e720ef5f0 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -657,6 +657,7 @@ class QemuRunner: # Returns (status, output) where status is 1 on success and 0 on error # We assume target system have echo to get command status +self.logger.debug("run_serial() called: command = %s, raw = %s, timeout = %d" % (command, raw, timeout)) if not raw: command = "%s; echo $?\n" % command -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176204): https://lists.openembedded.org/g/openembedded-core/message/176204 Mute This Topic: https://lists.openembedded.org/mt/96401369/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 14/14] oeqa qemurunner.py: improve logging in run_serial()
When serial communication times outs, write note also to bitbake task output. Then add a small sleep to collect more output to avoid reading data one character at a time. This makes logs much more readable. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 0e720ef5f0..b1c6ab8ce7 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -670,12 +670,15 @@ class QemuRunner: now = time.time() if now >= end: data += "<<< run_serial(): command timed out after %d seconds without output >>>\r\n\r\n" % timeout +self.logger.debug("run_serial(): command timed out after %d seconds without output" % timeout) break try: sread, _, _ = select.select([self.server_socket],[],[], end - now) except InterruptedError: continue if sread: +# try to avoid reading single character at a time, makes logs readable +time.sleep(0.1) answer = self.server_socket.recv(1024) if answer: data += answer.decode('utf-8') -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176205): https://lists.openembedded.org/g/openembedded-core/message/176205 Mute This Topic: https://lists.openembedded.org/mt/96401370/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 11/14] oeqa qemurunner.py: add timeout to QMP calls
When a qemu machine hangs, the QMP calls can hang for ever too, and when this happens any failing test commands from ssh runner may be followed by dump_monitor() calls which then also hang. Hangs followed by hangs. Use runqemutime at setup and run_monitor() specific timeout for later calls. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index ed44036758..7f5d87fe70 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -350,6 +350,9 @@ class QemuRunner: return False try: +# set timeout value for all QMP calls +self.logger.info("QMP setting timeout to %d" % (self.runqemutime)) +self.qmp.settimeout(self.runqemutime) self.qmp.connect() connect_time = time.time() self.logger.info("QMP connected to QEMU at %s and took %s seconds" % @@ -633,7 +636,9 @@ class QemuRunner: return False def run_monitor(self, command, args=None, timeout=60): +self.logger.debug("run_monitor() called: command = %s, args = %s, timeout = %d" % (command, args, timeout)) if hasattr(self, 'qmp') and self.qmp: +self.qmp.settimeout(timeout) if args is not None: return self.qmp.cmd(command, args) else: -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176202): https://lists.openembedded.org/g/openembedded-core/message/176202 Mute This Topic: https://lists.openembedded.org/mt/96401366/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 12/14] oeqa qemurunner.py: kill qemu if it hangs
qemu doesn't always behave well and can hang too. Log calls to stop qemu and finally kill it with force if was still alive. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 9 + 1 file changed, 9 insertions(+) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 7f5d87fe70..494b4e03da 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -590,12 +590,21 @@ class QemuRunner: self.monitorpipe.close() def stop_qemu_system(self): +self.logger.debug('stop_qemu_system: self.qemupid = %s' % (self.qemupid)) if self.qemupid: try: # qemu-system behaves well and a SIGTERM is enough +self.logger.debug('sending SIGTERM to %s' % (self.qemupid)) os.kill(self.qemupid, signal.SIGTERM) except ProcessLookupError as e: self.logger.warning('qemu-system ended unexpectedly') +time.sleep(5) +try: +# qemu-system did not behave well +self.logger.debug('sending SIGKILL to %s' % (self.qemupid)) +os.kill(self.qemupid, signal.SIGKILL) +except ProcessLookupError as e: +self.logger.debug('qemu-system already dead') def stop_thread(self): if self.thread and self.thread.is_alive(): -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176203): https://lists.openembedded.org/g/openembedded-core/message/176203 Mute This Topic: https://lists.openembedded.org/mt/96401367/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 09/14] oeqa qemurunner.py: increase boot failure warning log from 25 to 100 lines
More details are needed to debug issues. Warning is printed to bitbake output console. Task execution logs will contain all debug output. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 97c049e224..eb6d3e8c57 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -500,11 +500,11 @@ class QemuRunner: if time.time() >= endtime: self.logger.warning("Target didn't reach login banner in %d seconds (%s)" % (self.boottime, time.strftime("%D %H:%M:%S"))) -tail = lambda l: "\n".join(l.splitlines()[-25:]) +tail = lambda l: "\n".join(l.splitlines()[-100:]) bootlog = self.decode_qemulog(bootlog) # in case bootlog is empty, use tail qemu log store at self.msg lines = tail(bootlog if bootlog else self.msg) -self.logger.warning("Last 25 lines of text (%d):\n%s" % (len(bootlog), lines)) +self.logger.warning("Last 100 lines of text (%d):\n%s" % (len(bootlog), lines)) self.logger.warning("Check full boot log: %s" % self.logfile) self._dump_host() self.stop() -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176200): https://lists.openembedded.org/g/openembedded-core/message/176200 Mute This Topic: https://lists.openembedded.org/mt/96401364/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 10/14] oeqa qemurunner.py: add debug prints to stop()
These help to investigate if any of the functions hang when test target hangs. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 8 1 file changed, 8 insertions(+) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index eb6d3e8c57..ed44036758 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -533,12 +533,16 @@ class QemuRunner: return True def stop(self): +self.logger.debug("Stopping QemuRunner") if hasattr(self, "origchldhandler"): signal.signal(signal.SIGCHLD, self.origchldhandler) +self.logger.debug("Stopping thread") self.stop_thread() +self.logger.debug("Stopping qemu system") self.stop_qemu_system() if self.runqemu: if hasattr(self, "monitorpid"): +self.logger.debug("Sending SIGKILL to monitorpid") os.kill(self.monitorpid, signal.SIGKILL) self.logger.debug("Sending SIGTERM to runqemu") try: @@ -559,12 +563,15 @@ class QemuRunner: self.runqemu_exited = True if hasattr(self, 'qmp') and self.qmp: +self.logger.debug("Closing QMP") self.qmp.close() self.qmp = None if hasattr(self, 'server_socket') and self.server_socket: +self.logger.debug("Closing server socket") self.server_socket.close() self.server_socket = None if hasattr(self, 'threadsock') and self.threadsock: +self.logger.debug("Closing threadsock") self.threadsock.close() self.threadsock = None self.qemupid = None @@ -576,6 +583,7 @@ class QemuRunner: # We raced, ignore pass if self.monitorpipe: +self.logger.debug("Closing monitorpipe") self.monitorpipe.close() def stop_qemu_system(self): -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176201): https://lists.openembedded.org/g/openembedded-core/message/176201 Mute This Topic: https://lists.openembedded.org/mt/96401365/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 07/14] oeqa qemurunner.py: use os.set_blocking() instead of fcntl()
It's now available since python 3.5. Then add debug prints to leave traces if something still hangs or fails. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index b5fed6c9fe..49ec3858c7 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -123,12 +123,12 @@ class QemuRunner: f.write("%s" % msg) def getOutput(self, o): -import fcntl -fl = fcntl.fcntl(o, fcntl.F_GETFL) -fcntl.fcntl(o, fcntl.F_SETFL, fl | os.O_NONBLOCK) +os.set_blocking(o.fileno(), False) try: +self.logger.debug('Calling read()') return os.read(o.fileno(), 100).decode("utf-8") except BlockingIOError: +self.logger.debug('BlockingIOError but should not have happened!') return "" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176198): https://lists.openembedded.org/g/openembedded-core/message/176198 Mute This Topic: https://lists.openembedded.org/mt/96401362/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 05/14] testimage.bbclass: add debug prints for major state changes
When a test target hangs completely, it is important to know what happened before that in do_testimage() task logs. Signed-off-by: Mikko Rapeli --- meta/classes-recipe/testimage.bbclass | 8 1 file changed, 8 insertions(+) diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index 5cc408b0c4..79ac28a327 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -211,6 +211,7 @@ def testimage_main(d): """ Catch SIGTERM from worker in order to stop qemu. """ +bb.note('SIGTERM received, killing qemu with SIGINT') os.kill(os.getpid(), signal.SIGINT) def handle_test_timeout(timeout): @@ -373,14 +374,18 @@ def testimage_main(d): complete = False orig_sigterm_handler = signal.signal(signal.SIGTERM, sigterm_exception) try: +bb.debug(1, 'Starting qemu') # We need to check if runqemu ends unexpectedly # or if the worker send us a SIGTERM tc.target.start(params=d.getVar("TEST_QEMUPARAMS"), runqemuparams=d.getVar("TEST_RUNQEMUPARAMS")) import threading try: +bb.debug(1, 'Setting timer for TEST_OVERALL_TIMEOUT') threading.Timer(int(d.getVar("TEST_OVERALL_TIMEOUT")), handle_test_timeout, (int(d.getVar("TEST_OVERALL_TIMEOUT")),)).start() except ValueError: +bb.debug(1, 'Timer exception: ValueError') pass +bb.debug(1, 'Running tests') results = tc.runTests() complete = True except (KeyboardInterrupt, BlockingIOError) as err: @@ -389,10 +394,13 @@ def testimage_main(d): else: bb.error('runqemu failed, shutting down...') if results: +bb.debug(1, 'Stopping') results.stop() results = tc.results finally: +bb.debug(1, 'Resetting SIGTERM handler') signal.signal(signal.SIGTERM, orig_sigterm_handler) +bb.debug(1, 'Stopping qemu target') tc.target.stop() # Show results (if we have them) -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176196): https://lists.openembedded.org/g/openembedded-core/message/176196 Mute This Topic: https://lists.openembedded.org/mt/96401360/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 08/14] oeqa qemurunner: read more data at a time from serial and log all of it
Use a short sleep to bundle serial console reads so that we are not reading one character at a time which makes logs more readable. Then write full serial log to debug output so that boot issues can be investigated from do_testimage task logs. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/qemurunner.py | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 49ec3858c7..97c049e224 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -202,7 +202,7 @@ class QemuRunner: qmp_file = "." + next(tempfile._get_candidate_names()) qmp_param = ' -S -qmp unix:./%s,server,wait' % (qmp_file) qmp_port = self.tmpdir + "/" + qmp_file -# Create a second socket connection for debugging use, +# Create a second socket connection for debugging use, # note this will NOT cause qemu to block waiting for the connection qmp_file2 = "." + next(tempfile._get_candidate_names()) qmp_param += ' -qmp unix:./%s,server,nowait' % (qmp_file2) @@ -468,8 +468,11 @@ class QemuRunner: socklist.remove(self.server_socket) self.logger.debug("Connection from %s:%s" % addr) else: +# try to avoid reading single character at a time, makes logs readable +time.sleep(0.1) data = data + sock.recv(1024) if data: +self.logger.debug(r'%s' % (data.decode('utf-8', errors='ignore'))) bootlog += data if self.serial_ports < 2: # this socket has mixed console/kernel data, log it to logfile -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176199): https://lists.openembedded.org/g/openembedded-core/message/176199 Mute This Topic: https://lists.openembedded.org/mt/96401363/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 06/14] oeqa dump.py: add error counter and stop after 5 failures
If test target qemu machine hangs completely, dump_target() calls over serial console are taking a long time to time out, possibly for every failing ssh command execution and a lot of test cases, and same with dump_monitor(). Instead of trying for ever, count errors and after 5 stop trying to dump_target() and dump_monitor() completely. These help to end testing earlier when a test target is completely deadlocked and all ssh, serial and QMP communication with it are failing. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/utils/dump.py | 23 +-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/utils/dump.py b/meta/lib/oeqa/utils/dump.py index bcee03b576..d420b497f9 100644 --- a/meta/lib/oeqa/utils/dump.py +++ b/meta/lib/oeqa/utils/dump.py @@ -93,37 +93,55 @@ class HostDumper(BaseDumper): self._write_dump(cmd.split()[0], result.output) class TargetDumper(BaseDumper): -""" Class to get dumps from target, it only works with QemuRunner """ +""" Class to get dumps from target, it only works with QemuRunner. +Will give up permanently after 5 errors from running commands over +serial console. This helps to end testing when target is really dead, hanging +or unresponsive. +""" def __init__(self, cmds, parent_dir, runner): super(TargetDumper, self).__init__(cmds, parent_dir) self.runner = runner +self.errors = 0 def dump_target(self, dump_dir=""): +if self.errors >= 5: +print("Too many errors when dumping data from target, assuming it is dead! Will not dump data anymore!") +return if dump_dir: self.dump_dir = dump_dir for cmd in self.cmds: # We can continue with the testing if serial commands fail try: (status, output) = self.runner.run_serial(cmd) +if status == 0: +self.errors = self.errors + 1 self._write_dump(cmd.split()[0], output) except: +self.errors = self.errors + 1 print("Tried to dump info from target but " "serial console failed") print("Failed CMD: %s" % (cmd)) class MonitorDumper(BaseDumper): -""" Class to get dumps via the Qemu Monitor, it only works with QemuRunner """ +""" Class to get dumps via the Qemu Monitor, it only works with QemuRunner +Will stop completely if there are more than 5 errors when dumping monitor data. +This helps to end testing when target is really dead, hanging or unresponsive. +""" def __init__(self, cmds, parent_dir, runner): super(MonitorDumper, self).__init__(cmds, parent_dir) self.runner = runner +self.errors = 0 def dump_monitor(self, dump_dir=""): if self.runner is None: return if dump_dir: self.dump_dir = dump_dir +if self.errors >= 5: +print("Too many errors when dumping data from qemu monitor, assuming it is dead! Will not dump data anymore!") +return for cmd in self.cmds: cmd_name = cmd.split()[0] try: @@ -137,4 +155,5 @@ class MonitorDumper(BaseDumper): output = self.runner.run_monitor(cmd_name) self._write_dump(cmd_name, output) except Exception as e: +self.errors = self.errors + 1 print("Failed to dump QMP CMD: %s with\nException: %s" % (cmd_name, e)) -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176197): https://lists.openembedded.org/g/openembedded-core/message/176197 Mute This Topic: https://lists.openembedded.org/mt/96401361/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 00/14] oeqa runtime tests when qemu hangs
I get a qemu hang on kirkstone, swtpm and optee. One of the optee-test/xtest hangs the qemu machine in some kind of deadlock. While this needs to be debugged and tested, the oeqa runtime tests also hanged and never returned. Thus this patch set. With these changes qemu deadlock is detected and with do_testimage() task eventually exits with all correct tests failing and the hangin qemu system killed. There are a lot of debug prints added by this patch set but I don't of any other way to debug complex python code. strace output from the hang doesn't tell where the deadlock happened. Tested on kirkstone and cherry-picked to master. If something blows up I'll do more testing on master branch based setup. Mikko Rapeli (14): oeqa ssh.py: move output prints to new line oeqa ssh.py: fix hangs in run() and add debug prints oeqa ssh.py: clarify timeout API and add more debug prints to run() oeqa ssh.py: add connection keep alive options to ssh client testimage.bbclass: add debug prints for major state changes oeqa dump.py: add error counter and stop after 5 failures oeqa qemurunner.py: use os.set_blocking() instead of fcntl() oeqa qemurunner: read more data at a time from serial and log all of it oeqa qemurunner.py: increase boot failure warning log from 25 to 100 lines oeqa qemurunner.py: add debug prints to stop() oeqa qemurunner.py: add timeout to QMP calls oeqa qemurunner.py: kill qemu if it hangs oeqa qemurunner.py: add debug output to run_serial() oeqa qemurunner.py: improve logging in run_serial() meta/classes-recipe/testimage.bbclass | 8 meta/lib/oeqa/core/target/ssh.py | 63 +-- meta/lib/oeqa/utils/dump.py | 23 +- meta/lib/oeqa/utils/qemurunner.py | 41 ++--- 4 files changed, 113 insertions(+), 22 deletions(-) -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176192): https://lists.openembedded.org/g/openembedded-core/message/176192 Mute This Topic: https://lists.openembedded.org/mt/96401356/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 03/14] oeqa ssh.py: clarify timeout API and add more debug prints to run()
Clarify timeout handling. Timeout calculation is from start of command OR last output from ssh command. When the ssh command output is captured, that resets the timeout timer. Timeout is effetively an "inactive timeout". Print process output to a new line to keep the output more readable. Then log the calls to dumper functions which also seem to be deadlocking for ever when a qemu machine hangs. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/core/target/ssh.py | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 11f4ec6de0..2aaa15ec0e 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -65,7 +65,7 @@ class OESSHTarget(OETarget): """ Runs command in target using SSHProcess. """ -self.logger.debug("[Running]$ %s" % " ".join(command)) +self.logger.debug("[Running]$ '%s', timeout=%s, ignore_status=%s" % (" ".join(command), timeout, ignore_status)) starttime = time.time() status, output = SSHCall(command, self.logger, timeout) @@ -83,9 +83,10 @@ class OESSHTarget(OETarget): Runs command in target. command:Command to run on target. -timeout::Kill command after seconds. -None: Kill command default value seconds. -0: No timeout, runs until return. +timeout::Kill command after seconds when there is no output. +None: Kill command with default value seconds when there is no output. +0: No activity timeout, runs until return. Can still fail with timeout +if ssh client returns failures or TCP socket times out. """ targetCmd = 'export PATH=/usr/sbin:/sbin:/usr/bin:/bin; %s' % command sshCmd = self.ssh + [self.ip, targetCmd] @@ -98,15 +99,19 @@ class OESSHTarget(OETarget): processTimeout = self.timeout status, output = self._run(sshCmd, processTimeout, ignore_status) -self.logger.debug('Command: %s\nStatus: %d Output: %s\n' % (command, status, output)) +# ssh reports errors with return value 255 but also commands can return that value if (status == 255) and (('No route to host') in output): if self.monitor_dumper: +self.logger.debug('Command failed, capturing QMP data: dump_monitor()') self.monitor_dumper.dump_monitor() if status == 255: if self.target_dumper: +self.logger.debug('Command failed, capturing data from serial console: dump_target()') self.target_dumper.dump_target() if self.monitor_dumper: +self.logger.debug('Command failed, capturing QMP data: dump_monitor()') self.monitor_dumper.dump_monitor() +self.logger.debug('returning from run()') return (status, output) def copyTo(self, localSrc, remoteDst): -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176194): https://lists.openembedded.org/g/openembedded-core/message/176194 Mute This Topic: https://lists.openembedded.org/mt/96401358/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 02/14] oeqa ssh.py: fix hangs in run() and add debug prints
When qemu machine hangs, the ssh commands done by tests are not timing out. do_testimage() task has last logs like this: DEBUG: time: 1673531086.3155053, endtime: 1673531686.315502 The test process is stuck for hours, or for ever if the executing command or test case did not set a timeout correctly. The default 300 second timeout is not working when target hangs. Note that timeout is really a "inactive timeout" since data returned by the process will reset the timeout. Added debug prints help to identify which calls are hanging and not timing out. Make the process stdout non-blocking so read() will always return right away using os.set_blocking() available in python 3.5 and later. Then change from python codec reader to plain read() and make the ssh subprocess stdout non-blocking. Even with select() making sure the file had input to be read, the codec reader was trying to find more stuff and blocking for ever when process hangs. While at it, add a small timeout to read data in larger chunks if possible. This avoids reading data one or few characters at a time and makes the debug logs more readable. close() the stdout file in all cases after read loop is complete. Then make sure to wait or kill the ssh subprocess in all cases. Just reading the output stream and receiving EOF there does not mean that the process exited, and wait() needs a timeout if the process is hanging. In the end kill the process and return the return value and captured output utf-8 encoded, just like before these changes. This fixes ssh run() related deadlocks when a qemu target hangs completely. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/core/target/ssh.py | 42 ++-- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 13fd5b2a49..11f4ec6de0 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -229,29 +229,41 @@ def SSHCall(command, logger, timeout=None, **opts): if timeout: endtime = starttime + timeout eof = False +os.set_blocking(process.stdout.fileno(), False) while time.time() < endtime and not eof: -logger.debug('time: %s, endtime: %s' % (time.time(), endtime)) try: +logger.debug('Waiting for process output: time: %s, endtime: %s' % (time.time(), endtime)) if select.select([process.stdout], [], [], 5)[0] != []: -reader = codecs.getreader('utf-8')(process.stdout, 'ignore') -data = reader.read(1024, 4096) +# wait a bit for more data, tries to avoid reading single characters +time.sleep(0.2) +logger.debug('Reading from process stdout') +data = process.stdout.read() if not data: -process.stdout.close() +logger.debug('End of file from process stdout') eof = True else: -output += data -logger.debug('Partial data from SSH call:\n%s' % data) +# ignore errors to capture as much as possible +string = data.decode('utf-8', errors='ignore') +output += string +logger.debug('Partial data from SSH call:\n%s' % string) endtime = time.time() + timeout except InterruptedError: +logger.debug('InterruptedError') continue +logger.debug('Closing process stdout') +process.stdout.close() + # process hasn't returned yet if not eof: +logger.debug('Terminating process') process.terminate() time.sleep(5) try: +logger.debug('Killing process') process.kill() except OSError: +logger.debug('OSError when killing process') pass endtime = time.time() - starttime lastline = ("\nProcess killed - no output for %d seconds. Total" @@ -263,6 +275,19 @@ def SSHCall(command, logger, timeout=None, **opts): output = process.communicate()[0].decode('utf-8', errors='ignore') logger.debug('Data from SSH call:\n%s' % output.rstrip()) +# timout or not, make sure process exits and is not hanging +if process.returncode == None: +try: +logger.debug('Process still running, waiting for it to end') +process.wait(timeout=5) +except TimeoutExpired: +try: +logger.debug('Timeout, killing p
[OE-core] [PATCH 04/14] oeqa ssh.py: add connection keep alive options to ssh client
Configure ssh client to test that connection with server is up. If the server does not respond within a minute then the connection, target machine or sshd daemon are stuck and it's better to exit the command execution with errors. Some tests can execute a long time without returning stdout/stderror data and it's difficult to adjust timers for those cases if connection to target machine or the target machine itself hangs and output is not expected in minutes or even hours. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/core/target/ssh.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 2aaa15ec0e..d42cd79c4f 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -34,6 +34,8 @@ class OESSHTarget(OETarget): self.timeout = timeout self.user = user ssh_options = [ +'-o', 'ServerAliveCountMax=2', +'-o', 'ServerAliveInterval=30', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'StrictHostKeyChecking=no', '-o', 'LogLevel=ERROR' -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176195): https://lists.openembedded.org/g/openembedded-core/message/176195 Mute This Topic: https://lists.openembedded.org/mt/96401359/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH 01/14] oeqa ssh.py: move output prints to new line
The output from is garbled otherwise and it's not easy to remove debug output form real command output on target. Signed-off-by: Mikko Rapeli --- meta/lib/oeqa/core/target/ssh.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py index 7a10ba9763..13fd5b2a49 100644 --- a/meta/lib/oeqa/core/target/ssh.py +++ b/meta/lib/oeqa/core/target/ssh.py @@ -240,7 +240,7 @@ def SSHCall(command, logger, timeout=None, **opts): eof = True else: output += data -logger.debug('Partial data from SSH call: %s' % data) +logger.debug('Partial data from SSH call:\n%s' % data) endtime = time.time() + timeout except InterruptedError: continue @@ -256,12 +256,12 @@ def SSHCall(command, logger, timeout=None, **opts): endtime = time.time() - starttime lastline = ("\nProcess killed - no output for %d seconds. Total" " running time: %d seconds." % (timeout, endtime)) -logger.debug('Received data from SSH call %s ' % lastline) +logger.debug('Received data from SSH call:\n%s ' % lastline) output += lastline else: output = process.communicate()[0].decode('utf-8', errors='ignore') -logger.debug('Data from SSH call: %s' % output.rstrip()) +logger.debug('Data from SSH call:\n%s' % output.rstrip()) options = { "stdout": subprocess.PIPE, -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176191): https://lists.openembedded.org/g/openembedded-core/message/176191 Mute This Topic: https://lists.openembedded.org/mt/96401355/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH 1/3] insane: Improve patch warning/error handling
On Thu, Jan 19, 2023 at 9:56 AM Ross Burton wrote: > > On 19 Jan 2023, at 13:55, Bruce Ashfield via lists.openembedded.org > wrote: > > I'd prefer the upstream-status check to be disabled for meta-virtualization. > > > > This isn't something that I'm strictly enforcing, and not something that I > > want to start strictly enforcing. > > With my meta-arm layer maintainer hat on, I’d like to briefly evangelise for > this check. We’ve had patch status tracking in meta-arm for a while and it > has a lot of advantages for the minimal friction it adds. > > Yes, there’s the initial hit of spamming Upstream-Status tags into all the > existing patches. This is fairly simple - especially if you assume Pending > and review them At Some Point - but the act of running through the patches > and marking backports, patches that will never be sent upstream, and patches > that _should_ be sent upstream is useful for everyone, both the layer > maintainers and other users of the layer. > > If upstream are … tricky to engage with, it’s useful to be able to mark a > patch as struggling it’s way upstream and link to the relevant tickets/merge > requests. > > However, the biggest win for me is the leverage you have over patch > contributors: > > - Thanks for the contribution. I see you’ve marked this patch as Pending but > it’s a good upstreamable fix, can you send it upstream quickly so we’re not > carrying a patch forever? The patch can then be marked as submitted with a > link to the pull request. > - This patch is a backport, please mark it as such and include the SHA so we > know when it is in a release > - You said six months ago that you were going to refactor this ugly patch, > how is that going? That's actually leverage that I don't need over the contributors :) The complexity of the projects and system level testing required are the biggest barriers (and I'm working on that). I use my maintainer karma to push back on larger direction items and features. I'm not set on a machine parsable format of logging information about upstream contributions, so I sometimes do ask (and log) the status, or ask for upgrades, but it is all pretty flexible (I am routinely annoyed when I can't remember (some sort of mental block) where the capital letters go in upstream-status and I get a warning ;)) But the point is well taken! I'm just suggesting that one-size or one-workflow suits all may not be the best initial approach (and I'm not suggesting that others are suggesting one-size fits all either!). I do mostly use (or end up with) 'inappropriate' in the patches, and can do that, but it tends to be when the recipes are next updated, or otherwise cause a problem. I've started doing that now (editing the existing patches), but again, I won't insist that everyone does that on submission, so not having the warning/error disabled is just an extra load placed on me. I'm not really a fan of recipes that use tarballs (when a proper revision control system is available), but I don't force that on all contributions where I'm the maintainer (ooops, I've started bikeshed about recipe preferences and pet peeves !! :) Bruce > > (the last is definitely my favourite) > > Just my 2c, > Ross -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176190): https://lists.openembedded.org/g/openembedded-core/message/176190 Mute This Topic: https://lists.openembedded.org/mt/96354584/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCHv2] librsvg: Only enable the Vala bindings if GObject Introspection is enabled
This avoids the following error: configure: error: Vala bindings require GObject Introspection Signed-off-by: Peter Kjellerstedt --- PATCHv2: Only enable the vala PACKAGECONFIG for target. meta/recipes-gnome/librsvg/librsvg_2.54.5.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb index b2e93a2684..59278d1b16 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.54.5.bb @@ -42,8 +42,6 @@ do_configure[postfuncs] += "cargo_common_do_configure" inherit rust-target-config -EXTRA_OECONF:class-target = "--enable-vala" - # rust-cross writes the target linker binary into target json definition without any flags. # This breaks here because the linker isn't going to work without at least knowing where # the sysroot is. So copy the json to workdir, and patch in the path to wrapper from rust class @@ -58,8 +56,10 @@ CVE_CHECK_IGNORE += "CVE-2018-141" CACHED_CONFIGUREVARS = "ac_cv_path_GDK_PIXBUF_QUERYLOADERS=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" PACKAGECONFIG ??= "gdkpixbuf" +PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vala', '', d)}" # The gdk-pixbuf loader PACKAGECONFIG[gdkpixbuf] = "--enable-pixbuf-loader,--disable-pixbuf-loader,gdk-pixbuf-native" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" do_install:append() { # Loadable modules don't need .a or .la on Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176189): https://lists.openembedded.org/g/openembedded-core/message/176189 Mute This Topic: https://lists.openembedded.org/mt/96399384/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] native: Drop special variable handling
Back when it was merged in https://git.yoctoproject.org/poky/commit/?id=c4257ed8b1040a5a0e9a95846d81961741239116 it appeared special handling in setVar was necessary. Likely due to other fixes and improvements it no longer appears to be. The results of "bitbake world -g" before and after this change are identical for oe-core and meta-openembedded. Therefore drop the "parsing=True" special parameter to setVar() meaning overrides can now be cleared. This means that something like: DEPENDS:append = " bash" now functions as expected, adding bash to the target recipe and bash-native to the native BBCLASSEXTENDED version. Without this change, it would add bash to the native version as well as bash-native which is clearly incorrect. [YOCTO #15010] Signed-off-by: Richard Purdie --- meta/classes-recipe/native.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass index 61ad053def6..1e94585f3e3 100644 --- a/meta/classes-recipe/native.bbclass +++ b/meta/classes-recipe/native.bbclass @@ -161,7 +161,7 @@ python native_virtclass_handler () { newdeps.append(dep.replace(pn, bpn) + "-native") else: newdeps.append(dep) -d.setVar(varname, " ".join(newdeps), parsing=True) +d.setVar(varname, " ".join(newdeps)) map_dependencies("DEPENDS", e.data, selfref=False) for pkg in e.data.getVar("PACKAGES", False).split(): -- 2.37.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176188): https://lists.openembedded.org/g/openembedded-core/message/176188 Mute This Topic: https://lists.openembedded.org/mt/96399197/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH] librsvg: Only enable the Vala bindings if GObject Introspection is enabled
> -Original Message- > From: Luca Ceresoli > Sent: den 20 januari 2023 00:09 > To: Luca Ceresoli via lists.openembedded.org > > Cc: luca.ceres...@bootlin.com; Peter Kjellerstedt > ; openembedded-core@lists.openembedded.org; > Richard Purdie > Subject: Re: [OE-core] [PATCH] librsvg: Only enable the Vala bindings if > GObject Introspection is enabled > > Hi Peter, > > On Thu, 19 Jan 2023 10:29:26 +0100 > "Luca Ceresoli via lists.openembedded.org" > wrote: > > > Hello Peter, > > > > On Wed, 18 Jan 2023 22:22:22 + > > "Peter Kjellerstedt" wrote: > > > > > > -Original Message- > > > > From: Luca Ceresoli > > > > Sent: den 18 januari 2023 17:22 > > > > To: Peter Kjellerstedt > > > > Cc: openembedded-core@lists.openembedded.org; Richard Purdie > > > > > > > > Subject: Re: [OE-core] [PATCH] librsvg: Only enable the Vala > bindings if > > > > GObject Introspection is enabled > > > > > > > > Hello Peter, > > > > > > > > On Wed, 18 Jan 2023 12:27:59 +0100 > > > > "Peter Kjellerstedt" wrote: > > > > > > > > > This avoids the following error: > > > > > > > > > > configure: error: Vala bindings require GObject Introspection > > > > > > > > > > Signed-off-by: Peter Kjellerstedt > > > > > > > > A different patch [0] to address the same bug is already in my testing > > > > branch and is possibly being merged soon on master by Richard. Can you > > > > please check whether your think your patch is better and let us know? > > > > > > I had not seen that patch when I sent mine. I think mine is a little > > > better > > > since it defines and uses a PACKAGECONFIG for the vala support, which > > > should > > > make it easier for anyone wanting to, e.g., disable the vala support even > > > if > > > it is enabled by default. > > > > Indeed. I'm replacing Alex's patch with yours in my testing branch in > > order to have both tested. None is on master at the moment. > > I'm afraid testing with this patch applied caused lots of autobuilder > failures: > > https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/6553/steps/12/logs/stdio > https://autobuilder.yoctoproject.org/typhoon/#/builders/72/builds/6551/steps/11/logs/stdio > https://autobuilder.yoctoproject.org/typhoon/#/builders/52/builds/6443/steps/12/logs/stdio > ...and more > > So I removed it from my testing branch and got the patch by Alex again. > You'd be welcome to send a fixed version of your patch. Meh. After having taken a closer look at gobject-introspection.bbclass, it appears it only adds --enable-introspection for target, so my patch needs to do the same. I'll send a v2. > > -- > Luca Ceresoli, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com //Peter -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176187): https://lists.openembedded.org/g/openembedded-core/message/176187 Mute This Topic: https://lists.openembedded.org/mt/96351645/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH] quilt: use upstreamed faildiff.test fix
Signed-off-by: Ross Burton --- .../quilt/quilt/faildiff-order.patch | 47 --- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/meta/recipes-devtools/quilt/quilt/faildiff-order.patch b/meta/recipes-devtools/quilt/quilt/faildiff-order.patch index 40f3c2636a5..f22065a2507 100644 --- a/meta/recipes-devtools/quilt/quilt/faildiff-order.patch +++ b/meta/recipes-devtools/quilt/quilt/faildiff-order.patch @@ -1,28 +1,41 @@ -This test assumes that two lines that are output on different streams (stdout -and stderr) will be read in the same order, but thanks to buffering that may not -be the case. +Upstream-Status: Backport +Signed-off-by: Ross Burton -Change the expected lines to be regexs that each match both expected lines, so -the test always works no matter the actual order the lines are read in. +From 4dfe7f9e702c85243a71e4de267a13e434b6d6c2 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Fri, 20 Jan 2023 12:56:08 +0100 +Subject: [PATCH] test: Fix a race condition -Bug filed at https://savannah.nongnu.org/bugs/index.php?63651 to discuss a -proper solution. +The test suite does not differentiate between stdout and stderr. When +messages are printed to both, the order in which they will reach us +is apparently not guaranteed. Ideally this would be deterministic, but +until then, explicitly test stdout and stderr separately in the test +case itself. Otherwise the test suite fails randomly, which is a pain +for distribution package maintainers. -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton +This fixes bug #63651 reported by Ross Burton: +https://savannah.nongnu.org/bugs/index.php?63651 + +Signed-off-by: Jean Delvare +--- + test/faildiff.test | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/faildiff.test b/test/faildiff.test -index 5afb8e3..5f32f71 100644 +index 5afb8e3..0444c15 100644 --- a/test/faildiff.test +++ b/test/faildiff.test -@@ -28,8 +28,8 @@ What happens on binary files? +@@ -27,8 +27,9 @@ What happens on binary files? + > File test.bin added to patch %{P}test.diff $ printf "\\003\\000\\001" > test.bin - $ quilt diff -pab --no-index -- >~ (Files|Binary files) a/test\.bin and b/test\.bin differ -- > Diff failed on file 'test.bin', aborting -+ >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file 'test.bin', aborting) -+ >~ (.*[Ff]iles a/test\.bin and b/test\.bin differ|Diff failed on file 'test.bin', aborting) +- $ quilt diff -pab --no-index ++ $ quilt diff -pab --no-index 2>/dev/null + >~ (Files|Binary files) a/test\.bin and b/test\.bin differ ++ $ quilt diff -pab --no-index >/dev/null + > Diff failed on file 'test.bin', aborting $ echo %{?} > 1 - +-- +2.34.1 + -- 2.37.3 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176186): https://lists.openembedded.org/g/openembedded-core/message/176186 Mute This Topic: https://lists.openembedded.org/mt/96399172/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH v3 1/3] binutils: Upgrade to 2.40 release
Hi Khem, On Thu, 19 Jan 2023 15:51:39 -0800 "Khem Raj" wrote: > Signed-off-by: Khem Raj I'm afraid this time the patch does _really_ not apply, and the simple sorcery I did for v1 and v2 is not working anymore. If you could recreate the patches based on a clean oe-core master branch that would be good. Thank you! -- Luca Ceresoli, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176185): https://lists.openembedded.org/g/openembedded-core/message/176185 Mute This Topic: https://lists.openembedded.org/mt/96390083/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Rust crate checksums
On Fri, Jan 20, 2023 at 9:48 AM Alexander Kanavin wrote: > > On Fri, 20 Jan 2023 at 10:17, Alex Kiernan wrote: > > > But if you list a crate as the primary source, rather than pulling it > > from git, something like this: > > > > LICENSE = "MIT" > > LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d426d11f66aaa533f62910f3bd79dfb6" > > > > SRC_URI = "crate://crates.io/binary-security-check/1.2.7" > > > > inherit cargo cargo-update-recipe-crates > > > > require binary-security-check-crates.inc > > > > You end up down this code path > > (https://git.openembedded.org/bitbake/tree/lib/bb/fetch2/crate.py#n100) > > and the checksum isn't verified. > > > > So not terrible, but could do with fixing at some point since the > > crate binary starting point is clearly the "tarball" starting point. > > Should there be a ticket for checking the primary crate? > Yeah, will create one shortly. -- Alex Kiernan -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176184): https://lists.openembedded.org/g/openembedded-core/message/176184 Mute This Topic: https://lists.openembedded.org/mt/96373035/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Rust crate checksums
On Fri, 20 Jan 2023 at 10:48, Alexander Kanavin wrote: > Should there be a ticket for checking the primary crate? Come to think of it, each crate entry needs a parameter: checksummedbycargo=bool. So anything generated by cargo-update-crates class would have that set to true, and the fetcher would skip checksum checks for those entries. Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176183): https://lists.openembedded.org/g/openembedded-core/message/176183 Mute This Topic: https://lists.openembedded.org/mt/96373035/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Rust crate checksums
On Fri, 20 Jan 2023 at 10:17, Alex Kiernan wrote: > But if you list a crate as the primary source, rather than pulling it > from git, something like this: > > LICENSE = "MIT" > LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d426d11f66aaa533f62910f3bd79dfb6" > > SRC_URI = "crate://crates.io/binary-security-check/1.2.7" > > inherit cargo cargo-update-recipe-crates > > require binary-security-check-crates.inc > > You end up down this code path > (https://git.openembedded.org/bitbake/tree/lib/bb/fetch2/crate.py#n100) > and the checksum isn't verified. > > So not terrible, but could do with fixing at some point since the > crate binary starting point is clearly the "tarball" starting point. Should there be a ticket for checking the primary crate? Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176182): https://lists.openembedded.org/g/openembedded-core/message/176182 Mute This Topic: https://lists.openembedded.org/mt/96373035/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] Rust crate checksums
On Thu, Jan 19, 2023 at 9:18 AM Alex Kiernan via lists.openembedded.org wrote: > > On Thu, Jan 19, 2023 at 8:53 AM Alexander Kanavin > wrote: > > > > I think Cargo.lock contains those checksums and that forces cargo to > > verify them? Can you check that verification happens and fails when it > > should by e.g. patching it to have bogus checksums? > > > > Ah, yes... I'll check. > Crates which are required by the main artefact are checked, errors turn up like this: | NOTE: cargo build -v --target x86_64-poky-linux-gnu --release --manifest-path=/home/alexk/poky/build/tmp/work/core2-64-poky-linux/binary-security-check/1.2.7-r0/binary-security-check-1.2.7//Cargo.toml | error: checksum for `goblin v0.6.0` changed between lock files | | this could be indicative of a few possible errors: | | * the lock file is corrupt | * a replacement source in use (e.g., a mirror) returned a different checksum | * the source itself may be corrupt in one way or another | | unable to verify that `goblin v0.6.0` is the same as when the lockfile was generated | | WARNING: exit code 101 from a shell command. But if you list a crate as the primary source, rather than pulling it from git, something like this: LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d426d11f66aaa533f62910f3bd79dfb6" SRC_URI = "crate://crates.io/binary-security-check/1.2.7" inherit cargo cargo-update-recipe-crates require binary-security-check-crates.inc You end up down this code path (https://git.openembedded.org/bitbake/tree/lib/bb/fetch2/crate.py#n100) and the checksum isn't verified. So not terrible, but could do with fixing at some point since the crate binary starting point is clearly the "tarball" starting point. -- Alex Kiernan -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176181): https://lists.openembedded.org/g/openembedded-core/message/176181 Mute This Topic: https://lists.openembedded.org/mt/96373035/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-