Re: [OE-core] SPDX 3 and OE-core CycloneDX support
On Fri, 2023-02-03 at 12:26 -0600, Alex Stewart wrote: > Hey Josh, > > I have been roadmapping SBOM generation for NI's yocto distro and have a > few open questions about the future of SPDX and the create-spdx bbclass. > Since your name seems to be attached to both of those, I figure you > might have the best insight here. > > Also posting to the OE-core ML so that this discussion can help other > members. > > > 1. SPDX 3 timeline. I hear that SPDX 3 is going to be a complete rewrite > of the spec, with more support for modern SBOM discussion topics like > VEX and more comprehensive vulnerability tracking. And it also seems to > me that the timeline for its release is very behind schedule [1], but > still in active development. Can you give a SWAG for how close that new > spec is to completion? Are we months away or years? > > 2. If/when SPDX 3 support is released, is it to be assumed that the SPDX > facilities in OE core are going to be upgraded to handle it? Assuming someone does the work, which is likely, yes. We did namespace the class in master to prepare for that. > 3. The rest of my org is interested in CycloneDX as our common SBOM > format. Have there been any discussions about supporting CDX SBOMs in > OE-core? Any blockers there; or is it something that my org could author > and upstream if we decide to go that route? At this point OpenEmbedded/Yocto Project has decided to go the SPDX route for various reasons. I'm not sure I want to see two formats being added directly to the core, the better solution would likely be to translate the SPDX output into CycloneDX if/as needed. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176756): https://lists.openembedded.org/g/openembedded-core/message/176756 Mute This Topic: https://lists.openembedded.org/mt/96729387/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] glibc: Upgrade to 2.37 release
Details are here [1] and summary of changes is here [2] [1] https://sourceware.org/glibc/wiki/Release/2.37 [2] https://sourceware.org/pipermail/libc-announce/2023/35.html Signed-off-by: Khem Raj --- meta/conf/distro/include/tcmode-default.inc | 2 +- ...2.36.bb => cross-localedef-native_2.37.bb} | 4 +- meta/recipes-core/glibc/glibc-common.inc | 2 +- ...bc-locale_2.36.bb => glibc-locale_2.37.bb} | 0 ...bc-mtrace_2.36.bb => glibc-mtrace_2.37.bb} | 0 ...-scripts_2.36.bb => glibc-scripts_2.37.bb} | 0 ...libc-tests_2.36.bb => glibc-tests_2.37.bb} | 0 ...tsuite_2.36.bb => glibc-testsuite_2.37.bb} | 0 meta/recipes-core/glibc/glibc-version.inc | 6 +- ...fortify-symbol-for-64-bit-time_t-BZ-.patch | 528 -- ...dd-hardlink-resolver-from-util-linux.patch | 2 +- ...-fix-ups-hardlink-to-make-it-compile.patch | 2 +- ...Look-for-host-system-ld.so.cache-as-.patch | 4 +- ...Fix-buffer-overrun-with-a-relocated-.patch | 4 +- ...Raise-the-size-of-arrays-containing-.patch | 39 +- ...k-glibc-Allow-64-bit-atomics-for-x86.patch | 4 +- ...Make-relocatable-install-for-locales.patch | 10 +- ...Fall-back-to-faccessat-on-faccess2-r.patch | 4 +- ...the-path-sets-wrong-config-variables.patch | 6 +- ...ss-building-and-testing-instructions.patch | 2 +- ...glibc-Help-bootstrap-cross-toolchain.patch | 4 +- ...eglibc-Resolve-__fpscr_values-on-SH4.patch | 4 +- ...port-cross-locale-generation-support.patch | 24 +- ...-archive-uses-a-hard-coded-locale-pa.patch | 4 +- ...aybe-uninitialized-errors-with-Os-BZ.patch | 53 -- ...o-not-ask-compiler-for-finding-arch.patch} | 2 +- ...RE_KNOWN_INTERPRETER_NAMES-to-known-.patch | 29 - ...-the-header-between-arm-and-aarch64.patch} | 24 +- ...-printf-builtin-in-nscd-init-script.patch} | 2 +- ...gure.ac-Set-libc_cv_rootsbindir-onl.patch} | 2 +- ...ll-interpreter-overridable-in-tzsel.patch} | 10 +- ...se-bin-sh-default-shell-interpreter.patch} | 2 +- ...-failed-in-unprivileged-process-BZ-.patch} | 4 +- ...uild-time-paths-in-the-output-binar.patch} | 6 +- .../glibc/glibc/0025-startup-Force-O2.patch | 28 - .../glibc/{glibc_2.36.bb => glibc_2.37.bb}| 20 +- 36 files changed, 101 insertions(+), 736 deletions(-) rename meta/recipes-core/glibc/{cross-localedef-native_2.36.bb => cross-localedef-native_2.37.bb} (94%) rename meta/recipes-core/glibc/{glibc-locale_2.36.bb => glibc-locale_2.37.bb} (100%) rename meta/recipes-core/glibc/{glibc-mtrace_2.36.bb => glibc-mtrace_2.37.bb} (100%) rename meta/recipes-core/glibc/{glibc-scripts_2.36.bb => glibc-scripts_2.37.bb} (100%) rename meta/recipes-core/glibc/{glibc-tests_2.36.bb => glibc-tests_2.37.bb} (100%) rename meta/recipes-core/glibc/{glibc-testsuite_2.36.bb => glibc-testsuite_2.37.bb} (100%) delete mode 100644 meta/recipes-core/glibc/glibc/0001-Linux-Add-ppoll-fortify-symbol-for-64-bit-time_t-BZ-.patch delete mode 100644 meta/recipes-core/glibc/glibc/0015-locale-prevent-maybe-uninitialized-errors-with-Os-BZ.patch rename meta/recipes-core/glibc/glibc/{0017-powerpc-Do-not-ask-compiler-for-finding-arch.patch => 0015-powerpc-Do-not-ask-compiler-for-finding-arch.patch} (96%) delete mode 100644 meta/recipes-core/glibc/glibc/0016-readlib-Add-OECORE_KNOWN_INTERPRETER_NAMES-to-known-.patch rename meta/recipes-core/glibc/glibc/{0018-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch => 0016-wordsize.h-Unify-the-header-between-arm-and-aarch64.patch} (72%) rename meta/recipes-core/glibc/glibc/{0019-Replace-echo-with-printf-builtin-in-nscd-init-script.patch => 0017-Replace-echo-with-printf-builtin-in-nscd-init-script.patch} (96%) rename meta/recipes-core/glibc/glibc/{0020-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch => 0018-sysdeps-gnu-configure.ac-Set-libc_cv_rootsbindir-onl.patch} (94%) rename meta/recipes-core/glibc/glibc/{0021-timezone-Make-shell-interpreter-overridable-in-tzsel.patch => 0019-timezone-Make-shell-interpreter-overridable-in-tzsel.patch} (84%) rename meta/recipes-core/glibc/glibc/{0022-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch => 0020-tzselect.ksh-Use-bin-sh-default-shell-interpreter.patch} (93%) rename meta/recipes-core/glibc/glibc/{0023-fix-create-thread-failed-in-unprivileged-process-BZ-.patch => 0021-fix-create-thread-failed-in-unprivileged-process-BZ-.patch} (96%) rename meta/recipes-core/glibc/glibc/{0024-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch => 0022-Avoid-hardcoded-build-time-paths-in-the-output-binar.patch} (88%) delete mode 100644 meta/recipes-core/glibc/glibc/0025-startup-Force-O2.patch rename meta/recipes-core/glibc/{glibc_2.36.bb => glibc_2.37.bb} (85%) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 7cd0b004e9..9236f8bf37 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc @@ -20,7 +20,7 @@ GCCVERSION ?=
Re: [OE-core] [PATCH] perf: Enable debug/source packaging
Hello Richard, This is causing: WARNING: perf-1.0-r9 do_package_qa: QA Issue: File /usr/src/debug/perf/1.0-r9/util/expr-flex.h in package perf-src contains reference to TMPDIR On 03/02/2023 16:52:03+, Richard Purdie wrote: > This was disabled in 2014[1] due to an error message which as far > as I can tell, no longer occurs. > > Having debug information and source files present will make debugging > reproducibility issues much easier so remove this line as it appears > no longer needed. > > [1] OE-Core revision c1b5a262c0201faf2c6bf545d6acb32dfe383ba3 > > Signed-off-by: Richard Purdie > --- > meta/recipes-kernel/perf/perf.bb | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/meta/recipes-kernel/perf/perf.bb > b/meta/recipes-kernel/perf/perf.bb > index 1dff39a17e4..e8a9c57a0aa 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -360,6 +360,4 @@ FILES:${PN}-python = " \ > " > FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" > > - > -INHIBIT_PACKAGE_DEBUG_SPLIT="1" > DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" > -- > 2.37.2 > > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176754): https://lists.openembedded.org/g/openembedded-core/message/176754 Mute This Topic: https://lists.openembedded.org/mt/96726928/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/2] barebox: add initial support
This breaks oe-selftest: https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/4760/steps/15/logs/stdio 2023-02-03 17:55:08,025 - oe-selftest - INFO - fitimage.FitImageTests.test_sign_cascaded_uboot_fit_image (subunit.RemotedTestCase) 2023-02-03 17:55:08,026 - oe-selftest - INFO - ... FAIL Stderr: 2023-02-03 14:32:52,619 - oe-selftest - INFO - Adding: "include selftest.inc" in /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-35279/conf/local.conf 2023-02-03 14:32:52,620 - oe-selftest - INFO - Adding: "include bblayers.inc" in bblayers.conf 2023-02-03 17:55:08,026 - oe-selftest - INFO - 13: 4/22 399/509 (54.05s) (0 failed) (fitimage.FitImageTests.test_sign_cascaded_uboot_fit_image) 2023-02-03 17:55:08,026 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last): File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/fitimage.py", line 612, in test_sign_cascaded_uboot_fit_image bitbake("virtual/bootloader") File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/utils/commands.py", line 236, in bitbake return runCmd(cmd, ignore_status, timeout, output_log=output_log, **options) File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/utils/commands.py", line 214, in runCmd raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output)) AssertionError: Command 'bitbake virtual/bootloader' returned non-zero exit status 1: ERROR: barebox-2023.01.0-r0 do_configure: No defconfig given. Either add file 'file://defconfig' to SRC_URI or set BAREBOX_CONFIG ERROR: barebox-2023.01.0-r0 do_configure: ExecutionError('/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-35279/tmp/work/qemuarm-poky-linux-gnueabi/barebox/2023.01.0-r0/temp/run.do_configure.3098535', 1, None, None) ERROR: Logfile of failure stored in: /home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-35279/tmp/work/qemuarm-poky-linux-gnueabi/barebox/2023.01.0-r0/temp/log.do_configure.3098535 NOTE: recipe barebox-2023.01.0-r0: task do_configure: Failed ERROR: Task (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-bsp/barebox/barebox_2023.01.0.bb:do_configure) failed with exit code '1' And as already reported by Richard: AssertionError: The following recipes do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file. barebox-tools (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-bsp/barebox/barebox-tools_2023.01.0.bb) barebox (/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/recipes-bsp/barebox/barebox_2023.01.0.bb) On 03/02/2023 14:50:10+0100, Marco Felsch wrote: > This adds the support for the barebox bootloader to oe-core. The recipe > is based on the recipe found in meta-ptx [1] with a few minor adaptions. > > This basic support includes the bootloader and the target tools to > interact with the bootloader. The host tools support is not part of > this commit. This will be added later on as separate recipe. > > [1] https://github.com/pengutronix/meta-ptx/tree/master/recipes-bsp/barebox > > Signed-off-by: Marco Felsch > --- > meta/conf/documentation.conf | 7 + > meta/recipes-bsp/barebox/barebox.inc | 123 ++ > meta/recipes-bsp/barebox/barebox_2023.01.0.bb | 5 + > ...IMAGE_COMPRESSION-per-default-to-lz4.patch | 40 ++ > 4 files changed, 175 insertions(+) > create mode 100644 meta/recipes-bsp/barebox/barebox.inc > create mode 100644 meta/recipes-bsp/barebox/barebox_2023.01.0.bb > create mode 100644 > meta/recipes-bsp/barebox/files/0001-pbl-set-IMAGE_COMPRESSION-per-default-to-lz4.patch > > diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf > index a27d7a53c3..99e8f8e730 100644 > --- a/meta/conf/documentation.conf > +++ b/meta/conf/documentation.conf > @@ -77,6 +77,13 @@ AUTOREV[doc] = "When SRCREV is set to the value of this > variable, it specifies t > > B[doc] = "The Build Directory. The OpenEmbedded build system places > generated objects into the Build Directory during a recipe's build process." > BAD_RECOMMENDATIONS[doc] = "A list of packages not to install despite being > recommended by a recipe. Support for this variable exists only when using the > IPK or RPM packaging backends." > +BAREBOX_BUILDSYSTEM_VERSION[doc] = "Build system version to add to the > barebox image. By default this is the git description of the containing > layer." > +BAREBOX_CONFIG[doc] = "The barebox kconfig defconfig file. Not used if a > file called defconfig is added to the SRC_URI." > +BAREBOX_ENV_DIR[doc] = "Overlay the barebox built-in environment with the > environment provided by the BSP if specified." > +BAREBOX_BINARY[doc] = "Specify the barebox binary to install. If not > specified all barebox artifacts are
Re: [OE-core] [1/2][dunfell] linux-yocto/5.4: update to v5.4.229
On Fri, Feb 3, 2023 at 1:46 PM Steve Sakoman wrote: > > On Fri, Feb 3, 2023 at 6:01 AM Bruce Ashfield > wrote: > > > > On Fri, Feb 3, 2023 at 10:01 AM Steve Sakoman wrote: > > > > > > On Fri, Feb 3, 2023 at 4:57 AM Bruce Ashfield > > > wrote: > > > > > > > > On Fri, Feb 3, 2023 at 9:43 AM Steve Sakoman wrote: > > > > > > > > > > Hi Bruce, > > > > > > > > > > Sadly this version bump breaks lttng-modules in dunfell: > > > > > > > > > > In file included from > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/define_trace.h:87, > > > > > from > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:183, > > > > > from > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:29: > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:130:6: > > > > > error: conflicting types for 'trace_jbd2_run_stats' > > > > > 130 | void trace_##_name(_proto); > > > > > | ^~ > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:42:2: > > > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' > > > > >42 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, > > > > > PARAMS(proto), PARAMS(args)) > > > > > | ^~~ > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:84:2: > > > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' > > > > >84 | LTTNG_TRACEPOINT_EVENT_MAP(name, name,\ > > > > > | ^~ > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:107:1: > > > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT' > > > > > 107 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, > > > > > | ^~ > > > > > In file included from > > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:9, > > > > > from > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:18: > > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:243:21: > > > > > note: previous definition of 'trace_jbd2_run_stats' was here > > > > > 243 | static inline void trace_##name(proto)\ > > > > > | ^~ > > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:406:2: > > > > > note: in expansion of macro '__DECLARE_TRACE' > > > > > 406 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ > > > > > | ^~~ > > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:542:2: > > > > > note: in expansion of macro 'DECLARE_TRACE' > > > > > 542 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) > > > > > | ^ > > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:234:1: > > > > > note: in expansion of macro 'TRACE_EVENT' > > > > > 234 | TRACE_EVENT(jbd2_run_stats, > > > > > | ^~~ > > > > > CC [M] > > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-ext4.o > > > > > > > > > > I tried doing version bumps for lttng-modules from 2.11.6 -> 2.11.9 > > > > > but the issue persists. > > > > > > > > > > Thoughts? > > > > > > > > I've never had much luck manually doing lttng fixes. You quickly get > > > > lost in the macros and prototypes. > > > > > > > > We could report the issue to lttng and see if they are willing to do a > > > > fix, but otherwise, we can wait a bit and see if they update .. since > > > > these are recent releases of 5.4, and lttng likely just hasn't seen > > > > the problem yet. > > > > > > > > So for now, I'll suggest just waiting and I can monitor to see if > > > > anything has already been reported or if I see a fix upstream. > > > > > > Sounds like a plan, I'll put these two version bumps on the shelf for a > > > bit. > > > > > > I will however keep my lttng-modules version bumps so that we are at > > > the most recent 2.11 stable branch release. > > > > I see this on lttng-master: > > > > Author: Michael Jeanson > > Date: Wed Jan 18 16:32:04 2023 -0500 > > > > fix: jbd2: use the correct print format (v5.4.229) > > > > See upstream commit : > > > > commit ecb9d0d2e123874bcdd2efdecda0f4e0c3dc566d > > Author: Bixuan Cui > > Date: Tue Oct 11 19:33:44 2022 +0800 > > > > jbd2: use the correct
Re: [OE-core] [1/2][dunfell] linux-yocto/5.4: update to v5.4.229
On Fri, Feb 3, 2023 at 6:01 AM Bruce Ashfield wrote: > > On Fri, Feb 3, 2023 at 10:01 AM Steve Sakoman wrote: > > > > On Fri, Feb 3, 2023 at 4:57 AM Bruce Ashfield > > wrote: > > > > > > On Fri, Feb 3, 2023 at 9:43 AM Steve Sakoman wrote: > > > > > > > > Hi Bruce, > > > > > > > > Sadly this version bump breaks lttng-modules in dunfell: > > > > > > > > In file included from > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/define_trace.h:87, > > > > from > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:183, > > > > from > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:29: > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:130:6: > > > > error: conflicting types for 'trace_jbd2_run_stats' > > > > 130 | void trace_##_name(_proto); > > > > | ^~ > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:42:2: > > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' > > > >42 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, > > > > PARAMS(proto), PARAMS(args)) > > > > | ^~~ > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:84:2: > > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' > > > >84 | LTTNG_TRACEPOINT_EVENT_MAP(name, name,\ > > > > | ^~ > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:107:1: > > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT' > > > > 107 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, > > > > | ^~ > > > > In file included from > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:9, > > > > from > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:18: > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:243:21: > > > > note: previous definition of 'trace_jbd2_run_stats' was here > > > > 243 | static inline void trace_##name(proto)\ > > > > | ^~ > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:406:2: > > > > note: in expansion of macro '__DECLARE_TRACE' > > > > 406 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ > > > > | ^~~ > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:542:2: > > > > note: in expansion of macro 'DECLARE_TRACE' > > > > 542 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) > > > > | ^ > > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:234:1: > > > > note: in expansion of macro 'TRACE_EVENT' > > > > 234 | TRACE_EVENT(jbd2_run_stats, > > > > | ^~~ > > > > CC [M] > > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-ext4.o > > > > > > > > I tried doing version bumps for lttng-modules from 2.11.6 -> 2.11.9 > > > > but the issue persists. > > > > > > > > Thoughts? > > > > > > I've never had much luck manually doing lttng fixes. You quickly get > > > lost in the macros and prototypes. > > > > > > We could report the issue to lttng and see if they are willing to do a > > > fix, but otherwise, we can wait a bit and see if they update .. since > > > these are recent releases of 5.4, and lttng likely just hasn't seen > > > the problem yet. > > > > > > So for now, I'll suggest just waiting and I can monitor to see if > > > anything has already been reported or if I see a fix upstream. > > > > Sounds like a plan, I'll put these two version bumps on the shelf for a bit. > > > > I will however keep my lttng-modules version bumps so that we are at > > the most recent 2.11 stable branch release. > > I see this on lttng-master: > > Author: Michael Jeanson > Date: Wed Jan 18 16:32:04 2023 -0500 > > fix: jbd2: use the correct print format (v5.4.229) > > See upstream commit : > > commit ecb9d0d2e123874bcdd2efdecda0f4e0c3dc566d > Author: Bixuan Cui > Date: Tue Oct 11 19:33:44 2022 +0800 > > jbd2: use the correct print format > > [ Upstream commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 ] > > The print format error was found when using ftrace event: > <...>-1406 [000] 23599442.895823: jbd2_end_commit: > dev 252,8 transaction
[OE-core] SPDX 3 and OE-core CycloneDX support
Hey Josh, I have been roadmapping SBOM generation for NI's yocto distro and have a few open questions about the future of SPDX and the create-spdx bbclass. Since your name seems to be attached to both of those, I figure you might have the best insight here. Also posting to the OE-core ML so that this discussion can help other members. 1. SPDX 3 timeline. I hear that SPDX 3 is going to be a complete rewrite of the spec, with more support for modern SBOM discussion topics like VEX and more comprehensive vulnerability tracking. And it also seems to me that the timeline for its release is very behind schedule [1], but still in active development. Can you give a SWAG for how close that new spec is to completion? Are we months away or years? 2. If/when SPDX 3 support is released, is it to be assumed that the SPDX facilities in OE core are going to be upgraded to handle it? 3. The rest of my org is interested in CycloneDX as our common SBOM format. Have there been any discussions about supporting CDX SBOMs in OE-core? Any blockers there; or is it something that my org could author and upstream if we decide to go that route? [1] https://github.com/spdx/spdx-spec/milestone/3 Appreciate the input, -- Alex Stewart Software Engineer - NI Real-Time OS NI (National Instruments) alex.stew...@ni.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176750): https://lists.openembedded.org/g/openembedded-core/message/176750 Mute This Topic: https://lists.openembedded.org/mt/96729387/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 2/2] barebox-tools: add initial barebox tools support
Hello, kwboot fails with musl: | CC [U] scripts/kwboot-target | In file included from /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot-target.c:1: | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c: In function 'kwboot_tty_recv': | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:141:9: error: unknown type name 'fd_set' | 141 | fd_set rfds; | | ^~ | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:142:24: error: storage size of 'tv' isn't known | 142 | struct timeval tv; | |^~ | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:147:9: warning: implicit declaration of function 'FD_ZERO' [-Wimplicit-function-declaration] | 147 | FD_ZERO(); | | ^~~ | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:148:9: warning: implicit declaration of function 'FD_SET'; did you mean 'L_SET'? [-Wimplicit-function-declaration] | 148 | FD_SET(fd, ); | | ^~ | | L_SET | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:157:24: warning: implicit declaration of function 'select' [-Wimplicit-function-declaration] | 157 | nfds = select(fd + 1, , NULL, NULL, ); | |^~ | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:142:24: warning: unused variable 'tv' [-Wunused-variable] | 142 | struct timeval tv; | |^~ | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c: In function 'kwboot_terminal': | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:571:17: error: unknown type name 'fd_set' | 571 | fd_set rfds; | | ^~ | /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/scripts/kwboot.c:586:21: warning: implicit declaration of function 'FD_ISSET' [-Wimplicit-function-declaration] | 586 | if (FD_ISSET(tty, )) { | | ^~~~ | make[2]: *** [scripts/Makefile.userprogs:28: scripts/kwboot-target] Error 1 | ERROR: oe_runmake failed | make[1]: Leaving directory '/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/build' | make: Leaving directory '/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0' | WARNING: /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/temp/run.do_compile.3586889:170 exit 1 from 'exit 1' | WARNING: Backtrace (BB generated script): | make[1]: *** [/home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/barebox-2023.01.0/Makefile:976: scripts] Error 2 | make: *** [Makefile:180: sub-make] Error 2 | #1: bbfatal_log, /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/temp/run.do_compile.3586889, line 170 | #2: die, /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/temp/run.do_compile.3586889, line 154 | #3: oe_runmake, /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/temp/run.do_compile.3586889, line 149 | #4: do_compile, /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/temp/run.do_compile.3586889, line 144 | #5: main, /home/pokybuild/yocto-worker/musl-qemux86-64/build/build/tmp/work/core2-64-poky-linux-musl/barebox-tools/2023.01.0-r0/temp/run.do_compile.3586889, line 183 NOTE: recipe barebox-tools-2023.01.0-r0: task do_compile: Failed ERROR: Task
[OE-core] [PATCH 14/14] python3-sphinx: upgrade 6.0.0 -> 6.1.3
https://www.sphinx-doc.org/en/master/changes.html#release-6-1-3-released-jan-10-2023 https://www.sphinx-doc.org/en/master/changes.html#release-6-1-2-released-jan-07-2023 https://www.sphinx-doc.org/en/master/changes.html#release-6-1-1-released-jan-05-2023 https://www.sphinx-doc.org/en/master/changes.html#release-6-1-0-released-jan-05-2023 https://www.sphinx-doc.org/en/master/changes.html#release-6-0-1-released-jan-05-2023 Signed-off-by: Tim Orling --- ...phinx_6.0.0.bb => python3-sphinx_6.1.3.bb} | 26 +-- 1 file changed, 24 insertions(+), 2 deletions(-) rename meta/recipes-devtools/python/{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb} (49%) diff --git a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb similarity index 49% rename from meta/recipes-devtools/python/python3-sphinx_6.0.0.bb rename to meta/recipes-devtools/python/python3-sphinx_6.1.3.bb index 5e565e745d6..d77ad0a6fe1 100644 --- a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb +++ b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb @@ -1,12 +1,34 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- LICENSE +# +++ LICENSE +# @@ -4,7 +4,7 @@ +# Unless otherwise indicated, all code in the Sphinx project is licenced under the +# two clause BSD licence below. +# +# -Copyright (c) 2007-2022 by the Sphinx team (see AUTHORS file). +# +Copyright (c) 2007-2023 by the Sphinx team (see AUTHORS file). +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# +# + DESCRIPTION = "Python documentation generator" HOMEPAGE = "http://sphinx-doc.org/; SECTION = "devel/python" LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2214a89317448c7f792f5b75dd6726e4" +LIC_FILES_CHKSUM = "file://LICENSE;md5=066da51ab732319a06beae4f10788577" PYPI_PACKAGE = "Sphinx" -SRC_URI[sha256sum] = "58c140ecd9aa0abbc8ff6da48a266648eac9e5bfc8e49576efd2979bf46f5961" +SRC_URI[sha256sum] = "0dac3b698538ffef41716cf97ba26c1c7788dba73ce6f150c1ff5b4720786dd2" inherit python_flit_core pypi -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176748): https://lists.openembedded.org/g/openembedded-core/message/176748 Mute This Topic: https://lists.openembedded.org/mt/96728520/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] python3-wcwidth: upgrade 0.2.5 -> 0.2.6
https://github.com/jquast/wcwidth#history 0.2.6 2023-01-14 * Updated tables to include Unicode Specification 14.0.0 and 15.0.0. * Changed developer tools to use pip-compile, and to use jinja2 templates for code generation in bin/update-tables.py to prepare for possible compiler optimization release. Signed-off-by: Tim Orling --- .../{python3-wcwidth_0.2.5.bb => python3-wcwidth_0.2.6.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-devtools/python/{python3-wcwidth_0.2.5.bb => python3-wcwidth_0.2.6.bb} (80%) diff --git a/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb b/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb similarity index 80% rename from meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb rename to meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb index a532d3c5cb9..368146dba48 100644 --- a/meta/recipes-devtools/python/python3-wcwidth_0.2.5.bb +++ b/meta/recipes-devtools/python/python3-wcwidth_0.2.6.bb @@ -4,8 +4,7 @@ HOMEPAGE = "https://github.com/jquast/wcwidth; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b15979c39a2543892fca8cd86b4b52cb" -SRC_URI[md5sum] = "a07a75f99d316e14838ac760c831ea37" -SRC_URI[sha256sum] = "c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83" +SRC_URI[sha256sum] = "a5220780a404dbe3353789870978e472cfe477761f06ee55077256e509b156d0" inherit pypi setuptools3 ptest -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176746): https://lists.openembedded.org/g/openembedded-core/message/176746 Mute This Topic: https://lists.openembedded.org/mt/96728514/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 13/14] python3-urllib3: upgrade 1.26.13 -> 1.26.14
https://github.com/urllib3/urllib3/blob/1.26.14/CHANGES.rst#12614-2023-01-11 1.26.14 (2023-01-11) Fixed parsing of port 0 (zero) returning None, instead of 0. (#2850) Removed deprecated getheaders() calls in contrib module. Signed-off-by: Tim Orling --- .../{python3-urllib3_1.26.13.bb => python3-urllib3_1.26.14.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-urllib3_1.26.13.bb => python3-urllib3_1.26.14.bb} (86%) diff --git a/meta/recipes-devtools/python/python3-urllib3_1.26.13.bb b/meta/recipes-devtools/python/python3-urllib3_1.26.14.bb similarity index 86% rename from meta/recipes-devtools/python/python3-urllib3_1.26.13.bb rename to meta/recipes-devtools/python/python3-urllib3_1.26.14.bb index 7af95117cf1..f35a141df26 100644 --- a/meta/recipes-devtools/python/python3-urllib3_1.26.13.bb +++ b/meta/recipes-devtools/python/python3-urllib3_1.26.14.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8" +SRC_URI[sha256sum] = "076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72" inherit pypi setuptools3 -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176747): https://lists.openembedded.org/g/openembedded-core/message/176747 Mute This Topic: https://lists.openembedded.org/mt/96728516/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] python3-pyopenssl: upgrade 22.1.0 -> 23.0.0
https://www.pyopenssl.org/en/23.0.0/changelog.html 23.0.0 (2023-01-01) Changes: Add OpenSSL.SSL.X509StoreFlags.PARTIAL_CHAIN constant to allow for users to perform certificate verification on partial certificate chains. #1166 cryptography maximum version has been increased to 39.0.x. Signed-off-by: Tim Orling --- ...{python3-pyopenssl_22.1.0.bb => python3-pyopenssl_23.0.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-pyopenssl_22.1.0.bb => python3-pyopenssl_23.0.0.bb} (86%) diff --git a/meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb b/meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb similarity index 86% rename from meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb rename to meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb index 4d83b8c7d74..822d21a58a7 100644 --- a/meta/recipes-devtools/python/python3-pyopenssl_22.1.0.bb +++ b/meta/recipes-devtools/python/python3-pyopenssl_23.0.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS += "openssl ${PYTHON_PN}-cryptography" -SRC_URI[sha256sum] = "7a83b7b272dd595222d672f5ce29aa030f1fb837630ef229f62e72e395ce8968" +SRC_URI[sha256sum] = "c1cc5f86bcacefc84dada7d31175cae1b1518d5f60d3d0bb595a67822a868a6f" PYPI_PACKAGE = "pyOpenSSL" inherit pypi setuptools3 -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176745): https://lists.openembedded.org/g/openembedded-core/message/176745 Mute This Topic: https://lists.openembedded.org/mt/96728512/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] python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1
* inherit python_setuptools_build_meta https://github.com/sphinx-doc/sphinxcontrib-htmlhelp/blob/master/CHANGES Release 2.0.1 (2023-01-31) == * Drop support for Python 3.7 and lower * Fix deprecation warnings from Sphinx 6.1 Signed-off-by: Tim Orling --- ...lhelp_2.0.0.bb => python3-sphinxcontrib-htmlhelp_2.0.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/python/{python3-sphinxcontrib-htmlhelp_2.0.0.bb => python3-sphinxcontrib-htmlhelp_2.0.1.bb} (70%) diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb similarity index 70% rename from meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb rename to meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb index cd8b987e0c8..39589881daa 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.0.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-htmlhelp_2.0.1.bb @@ -3,10 +3,10 @@ HOMEPAGE = "https://www.sphinx-doc.org; LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24dce5ef6a13563241c24bc366f48886" -SRC_URI[sha256sum] = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2" +SRC_URI[sha256sum] = "0cbdd302815330058422b98a113195c9249825d681e18f11e8b1f78a2f11efff" PYPI_PACKAGE = "sphinxcontrib-htmlhelp" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176744): https://lists.openembedded.org/g/openembedded-core/message/176744 Mute This Topic: https://lists.openembedded.org/mt/96728509/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] python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4
* Tarball name changed so we can drop custom PYPI_PACKAGE * Switched back from flit to setuptools * inherit python_setuptools_build_meta instead of python3_flit_core https://github.com/sphinx-doc/sphinxcontrib-applehelp/commits/1.0.4 Signed-off-by: Tim Orling --- ...lp_1.0.3.bb => python3-sphinxcontrib-applehelp_1.0.4.bb} | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.3.bb => python3-sphinxcontrib-applehelp_1.0.4.bb} (62%) diff --git a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb similarity index 62% rename from meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb rename to meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb index c97d204c068..4d14216c524 100644 --- a/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.3.bb +++ b/meta/recipes-devtools/python/python3-sphinxcontrib-applehelp_1.0.4.bb @@ -3,10 +3,8 @@ HOMEPAGE = "https://www.sphinx-doc.org; LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7715857042d4c8c0105999ca0c072c5" -SRC_URI[sha256sum] = "83749f09f6ac843b8cb685277dbc818a8bf2d76cc19602699094fe9a74db529e" +SRC_URI[sha256sum] = "828f867945bbe39817c210a1abfd1bc4895c8b73fcaade56d45357a348a07d7e" -PYPI_PACKAGE = "sphinxcontrib.applehelp" - -inherit pypi python_flit_core +inherit pypi python_setuptools_build_meta BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176743): https://lists.openembedded.org/g/openembedded-core/message/176743 Mute This Topic: https://lists.openembedded.org/mt/96728507/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] python3-requests: upgrade 2.28.1 -> 2.28.2
https://requests.readthedocs.io/en/latest/community/updates/#release-history 2.28.2 (2023-01-12) Dependencies Requests now supports charset_normalizer 3.x. (#6261) Bugfixes Updated MissingSchema exception to suggest https scheme rather than http. (#6188) Signed-off-by: Tim Orling --- .../{python3-requests_2.28.1.bb => python3-requests_2.28.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-requests_2.28.1.bb => python3-requests_2.28.2.bb} (87%) diff --git a/meta/recipes-devtools/python/python3-requests_2.28.1.bb b/meta/recipes-devtools/python/python3-requests_2.28.2.bb similarity index 87% rename from meta/recipes-devtools/python/python3-requests_2.28.1.bb rename to meta/recipes-devtools/python/python3-requests_2.28.2.bb index 8de08d26200..2f397ddaadf 100644 --- a/meta/recipes-devtools/python/python3-requests_2.28.1.bb +++ b/meta/recipes-devtools/python/python3-requests_2.28.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://python-requests.org; LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI[sha256sum] = "7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983" +SRC_URI[sha256sum] = "98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf" inherit pypi setuptools3 -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176742): https://lists.openembedded.org/g/openembedded-core/message/176742 Mute This Topic: https://lists.openembedded.org/mt/96728505/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] python3-zipp: upgrade 3.11.0 -> 3.12.0
https://github.com/jaraco/zipp/blob/main/CHANGES.rst#v3120 v3.12.0 gh-101144: Honor encoding as positional parameter to Path.open() and Path.read_text(). Signed-off-by: Tim Orling --- .../python/{python3-zipp_3.11.0.bb => python3-zipp_3.12.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-zipp_3.11.0.bb => python3-zipp_3.12.0.bb} (85%) diff --git a/meta/recipes-devtools/python/python3-zipp_3.11.0.bb b/meta/recipes-devtools/python/python3-zipp_3.12.0.bb similarity index 85% rename from meta/recipes-devtools/python/python3-zipp_3.11.0.bb rename to meta/recipes-devtools/python/python3-zipp_3.12.0.bb index 70ebafc1689..1b36e425436 100644 --- a/meta/recipes-devtools/python/python3-zipp_3.11.0.bb +++ b/meta/recipes-devtools/python/python3-zipp_3.12.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" -SRC_URI[sha256sum] = "a7a22e05929290a67401440b39690ae6563279bced5f314609d9d03798f56766" +SRC_URI[sha256sum] = "73efd63936398aac78fd92b6f4865190119d6c91b531532e798977ea8dd402eb" DEPENDS += "${PYTHON_PN}-setuptools-scm-native" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176741): https://lists.openembedded.org/g/openembedded-core/message/176741 Mute This Topic: https://lists.openembedded.org/mt/96728504/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] python3-pytz: upgrade 2022.7 -> 2022.7.1
https://github.com/stub42/pytz/commits/release_2022.7.1 Signed-off-by: Tim Orling --- .../python/{python3-pytz_2022.7.bb => python3-pytz_2022.7.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-pytz_2022.7.bb => python3-pytz_2022.7.1.bb} (89%) diff --git a/meta/recipes-devtools/python/python3-pytz_2022.7.bb b/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb similarity index 89% rename from meta/recipes-devtools/python/python3-pytz_2022.7.bb rename to meta/recipes-devtools/python/python3-pytz_2022.7.1.bb index a6a69c8b596..553b9cfa181 100644 --- a/meta/recipes-devtools/python/python3-pytz_2022.7.bb +++ b/meta/recipes-devtools/python/python3-pytz_2022.7.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a67fc46c1b596cce5d21209bbe75999" inherit pypi setuptools3 ptest -SRC_URI[sha256sum] = "7ccfae7b4b2c067464a6733c6261673fdb8fd1be905460396b97a073e9fa683a" +SRC_URI[sha256sum] = "01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0" RDEPENDS:${PN}:class-target += "\ ${PYTHON_PN}-datetime \ -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176740): https://lists.openembedded.org/g/openembedded-core/message/176740 Mute This Topic: https://lists.openembedded.org/mt/96728503/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] python3-iniconfig: upgrade 1.1.1 -> 2.0.0
* Switch to hatchling build-backend * inherit python_hatchling instead of python_setuptools_build_meta * DEPENDS on python3-hatch-vcs-native instead of python3-setuptools-scm-native 2.0.0 == * add support for Python 3.7-3.11 * drop support for Python 2.6-3.6 * add encoding argument defaulting to utf-8 * inline and clarify type annotations * move parsing code from inline to extra file * add typing overloads for helper methods .. note:: major release due to the major changes in python versions supported + changes in packaging the api is expected to be compatible Signed-off-by: Tim Orling --- ...thon3-iniconfig_1.1.1.bb => python3-iniconfig_2.0.0.bb} | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) rename meta/recipes-devtools/python/{python3-iniconfig_1.1.1.bb => python3-iniconfig_2.0.0.bb} (46%) diff --git a/meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb b/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb similarity index 46% rename from meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb rename to meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb index 4643437b800..ca50ebbc352 100644 --- a/meta/recipes-devtools/python/python3-iniconfig_1.1.1.bb +++ b/meta/recipes-devtools/python/python3-iniconfig_2.0.0.bb @@ -4,9 +4,8 @@ HOMEPAGE = "https://pypi.org/project/iniconfig/; LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" -SRC_URI[md5sum] = "0b7f3be87481211c183eae095bcea6f1" -SRC_URI[sha256sum] = "bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32" +SRC_URI[sha256sum] = "2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3" -DEPENDS += "python3-setuptools-scm-native" +DEPENDS += "python3-hatch-vcs-native" -inherit pypi python_setuptools_build_meta +inherit pypi python_hatchling -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176739): https://lists.openembedded.org/g/openembedded-core/message/176739 Mute This Topic: https://lists.openembedded.org/mt/96728502/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 04/14] python3-poetry-core: upgrade 1.4.0 -> 1.5.0
* Drop deterministic.patch; merged https://github.com/python-poetry/poetry-core/pull/545 * Drop vendored pyparsing LICENSE; no longer vendored https://github.com/python-poetry/poetry-core/blob/main/CHANGELOG.md#150---2023-01-27 Signed-off-by: Tim Orling --- .../python3-poetry-core/deterministic.patch | 23 --- ..._1.4.0.bb => python3-poetry-core_1.5.0.bb} | 5 +--- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-poetry-core/deterministic.patch rename meta/recipes-devtools/python/{python3-poetry-core_1.4.0.bb => python3-poetry-core_1.5.0.bb} (89%) diff --git a/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch b/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch deleted file mode 100644 index 402ee530944..000 --- a/meta/recipes-devtools/python/python3-poetry-core/deterministic.patch +++ /dev/null @@ -1,23 +0,0 @@ -builders/wheel: Ensure dist-info is written determinisically - -glob() returns values in "on disk" order. To make the RECORD file -deterministic and consistent between builds we need to sort the -data before adding to the records list. - -Signed-off-by: Richard Purdie - -Upstream-Status: Submitted [https://github.com/python-poetry/poetry-core/pull/545] - -Index: builders/wheel.py -=== a/src/poetry/core/masonry/builders/wheel.py -+++ b/src/poetry/core/masonry/builders/wheel.py -@@ -294,7 +294,7 @@ class WheelBuilder(Builder): - - def _copy_dist_info(self, wheel: zipfile.ZipFile, source: Path) -> None: - dist_info = Path(self.dist_info) --for file in source.glob("**/*"): -+for file in sorted(source.glob("**/*") ): - if not file.is_file(): - continue - diff --git a/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb b/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb similarity index 89% rename from meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb rename to meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb index 8a950220125..03db426b39a 100644 --- a/meta/recipes-devtools/python/python3-poetry-core_1.4.0.bb +++ b/meta/recipes-devtools/python/python3-poetry-core_1.5.0.bb @@ -14,20 +14,17 @@ LIC_FILES_CHKSUM = "\ file://src/poetry/core/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \ file://src/poetry/core/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \ file://src/poetry/core/_vendor/packaging/LICENSE.BSD;md5=7bef9bf4a8e4263634d0597e7ba100b8 \ - file://src/poetry/core/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ file://src/poetry/core/_vendor/pyrsistent/LICENSE.mit;md5=b695eb9c6e7a6fb1b1bc2d193c42776e \ file://src/poetry/core/_vendor/tomlkit/LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82 \ file://src/poetry/core/_vendor/typing_extensions.LICENSE;md5=f16b323917992e0f8a6f0071bc9913e2 \ " -SRC_URI[sha256sum] = "514bd33c30e0bf56b0ed44ee15e120d7e47b61ad908b2b1011da68c48a84ada9" +SRC_URI[sha256sum] = "253521bb7104e1df81f64d7b49ea1825057c91fa156d7d0bd752fefdad6f8c7a" inherit python_poetry_core pypi PYPI_ARCHIVE_NAME = "poetry_core-${PV}.${PYPI_PACKAGE_EXT}" S = "${WORKDIR}/poetry_core-${PV}" -SRC_URI += "file://deterministic.patch" - RDEPENDS:${PN}:append:class-target = "\ python3-compression \ python3-core \ -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176738): https://lists.openembedded.org/g/openembedded-core/message/176738 Mute This Topic: https://lists.openembedded.org/mt/96728501/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] python3-hypothesis: upgrade 6.62.0 -> 6.66.0
https://hypothesis.readthedocs.io/en/latest/changes.html#v6-66-0 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-65-2 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-65-1 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-65-0 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-64-0 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-63-0 https://hypothesis.readthedocs.io/en/latest/changes.html#v6-62-1 Signed-off-by: Tim Orling --- ...ython3-hypothesis_6.62.0.bb => python3-hypothesis_6.66.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-hypothesis_6.62.0.bb => python3-hypothesis_6.66.0.bb} (91%) diff --git a/meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb b/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb similarity index 91% rename from meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb rename to meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb index 4369a697bd9..3101845e48c 100644 --- a/meta/recipes-devtools/python/python3-hypothesis_6.62.0.bb +++ b/meta/recipes-devtools/python/python3-hypothesis_6.66.0.bb @@ -13,7 +13,7 @@ SRC_URI += " \ file://test_rle.py \ " -SRC_URI[sha256sum] = "76f1141e8237f6dd0780a171bec5d6aec873208ccc27b5f9753d4cccd8904272" +SRC_URI[sha256sum] = "2fb334ab068dc6e7c02d49a1c694f66bd1f681197eeed94406650a59eebef870" RDEPENDS:${PN} += " \ python3-attrs \ -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176737): https://lists.openembedded.org/g/openembedded-core/message/176737 Mute This Topic: https://lists.openembedded.org/mt/96728500/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] python3-pytest: upgrade 7.2.0 -> 7.2.1
https://docs.pytest.org/en/stable/changelog.html#pytest-7-2-1-2023-01-13 pytest 7.2.1 (2023-01-13) Bug Fixes #10452: Fix ‘importlib.abc.TraversableResources’ deprecation warning in Python 3.12. #10457: If a test is skipped from inside a fixture, the test summary now shows the test location instead of the fixture location. #10506: Fix bug where sometimes pytest would use the file system root directory as rootdir on Windows. #10607: Fix a race condition when creating junitxml reports, which could occur when multiple instances of pytest execute in parallel. #10641: Fix a race condition when creating or updating the stepwise plugin’s cache, which could occur when multiple xdist worker nodes try to simultaneously update the stepwise plugin’s cache. Signed-off-by: Tim Orling --- .../python/{python3-pytest_7.2.0.bb => python3-pytest_7.2.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-pytest_7.2.0.bb => python3-pytest_7.2.1.bb} (93%) diff --git a/meta/recipes-devtools/python/python3-pytest_7.2.0.bb b/meta/recipes-devtools/python/python3-pytest_7.2.1.bb similarity index 93% rename from meta/recipes-devtools/python/python3-pytest_7.2.0.bb rename to meta/recipes-devtools/python/python3-pytest_7.2.1.bb index 02fc55fdb0b..85fc507dde9 100644 --- a/meta/recipes-devtools/python/python3-pytest_7.2.0.bb +++ b/meta/recipes-devtools/python/python3-pytest_7.2.1.bb @@ -5,7 +5,7 @@ DESCRIPTION = "The pytest framework makes it easy to write small tests, yet scal LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bd27e41b6550fe0fc45356d1d81ee37c" -SRC_URI[sha256sum] = "c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59" +SRC_URI[sha256sum] = "d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42" DEPENDS += "python3-setuptools-scm-native" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176736): https://lists.openembedded.org/g/openembedded-core/message/176736 Mute This Topic: https://lists.openembedded.org/mt/96728499/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] libtest-needs-perl: upgrade 0.002009 -> 0.002010
0.002010 - 2023-01-22 - split main test into three separate scripts - avoid outputting multiple plans if used with no_plan Signed-off-by: Tim Orling --- ...t-needs-perl_0.002009.bb => libtest-needs-perl_0.002010.bb} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename meta/recipes-devtools/perl/{libtest-needs-perl_0.002009.bb => libtest-needs-perl_0.002010.bb} (86%) diff --git a/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb b/meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb similarity index 86% rename from meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb rename to meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb index 43a9a6b7d32..79a06170e02 100644 --- a/meta/recipes-devtools/perl/libtest-needs-perl_0.002009.bb +++ b/meta/recipes-devtools/perl/libtest-needs-perl_0.002010.bb @@ -17,8 +17,7 @@ DEPENDS += "perl" SRC_URI = "https://cpan.metacpan.org/authors/id/H/HA/${CPAN_AUTHOR}/${CPAN_NAME}-${PV}.tar.gz; -SRC_URI[md5sum] = "5643cd323afb77d20363acbaf9b12bcc" -SRC_URI[sha256sum] = "571c21193ad16195df58b06b268798796a391b398c443271721d2cc0fb7c4ac3" +SRC_URI[sha256sum] = "923ffdc78fcba96609753e4bae26b0ba0186893de4a63cd5236e012c7c90e208" S = "${WORKDIR}/${CPAN_NAME}-${PV}" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176735): https://lists.openembedded.org/g/openembedded-core/message/176735 Mute This Topic: https://lists.openembedded.org/mt/96728498/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] Recipe upgrades from 02/01/2023 AUH
Fixed some upgrades that failed on AUH. * python3-poetry-core * python3-iniconfig * python3-sphinxcontrib-applehelp * python3-sphinxcontrib-htmlhelp The following changes since commit 063bdffc04714c7ed4bdba2aa93a19dd94f256a9: perf: Fix 6.1 kernel reproducibility issue (2023-02-03 16:52:15 +) are available in the Git repository at: https://git.yoctoproject.org/poky-contrib timo/recipe-upgrades http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=timo/recipe-upgrades Tim Orling (14): libtest-needs-perl: upgrade 0.002009 -> 0.002010 python3-pytest: upgrade 7.2.0 -> 7.2.1 python3-hypothesis: upgrade 6.62.0 -> 6.66.0 python3-poetry-core: upgrade 1.4.0 -> 1.5.0 python3-iniconfig: upgrade 1.1.1 -> 2.0.0 python3-pytz: upgrade 2022.7 -> 2022.7.1 python3-zipp: upgrade 3.11.0 -> 3.12.0 python3-requests: upgrade 2.28.1 -> 2.28.2 python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4 python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1 python3-pyopenssl: upgrade 22.1.0 -> 23.0.0 python3-wcwidth: upgrade 0.2.5 -> 0.2.6 python3-urllib3: upgrade 1.26.13 -> 1.26.14 python3-sphinx: upgrade 6.0.0 -> 6.1.3 ...2009.bb => libtest-needs-perl_0.002010.bb} | 3 +-- ...6.62.0.bb => python3-hypothesis_6.66.0.bb} | 2 +- ...ig_1.1.1.bb => python3-iniconfig_2.0.0.bb} | 7 +++-- .../python3-poetry-core/deterministic.patch | 23 ..._1.4.0.bb => python3-poetry-core_1.5.0.bb} | 5 +--- ..._22.1.0.bb => python3-pyopenssl_23.0.0.bb} | 2 +- ...ytest_7.2.0.bb => python3-pytest_7.2.1.bb} | 2 +- ...ytz_2022.7.bb => python3-pytz_2022.7.1.bb} | 2 +- ...s_2.28.1.bb => python3-requests_2.28.2.bb} | 2 +- ...phinx_6.0.0.bb => python3-sphinx_6.1.3.bb} | 26 +-- ... python3-sphinxcontrib-applehelp_1.0.4.bb} | 6 ++--- ...> python3-sphinxcontrib-htmlhelp_2.0.1.bb} | 4 +-- ..._1.26.13.bb => python3-urllib3_1.26.14.bb} | 2 +- ...idth_0.2.5.bb => python3-wcwidth_0.2.6.bb} | 3 +-- ...-zipp_3.11.0.bb => python3-zipp_3.12.0.bb} | 2 +- 15 files changed, 41 insertions(+), 50 deletions(-) rename meta/recipes-devtools/perl/{libtest-needs-perl_0.002009.bb => libtest-needs-perl_0.002010.bb} (86%) rename meta/recipes-devtools/python/{python3-hypothesis_6.62.0.bb => python3-hypothesis_6.66.0.bb} (91%) rename meta/recipes-devtools/python/{python3-iniconfig_1.1.1.bb => python3-iniconfig_2.0.0.bb} (46%) delete mode 100644 meta/recipes-devtools/python/python3-poetry-core/deterministic.patch rename meta/recipes-devtools/python/{python3-poetry-core_1.4.0.bb => python3-poetry-core_1.5.0.bb} (89%) rename meta/recipes-devtools/python/{python3-pyopenssl_22.1.0.bb => python3-pyopenssl_23.0.0.bb} (86%) rename meta/recipes-devtools/python/{python3-pytest_7.2.0.bb => python3-pytest_7.2.1.bb} (93%) rename meta/recipes-devtools/python/{python3-pytz_2022.7.bb => python3-pytz_2022.7.1.bb} (89%) rename meta/recipes-devtools/python/{python3-requests_2.28.1.bb => python3-requests_2.28.2.bb} (87%) rename meta/recipes-devtools/python/{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb} (49%) rename meta/recipes-devtools/python/{python3-sphinxcontrib-applehelp_1.0.3.bb => python3-sphinxcontrib-applehelp_1.0.4.bb} (62%) rename meta/recipes-devtools/python/{python3-sphinxcontrib-htmlhelp_2.0.0.bb => python3-sphinxcontrib-htmlhelp_2.0.1.bb} (70%) rename meta/recipes-devtools/python/{python3-urllib3_1.26.13.bb => python3-urllib3_1.26.14.bb} (86%) rename meta/recipes-devtools/python/{python3-wcwidth_0.2.5.bb => python3-wcwidth_0.2.6.bb} (80%) rename meta/recipes-devtools/python/{python3-zipp_3.11.0.bb => python3-zipp_3.12.0.bb} (85%) -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176734): https://lists.openembedded.org/g/openembedded-core/message/176734 Mute This Topic: https://lists.openembedded.org/mt/96728487/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] perf: Enable debug/source packaging
This was disabled in 2014[1] due to an error message which as far as I can tell, no longer occurs. Having debug information and source files present will make debugging reproducibility issues much easier so remove this line as it appears no longer needed. [1] OE-Core revision c1b5a262c0201faf2c6bf545d6acb32dfe383ba3 Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 1dff39a17e4..e8a9c57a0aa 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -360,6 +360,4 @@ FILES:${PN}-python = " \ " FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" - -INHIBIT_PACKAGE_DEBUG_SPLIT="1" DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" -- 2.37.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176733): https://lists.openembedded.org/g/openembedded-core/message/176733 Mute This Topic: https://lists.openembedded.org/mt/96726928/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] perf: Fix 6.1 kernel reproducibility issue
On Fri, 2023-02-03 at 11:39 -0500, Bruce Ashfield wrote: > On Fri, Feb 3, 2023 at 11:34 AM Richard Purdie > wrote: > > > > On Fri, 2023-02-03 at 11:02 -0500, Bruce Ashfield wrote: > > > On Fri, Feb 3, 2023 at 10:47 AM Richard Purdie > > > wrote: > > > > > > > > The pmu-events.c file is generated by a python script making > > > > os.scandir() > > > > calls. The return value is "order on disk" which can cary between > > > > machines. > > > > > > > > Add in a sed to fix the perf source to sort this data which makes > > > > the pmu-events.c file deterministic. > > > > > > Looks good to me. The perf recipe is the great collector of sed > > > manipulations :) > > > > > > > > > > > We should try and upstream this change but we'll need to sed for varying > > > > kernel versions. We should also try and get the perf source being added > > > > to the perf-devsrc package so when failures like this occur, diffoscope > > > > is much more helpful! > > > > > > I can do this, if you haven't started on it. I can't say that i know > > > exactly why it > > > isn't already there, but it can't be that hard to figure out :) > > > > I haven't looked at submission upstream. I did have a quick look at the > > sources issue and realised: > > > > diff --git a/meta/recipes-kernel/perf/perf.bb > > b/meta/recipes-kernel/perf/perf.bb > > index 1dff39a17e4..0a3179f18be 100644 > > --- a/meta/recipes-kernel/perf/perf.bb > > +++ b/meta/recipes-kernel/perf/perf.bb > > @@ -361,5 +361,5 @@ FILES:${PN}-python = " \ > > FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" > > > > > > -INHIBIT_PACKAGE_DEBUG_SPLIT="1" > > +#INHIBIT_PACKAGE_DEBUG_SPLIT="1" > > DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" > > > > > > which makes them appear. Does anyone remember why we have that and if > > we can remove it? :) > > I can't recall why we had that in place. > > It would predate us taking a copy of the sources for the build, so it > may have been related to that. > > Assuming nothing pops up as a new breakage ... I have no technical > recollection of why it can't be changed. It was added by you in 2014! :) https://git.yoctoproject.org/poky/commit/meta/recipes-kernel/perf?id=08808c9f404d01c497b92e7d34a3bb0c0159a258 I think the world has changed and at least my local build didn't fail with that when removing it. I'll try testing a wider patch on the autobuilder and see if we get any errors. If we do, we should probably resolve them some other way. Getting more usable diffoscope output would be a huge win given how often perf breaks. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176732): https://lists.openembedded.org/g/openembedded-core/message/176732 Mute This Topic: https://lists.openembedded.org/mt/96725319/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] meta: remove True option to getVar and getVarFlag calls (again)
On 03/02/2023 16:32:08+, Richard Purdie wrote: > On Fri, 2023-02-03 at 17:22 +0100, Alexandre Belloni via > lists.openembedded.org wrote: > > I'm not sure what you based the patch on, it didn't apply for me. > > I did already take most of this one except the bits to report- > error.bbclass which Martin said were a process error on irc and can be > ignored. > Ok, thanks, I didn't check! > Cheers, > > Richard -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176731): https://lists.openembedded.org/g/openembedded-core/message/176731 Mute This Topic: https://lists.openembedded.org/mt/96679225/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] perf: Fix 6.1 kernel reproducibility issue
On Fri, Feb 3, 2023 at 11:34 AM Richard Purdie wrote: > > On Fri, 2023-02-03 at 11:02 -0500, Bruce Ashfield wrote: > > On Fri, Feb 3, 2023 at 10:47 AM Richard Purdie > > wrote: > > > > > > The pmu-events.c file is generated by a python script making os.scandir() > > > calls. The return value is "order on disk" which can cary between > > > machines. > > > > > > Add in a sed to fix the perf source to sort this data which makes > > > the pmu-events.c file deterministic. > > > > Looks good to me. The perf recipe is the great collector of sed > > manipulations :) > > > > > > > > We should try and upstream this change but we'll need to sed for varying > > > kernel versions. We should also try and get the perf source being added > > > to the perf-devsrc package so when failures like this occur, diffoscope > > > is much more helpful! > > > > I can do this, if you haven't started on it. I can't say that i know > > exactly why it > > isn't already there, but it can't be that hard to figure out :) > > I haven't looked at submission upstream. I did have a quick look at the > sources issue and realised: > > diff --git a/meta/recipes-kernel/perf/perf.bb > b/meta/recipes-kernel/perf/perf.bb > index 1dff39a17e4..0a3179f18be 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -361,5 +361,5 @@ FILES:${PN}-python = " \ > FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" > > > -INHIBIT_PACKAGE_DEBUG_SPLIT="1" > +#INHIBIT_PACKAGE_DEBUG_SPLIT="1" > DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" > > > which makes them appear. Does anyone remember why we have that and if > we can remove it? :) I can't recall why we had that in place. It would predate us taking a copy of the sources for the build, so it may have been related to that. Assuming nothing pops up as a new breakage ... I have no technical recollection of why it can't be changed. Bruce > > Cheers, > > Richard -- - 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 (#176730): https://lists.openembedded.org/g/openembedded-core/message/176730 Mute This Topic: https://lists.openembedded.org/mt/96725319/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] perf: Fix 6.1 kernel reproducibility issue
On Fri, 2023-02-03 at 11:02 -0500, Bruce Ashfield wrote: > On Fri, Feb 3, 2023 at 10:47 AM Richard Purdie > wrote: > > > > The pmu-events.c file is generated by a python script making os.scandir() > > calls. The return value is "order on disk" which can cary between machines. > > > > Add in a sed to fix the perf source to sort this data which makes > > the pmu-events.c file deterministic. > > Looks good to me. The perf recipe is the great collector of sed manipulations > :) > > > > > We should try and upstream this change but we'll need to sed for varying > > kernel versions. We should also try and get the perf source being added > > to the perf-devsrc package so when failures like this occur, diffoscope > > is much more helpful! > > I can do this, if you haven't started on it. I can't say that i know > exactly why it > isn't already there, but it can't be that hard to figure out :) I haven't looked at submission upstream. I did have a quick look at the sources issue and realised: diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 1dff39a17e4..0a3179f18be 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -361,5 +361,5 @@ FILES:${PN}-python = " \ FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" -INHIBIT_PACKAGE_DEBUG_SPLIT="1" +#INHIBIT_PACKAGE_DEBUG_SPLIT="1" DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" which makes them appear. Does anyone remember why we have that and if we can remove it? :) Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176729): https://lists.openembedded.org/g/openembedded-core/message/176729 Mute This Topic: https://lists.openembedded.org/mt/96725319/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 v2] oeqa/selftest/locales: Create selftest for locales generation
On 02/02/2023 14:58, Louis Rannou wrote: On 02/02/2023 11:53, Richard Purdie wrote: On Thu, 2023-02-02 at 11:41 +0100, Louis Rannou wrote: On 01/02/2023 18:57, Richard Purdie wrote: On Wed, 2023-02-01 at 16:02 +0100, Louis Rannou wrote: I was able to take a quick look at this. The locale generation on target is broken, it throws errors upon boot. I was able to make it work with this patch: diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index 7f70b3ca4f..c39007b573 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/meta/recipes-core/glibc/glibc-locale.inc @@ -60,7 +60,7 @@ DESCRIPTION:localedef = "glibc: compile locale definition files"   # FILES:glibc-gconv will not be automatically extended in multilib.   # Explicitly add ${MLPREFIX} for FILES:glibc-gconv.   FILES:${MLPREFIX}glibc-gconv = "${libdir}/gconv/*" -FILES:localedef = "${bindir}/localedef" +FILES:localedef = "${bindir}/localedef ${libdir}/locale"   LOCALETREESRC = "${COMPONENTS_DIR}/${PACKAGE_ARCH}/glibc-stash-locale" @@ -87,6 +87,7 @@ do_install() {  find ${D}${libdir} -type d -empty -delete  copy_locale_files ${datadir}/locale 0644  install -m 0644 ${LOCALETREESRC}/SUPPORTED ${WORKDIR}/SUPPORTED +  install -d ${D}${libdir}/locale   }   inherit libc-package could you see if the same test will now work with that patch applied? I'm happy to have the basic test but if we can fix this and stop it regressing that would be even better. The patch does not change the result. I have actually nothing in the image/usr/lib/locale directory. Testing locally, if I don't have the patch and "runqemu core-image- minimal snapshot kvm", I see errors about locale generation failing during first boot as the directory isn't present. If I add the patch and then boot the image, I see the locale generation happening at first boot. If I then run the locale commands, I can see the locales present. I wonder which package do that, because this is not something I see on my qemu. I run a kirkstone qemuarm on poky. Perhaps I need something more recent. Here is what I have at boot: ``` Configuring packages on first boot (This may take several minutes. Please do not power off the machine.) Running postinst /etc/rpm-postinsts/100-sysvinit-inittab... update-rc.d: /etc/init.d/run-postinsts exists during rc.d purge (continuing) Removing any system startup links for run-postinsts ... /etc/rcS.d/S99run-postinsts INIT: Entering runlevel: 5 Configuring network interfaces... ip: RTNETLINK answers: File exists Starting syslogd/klogd: done Poky (Yocto Project Reference Distro) 4.0.6 qemuarm /dev/ttyAMA0 qemuarm login: ``` Would you recommend to try on langdale ? Regards, Louis I am not sure to understand... If I add to my image the packages glibc-localedata-fr-fr and glibc-charmap-utf-8, then I have something in /usr/share/i18n/locales and /usr/share/i18n/charmaps, and then I can generate the locales with `localedef -c -i fr_FR -f UTF-8 fr_FR` In the end, I believe this is correct that I have nothing in {libdir}/locale, but perhaps the settings IMAGE_LINGUAS (or GLIBC_GENERATE_LOCALES ?) should specify a rdepend to the locale/charmap packages, so the locales would exist in the image, but would not be generated at build. The locale generation can happen at build time or it can happen at first boot on the final target. For the second test case, the locales will only appear during the boot process. I've merged your patch with the first test case, thanks! I did tweak the comment message to match that it is just one test so far. Thanks for getting us that far, it is great to be adding tests around this. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176728): https://lists.openembedded.org/g/openembedded-core/message/176728 Mute This Topic: https://lists.openembedded.org/mt/96567951/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] meta: remove True option to getVar and getVarFlag calls (again)
On Fri, 2023-02-03 at 17:22 +0100, Alexandre Belloni via lists.openembedded.org wrote: > I'm not sure what you based the patch on, it didn't apply for me. I did already take most of this one except the bits to report- error.bbclass which Martin said were a process error on irc and can be ignored. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176727): https://lists.openembedded.org/g/openembedded-core/message/176727 Mute This Topic: https://lists.openembedded.org/mt/96679225/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] meta: remove True option to getVar and getVarFlag calls (again)
Hello, I'm not sure what you based the patch on, it didn't apply for me. On 01/02/2023 16:50:38+0100, Martin Jansa wrote: > * True is default since 2016 and most layers were already updated > not to pass this parameter where not necessary, e.g. oe-core was > updated couple times, first in: > > https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f > > Updated with the same regexp as later oe-core update: > > https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba > > with small modification to replace not only d.getVar, but also data.getVar > as in e.g.: > e.data.getVar('ERR_REPORT_USERNAME', True) > > and for getVarFlag: > sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' > \ > -i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \ > | cut -d':' -f1 \ > | sort -u) > > Signed-off-by: Martin Jansa > --- > meta/classes-recipe/image.bbclass | 2 +- > meta/classes-recipe/license_image.bbclass | 2 +- > .../classes-recipe/rust-target-config.bbclass | 2 +- > meta/classes/report-error.bbclass | 8 +++ > meta/lib/oe/package_manager/deb/__init__.py | 8 +++ > meta/recipes-devtools/go/go_1.19.4.bb | 4 ++-- > meta/recipes-devtools/rust/rust_1.67.0.bb | 22 +-- > scripts/contrib/image-manifest| 2 +- > scripts/lib/devtool/menuconfig.py | 2 +- > 9 files changed, 26 insertions(+), 26 deletions(-) > > diff --git a/meta/classes-recipe/image.bbclass > b/meta/classes-recipe/image.bbclass > index e6d31c399f..0e252283dd 100644 > --- a/meta/classes-recipe/image.bbclass > +++ b/meta/classes-recipe/image.bbclass > @@ -446,7 +446,7 @@ python () { > localdata.delVar('DATE') > localdata.delVar('TMPDIR') > localdata.delVar('IMAGE_VERSION_SUFFIX') > -vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, > 'vardepsexclude', True) or '').split() > +vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, > 'vardepsexclude') or '').split() > for dep in vardepsexclude: > localdata.delVar(dep) > > diff --git a/meta/classes-recipe/license_image.bbclass > b/meta/classes-recipe/license_image.bbclass > index b60d6e44f4..8560c27e93 100644 > --- a/meta/classes-recipe/license_image.bbclass > +++ b/meta/classes-recipe/license_image.bbclass > @@ -235,7 +235,7 @@ def get_deployed_dependencies(d): > deploy = {} > # Get all the dependencies for the current task (rootfs). > taskdata = d.getVar("BB_TASKDEPDATA", False) > -pn = d.getVar("PN", True) > +pn = d.getVar("PN") > depends = list(set([dep[0] for dep > in list(taskdata.values()) > if not dep[0].endswith("-native") and not dep[0] == pn])) > diff --git a/meta/classes-recipe/rust-target-config.bbclass > b/meta/classes-recipe/rust-target-config.bbclass > index 939dd13d2f..5e71546fee 100644 > --- a/meta/classes-recipe/rust-target-config.bbclass > +++ b/meta/classes-recipe/rust-target-config.bbclass > @@ -114,7 +114,7 @@ def llvm_features_from_target_fpu(d): > # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float > # ABI. There is no option for hard. > > -fpu = d.getVar('TARGET_FPU', True) > +fpu = d.getVar('TARGET_FPU') > return ["+soft-float"] if fpu == "soft" else [] > > def llvm_features(d): > diff --git a/meta/classes/report-error.bbclass > b/meta/classes/report-error.bbclass > index 7f2e994d35..1836af7ec6 100644 > --- a/meta/classes/report-error.bbclass > +++ b/meta/classes/report-error.bbclass > @@ -51,8 +51,8 @@ def errorreport_get_user_info(e): > Read user info from variables or from git config > """ > import subprocess > -username = e.data.getVar('ERR_REPORT_USERNAME', True) > -email = e.data.getVar('ERR_REPORT_EMAIL', True) > +username = e.data.getVar('ERR_REPORT_USERNAME') > +email = e.data.getVar('ERR_REPORT_EMAIL') > if not username or not email: > # try to read them from git config > username = str(subprocess.check_output(['git', 'config', '--get', > 'user.name']).decode("utf-8")).strip() > @@ -94,8 +94,8 @@ def errorreport_senddata(e, json_file): > import os, json > > if os.path.isfile(json_file): > -server = e.data.getVar('ERR_REPORT_SERVER', True) > -port = e.data.getVar('ERR_REPORT_PORT', True) > +server = e.data.getVar('ERR_REPORT_SERVER') > +port = e.data.getVar('ERR_REPORT_PORT') > bb.note("Uploading the report %s to %s:%s" % (json_file, server, > port)) > > with open(json_file) as f: > diff --git a/meta/lib/oe/package_manager/deb/__init__.py > b/meta/lib/oe/package_manager/deb/__init__.py > index c672454072..0c23c884c1 100644 > --- a/meta/lib/oe/package_manager/deb/__init__.py > +++
Re: [OE-core] [PATCH] perf: Fix 6.1 kernel reproducibility issue
On Fri, Feb 3, 2023 at 10:47 AM Richard Purdie wrote: > > The pmu-events.c file is generated by a python script making os.scandir() > calls. The return value is "order on disk" which can cary between machines. > > Add in a sed to fix the perf source to sort this data which makes > the pmu-events.c file deterministic. Looks good to me. The perf recipe is the great collector of sed manipulations :) > > We should try and upstream this change but we'll need to sed for varying > kernel versions. We should also try and get the perf source being added > to the perf-devsrc package so when failures like this occur, diffoscope > is much more helpful! I can do this, if you haven't started on it. I can't say that i know exactly why it isn't already there, but it can't be that hard to figure out :) Bruce > > Signed-off-by: Richard Purdie > --- > meta/recipes-kernel/perf/perf.bb | 4 > 1 file changed, 4 insertions(+) > > diff --git a/meta/recipes-kernel/perf/perf.bb > b/meta/recipes-kernel/perf/perf.bb > index c1b0bd22d82..1dff39a17e4 100644 > --- a/meta/recipes-kernel/perf/perf.bb > +++ b/meta/recipes-kernel/perf/perf.bb > @@ -276,6 +276,10 @@ do_configure:prepend () { > sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \ > "${S}/tools/perf/pmu-events/Build" > fi > +if [ -e "${S}/tools/perf/pmu-events/jevents.py" ]; then > +sed -i -e "s#os.scandir(path)#sorted(os.scandir(path), key=lambda e: > e.name)#g" \ > + "${S}/tools/perf/pmu-events/jevents.py" > +fi > # end reproducibility substitutions > > # We need to ensure the --sysroot option in CC is preserved > -- > 2.37.2 > -- - 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 (#176725): https://lists.openembedded.org/g/openembedded-core/message/176725 Mute This Topic: https://lists.openembedded.org/mt/96725319/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] [1/2][dunfell] linux-yocto/5.4: update to v5.4.229
On Fri, Feb 3, 2023 at 10:01 AM Steve Sakoman wrote: > > On Fri, Feb 3, 2023 at 4:57 AM Bruce Ashfield > wrote: > > > > On Fri, Feb 3, 2023 at 9:43 AM Steve Sakoman wrote: > > > > > > Hi Bruce, > > > > > > Sadly this version bump breaks lttng-modules in dunfell: > > > > > > In file included from > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/define_trace.h:87, > > > from > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:183, > > > from > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:29: > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:130:6: > > > error: conflicting types for 'trace_jbd2_run_stats' > > > 130 | void trace_##_name(_proto); > > > | ^~ > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:42:2: > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' > > >42 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, > > > PARAMS(proto), PARAMS(args)) > > > | ^~~ > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:84:2: > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' > > >84 | LTTNG_TRACEPOINT_EVENT_MAP(name, name,\ > > > | ^~ > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:107:1: > > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT' > > > 107 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, > > > | ^~ > > > In file included from > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:9, > > > from > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:18: > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:243:21: > > > note: previous definition of 'trace_jbd2_run_stats' was here > > > 243 | static inline void trace_##name(proto)\ > > > | ^~ > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:406:2: > > > note: in expansion of macro '__DECLARE_TRACE' > > > 406 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ > > > | ^~~ > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:542:2: > > > note: in expansion of macro 'DECLARE_TRACE' > > > 542 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) > > > | ^ > > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:234:1: > > > note: in expansion of macro 'TRACE_EVENT' > > > 234 | TRACE_EVENT(jbd2_run_stats, > > > | ^~~ > > > CC [M] > > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-ext4.o > > > > > > I tried doing version bumps for lttng-modules from 2.11.6 -> 2.11.9 > > > but the issue persists. > > > > > > Thoughts? > > > > I've never had much luck manually doing lttng fixes. You quickly get > > lost in the macros and prototypes. > > > > We could report the issue to lttng and see if they are willing to do a > > fix, but otherwise, we can wait a bit and see if they update .. since > > these are recent releases of 5.4, and lttng likely just hasn't seen > > the problem yet. > > > > So for now, I'll suggest just waiting and I can monitor to see if > > anything has already been reported or if I see a fix upstream. > > Sounds like a plan, I'll put these two version bumps on the shelf for a bit. > > I will however keep my lttng-modules version bumps so that we are at > the most recent 2.11 stable branch release. I see this on lttng-master: Author: Michael Jeanson Date: Wed Jan 18 16:32:04 2023 -0500 fix: jbd2: use the correct print format (v5.4.229) See upstream commit : commit ecb9d0d2e123874bcdd2efdecda0f4e0c3dc566d Author: Bixuan Cui Date: Tue Oct 11 19:33:44 2022 +0800 jbd2: use the correct print format [ Upstream commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 ] The print format error was found when using ftrace event: <...>-1406 [000] 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -1866217368 <...>-1406 [000] 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 0 Use the correct print format for transaction, head and tid. Change-Id:
Re: [OE-core][dunfell 07/16] QEMU: CVE-2022-4144 QXL: qxl_phys2virt unsafe address translation can lead to out-of-bounds read
On Mon, Jan 30, 2023 at 9:39 PM Martin Jansa wrote: > > On Tue, Jan 31, 2023 at 8:18 AM Martin Jansa via lists.openembedded.org > wrote: >> >> I haven't checked yet in dunfell, but in kirkstone this commit merged last >> week breaks nativesdk-qemu builds. > > > I can confirm it fails the same with this commit from Hitendra in dunfell: > > nativesdk-qemu/4.2.0-r0/qemu-4.2.0/hw/display/qxl.c:1508:67: error: 'size' > undeclared (first use in this function); did you mean 'gsize'? > | 1508 | if (!qxl_get_check_slot_offset(qxl, pqxl, , , > size)) { > | | > ^~~~ > | | > gsize > > as well as the same backport from Bhabu in kirkstone (already merged): > https://git.openembedded.org/openembedded-core/commit/?h=kirkstone=4cb3874abf4fdeb04337a48a14c765ba9b2269d4 > > To reproduce this just enable "spice" PACKAGECONFIG in nativesdk-qemu. > > Hitendra, Bhabu: please have a look. Yes, please do! Unless I get a fix for the spice regression sometime soon I will revert the patch in kirkstone and of course won't take the dunfell version. Steve >> This chunk: >> +@@ -1486,7 +1505,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL >> pqxl, int group_id) >> + offset = le64_to_cpu(pqxl) & 0x; >> + return (void *)(intptr_t)offset; >> + case MEMSLOT_GROUP_GUEST: >> +-if (!qxl_get_check_slot_offset(qxl, pqxl, , )) { >> ++if (!qxl_get_check_slot_offset(qxl, pqxl, , , size)) { >> + return NULL; >> + } >> + ptr = memory_region_get_ram_ptr(qxl->guest_slots[slot].mr); >> >> Uses size parameter which was added in previous commit (which wasn't >> backported): >> https://gitlab.com/qemu-project/qemu/-/commit/8efec0ef8bbc1e75a7ebf6e325a35806ece9b39f >> >> So either both commits need to be backported or this one reworked not to use >> undeclared size as it leads to: >> >> | ../qemu-6.2.0/hw/display/qxl.c: In function 'qxl_phys2virt': >> | ../qemu-6.2.0/hw/display/qxl.c:1477:67: error: 'size' undeclared (first >> use in this function); did you mean 'gsize'? >> | 1477 | if (!qxl_get_check_slot_offset(qxl, pqxl, , , >> size)) { >> | | >> ^~~~ >> | | >> gsize >> >> I'm surprised this wasn't caught on autobuilder already, maybe it's >> triggered only with extra PACKAGECONFIG options we have enabled: >> PACKAGECONFIG:append:class-nativesdk = " virglrenderer epoxy spice libusb >> usb-redir" >> >> Regards, >> >> >> On Wed, Jan 25, 2023 at 3:42 PM Steve Sakoman wrote: >>> >>> From: Hitendra Prajapati >>> >>> Upstream-Status: Backport from >>> https://gitlab.com/qemu-project/qemu/-/commit/6dbbf055148c6f1b7d8a3251a65bd6f3d1e1f622 >>> >>> Signed-off-by: Hitendra Prajapati >>> Signed-off-by: Steve Sakoman >>> --- >>> meta/recipes-devtools/qemu/qemu.inc | 1 + >>> .../qemu/qemu/CVE-2022-4144.patch | 103 ++ >>> 2 files changed, 104 insertions(+) >>> create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch >>> >>> diff --git a/meta/recipes-devtools/qemu/qemu.inc >>> b/meta/recipes-devtools/qemu/qemu.inc >>> index fff2c87780..898fa1a8d8 100644 >>> --- a/meta/recipes-devtools/qemu/qemu.inc >>> +++ b/meta/recipes-devtools/qemu/qemu.inc >>> @@ -115,6 +115,7 @@ SRC_URI = >>> "https://download.qemu.org/${BPN}-${PV}.tar.xz \ >>>file://CVE-2021-3638.patch \ >>>file://CVE-2021-20196.patch \ >>>file://CVE-2021-3507.patch \ >>> + file://CVE-2022-4144.patch \ >>> " >>> UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" >>> >>> diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch >>> b/meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch >>> new file mode 100644 >>> index 00..3f0d5fbd5c >>> --- /dev/null >>> +++ b/meta/recipes-devtools/qemu/qemu/CVE-2022-4144.patch >>> @@ -0,0 +1,103 @@ >>> +From 6dbbf055148c6f1b7d8a3251a65bd6f3d1e1f622 Mon Sep 17 00:00:00 2001 >>> +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= >>> +Date: Mon, 28 Nov 2022 21:27:40 +0100 >>> +Subject: [PATCH] hw/display/qxl: Avoid buffer overrun in qxl_phys2virt >>> + (CVE-2022-4144) >>> +MIME-Version: 1.0 >>> +Content-Type: text/plain; charset=UTF-8 >>> +Content-Transfer-Encoding: 8bit >>> + >>> +Have qxl_get_check_slot_offset() return false if the requested >>> +buffer size does not fit within the slot memory region. >>> + >>> +Similarly qxl_phys2virt() now returns NULL in such case, and >>> +qxl_dirty_one_surface() aborts. >>> + >>> +This avoids buffer overrun in the host pointer returned by >>> +memory_region_get_ram_ptr(). >>> + >>> +Fixes: CVE-2022-4144 (out-of-bounds read) >>> +Reported-by: Wenxu Yin (@awxylitol) >>> +Resolves:
[OE-core] [PATCH] perf: Fix 6.1 kernel reproducibility issue
The pmu-events.c file is generated by a python script making os.scandir() calls. The return value is "order on disk" which can cary between machines. Add in a sed to fix the perf source to sort this data which makes the pmu-events.c file deterministic. We should try and upstream this change but we'll need to sed for varying kernel versions. We should also try and get the perf source being added to the perf-devsrc package so when failures like this occur, diffoscope is much more helpful! Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index c1b0bd22d82..1dff39a17e4 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -276,6 +276,10 @@ do_configure:prepend () { sed -i -e "s,$target,$replacement1$replacement2$replacement3,g" \ "${S}/tools/perf/pmu-events/Build" fi +if [ -e "${S}/tools/perf/pmu-events/jevents.py" ]; then +sed -i -e "s#os.scandir(path)#sorted(os.scandir(path), key=lambda e: e.name)#g" \ + "${S}/tools/perf/pmu-events/jevents.py" +fi # end reproducibility substitutions # We need to ensure the --sysroot option in CC is preserved -- 2.37.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176722): https://lists.openembedded.org/g/openembedded-core/message/176722 Mute This Topic: https://lists.openembedded.org/mt/96725319/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] [1/2][dunfell] linux-yocto/5.4: update to v5.4.229
On Fri, Feb 3, 2023 at 4:57 AM Bruce Ashfield wrote: > > On Fri, Feb 3, 2023 at 9:43 AM Steve Sakoman wrote: > > > > Hi Bruce, > > > > Sadly this version bump breaks lttng-modules in dunfell: > > > > In file included from > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/define_trace.h:87, > > from > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:183, > > from > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:29: > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:130:6: > > error: conflicting types for 'trace_jbd2_run_stats' > > 130 | void trace_##_name(_proto); > > | ^~ > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:42:2: > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' > >42 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, > > PARAMS(proto), PARAMS(args)) > > | ^~~ > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:84:2: > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' > >84 | LTTNG_TRACEPOINT_EVENT_MAP(name, name,\ > > | ^~ > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:107:1: > > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT' > > 107 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, > > | ^~ > > In file included from > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:9, > > from > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:18: > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:243:21: > > note: previous definition of 'trace_jbd2_run_stats' was here > > 243 | static inline void trace_##name(proto)\ > > | ^~ > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:406:2: > > note: in expansion of macro '__DECLARE_TRACE' > > 406 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ > > | ^~~ > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:542:2: > > note: in expansion of macro 'DECLARE_TRACE' > > 542 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) > > | ^ > > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:234:1: > > note: in expansion of macro 'TRACE_EVENT' > > 234 | TRACE_EVENT(jbd2_run_stats, > > | ^~~ > > CC [M] > > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-ext4.o > > > > I tried doing version bumps for lttng-modules from 2.11.6 -> 2.11.9 > > but the issue persists. > > > > Thoughts? > > I've never had much luck manually doing lttng fixes. You quickly get > lost in the macros and prototypes. > > We could report the issue to lttng and see if they are willing to do a > fix, but otherwise, we can wait a bit and see if they update .. since > these are recent releases of 5.4, and lttng likely just hasn't seen > the problem yet. > > So for now, I'll suggest just waiting and I can monitor to see if > anything has already been reported or if I see a fix upstream. Sounds like a plan, I'll put these two version bumps on the shelf for a bit. I will however keep my lttng-modules version bumps so that we are at the most recent 2.11 stable branch release. Steve > > On Wed, Feb 1, 2023 at 6:40 AM wrote: > > > > > > From: Bruce Ashfield > > > > > > Updating to the latest korg -stable release that comprises > > > the following commits: > > > > > > 1349fe3a332a Linux 5.4.229 > > > 68a37dc77e2f tipc: call tipc_lxc_xmit without holding node_read_lock > > > 1140c3f7adbc ocfs2: fix freeing uninitialized resource on > > > ocfs2_dlm_shutdown > > > 2db88851fa4d tipc: Add a missing case of TIPC_DIRECT_MSG type > > > 38b5d7054d75 tty: serial: tegra: Handle RX transfer in PIO mode if > > > DMA wasn't started > > > 3188f80b80d6 tipc: fix use-after-free in tipc_disc_rcv() > > > 3eeb06132d36 Revert "usb: ulpi: defer ulpi_register on ulpi_read_id > > > timeout" > > > ecd47ffc99d3 mm: Always release pages to the buddy allocator in > > > memblock_free_late(). > > > 5fcf75a8a4c3 efi: fix NULL-deref in init error path > > > b30e5dd0778e arm64: cmpxchg_double*: hazard against entire exchange > > > variable > > > ecdd65051b17 arm64:
Re: [OE-core] [1/2][dunfell] linux-yocto/5.4: update to v5.4.229
On Fri, Feb 3, 2023 at 9:43 AM Steve Sakoman wrote: > > Hi Bruce, > > Sadly this version bump breaks lttng-modules in dunfell: > > In file included from > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/define_trace.h:87, > from > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:183, > from > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:29: > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:130:6: > error: conflicting types for 'trace_jbd2_run_stats' > 130 | void trace_##_name(_proto); > | ^~ > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:42:2: > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' >42 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, > PARAMS(proto), PARAMS(args)) > | ^~~ > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:84:2: > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' >84 | LTTNG_TRACEPOINT_EVENT_MAP(name, name,\ > | ^~ > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:107:1: > note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT' > 107 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, > | ^~ > In file included from > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:9, > from > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:18: > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:243:21: > note: previous definition of 'trace_jbd2_run_stats' was here > 243 | static inline void trace_##name(proto)\ > | ^~ > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:406:2: > note: in expansion of macro '__DECLARE_TRACE' > 406 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ > | ^~~ > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:542:2: > note: in expansion of macro 'DECLARE_TRACE' > 542 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) > | ^ > TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:234:1: > note: in expansion of macro 'TRACE_EVENT' > 234 | TRACE_EVENT(jbd2_run_stats, > | ^~~ > CC [M] > TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-ext4.o > > I tried doing version bumps for lttng-modules from 2.11.6 -> 2.11.9 > but the issue persists. > > Thoughts? I've never had much luck manually doing lttng fixes. You quickly get lost in the macros and prototypes. We could report the issue to lttng and see if they are willing to do a fix, but otherwise, we can wait a bit and see if they update .. since these are recent releases of 5.4, and lttng likely just hasn't seen the problem yet. So for now, I'll suggest just waiting and I can monitor to see if anything has already been reported or if I see a fix upstream. Bruce > > Steve > > On Wed, Feb 1, 2023 at 6:40 AM wrote: > > > > From: Bruce Ashfield > > > > Updating to the latest korg -stable release that comprises > > the following commits: > > > > 1349fe3a332a Linux 5.4.229 > > 68a37dc77e2f tipc: call tipc_lxc_xmit without holding node_read_lock > > 1140c3f7adbc ocfs2: fix freeing uninitialized resource on > > ocfs2_dlm_shutdown > > 2db88851fa4d tipc: Add a missing case of TIPC_DIRECT_MSG type > > 38b5d7054d75 tty: serial: tegra: Handle RX transfer in PIO mode if DMA > > wasn't started > > 3188f80b80d6 tipc: fix use-after-free in tipc_disc_rcv() > > 3eeb06132d36 Revert "usb: ulpi: defer ulpi_register on ulpi_read_id > > timeout" > > ecd47ffc99d3 mm: Always release pages to the buddy allocator in > > memblock_free_late(). > > 5fcf75a8a4c3 efi: fix NULL-deref in init error path > > b30e5dd0778e arm64: cmpxchg_double*: hazard against entire exchange > > variable > > ecdd65051b17 arm64: atomics: remove LL/SC trampolines > > f84928af arm64: atomics: format whitespace consistently > > d01d6d2b06c0 drm/virtio: Fix GEM handle creation UAF > > 3030f11f27e7 x86/resctrl: Fix task CLOSID/RMID update race > > 22c4eeafc31b x86/resctrl: Use task_curr() instead of > > task_struct->on_cpu to prevent unnecessary IPI > > b3f924246700 iommu/mediatek-v1: Fix an error handling path in
Re: [OE-core] [1/2][dunfell] linux-yocto/5.4: update to v5.4.229
Hi Bruce, Sadly this version bump breaks lttng-modules in dunfell: In file included from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/define_trace.h:87, from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:183, from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:29: TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:130:6: error: conflicting types for 'trace_jbd2_run_stats' 130 | void trace_##_name(_proto); | ^~ TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:42:2: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' 42 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) | ^~~ TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../probes/lttng-tracepoint-event-impl.h:84:2: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' 84 | LTTNG_TRACEPOINT_EVENT_MAP(name, name,\ | ^~ TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/../instrumentation/events/lttng-module/jbd2.h:107:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT' 107 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, | ^~ In file included from TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:9, from TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-jbd2.c:18: TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:243:21: note: previous definition of 'trace_jbd2_run_stats' was here 243 | static inline void trace_##name(proto)\ | ^~ TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:406:2: note: in expansion of macro '__DECLARE_TRACE' 406 | __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \ | ^~~ TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/linux/tracepoint.h:542:2: note: in expansion of macro 'DECLARE_TRACE' 542 | DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) | ^ TOPDIR/tmp/work-shared/qemuarm/kernel-source/include/trace/events/jbd2.h:234:1: note: in expansion of macro 'TRACE_EVENT' 234 | TRACE_EVENT(jbd2_run_stats, | ^~~ CC [M] TOPDIR/tmp/work/qemuarm-poky-linux-gnueabi/lttng-modules/2.11.6-r0/lttng-modules-2.11.6/probes/lttng-probe-ext4.o I tried doing version bumps for lttng-modules from 2.11.6 -> 2.11.9 but the issue persists. Thoughts? Steve On Wed, Feb 1, 2023 at 6:40 AM wrote: > > From: Bruce Ashfield > > Updating to the latest korg -stable release that comprises > the following commits: > > 1349fe3a332a Linux 5.4.229 > 68a37dc77e2f tipc: call tipc_lxc_xmit without holding node_read_lock > 1140c3f7adbc ocfs2: fix freeing uninitialized resource on > ocfs2_dlm_shutdown > 2db88851fa4d tipc: Add a missing case of TIPC_DIRECT_MSG type > 38b5d7054d75 tty: serial: tegra: Handle RX transfer in PIO mode if DMA > wasn't started > 3188f80b80d6 tipc: fix use-after-free in tipc_disc_rcv() > 3eeb06132d36 Revert "usb: ulpi: defer ulpi_register on ulpi_read_id > timeout" > ecd47ffc99d3 mm: Always release pages to the buddy allocator in > memblock_free_late(). > 5fcf75a8a4c3 efi: fix NULL-deref in init error path > b30e5dd0778e arm64: cmpxchg_double*: hazard against entire exchange > variable > ecdd65051b17 arm64: atomics: remove LL/SC trampolines > f84928af arm64: atomics: format whitespace consistently > d01d6d2b06c0 drm/virtio: Fix GEM handle creation UAF > 3030f11f27e7 x86/resctrl: Fix task CLOSID/RMID update race > 22c4eeafc31b x86/resctrl: Use task_curr() instead of task_struct->on_cpu > to prevent unnecessary IPI > b3f924246700 iommu/mediatek-v1: Fix an error handling path in > mtk_iommu_v1_probe() > ecfe33e0757d iommu/mediatek-v1: Add error handle for mtk_iommu_probe > ec049ae2b462 net/mlx5: Fix ptp max frequency adjustment range > 62d707dabb5c net/mlx5: Rename ptp clock info > 2b157c3c5d6b net/sched: act_mpls: Fix warning during failed attribute > validation > 9424d2205fe9 nfc: pn533: Wait for out_urb's completion in > pn533_usb_send_frame() > 576eadef2c8d hvc/xen: lock console list traversal > 7d04fe153dfc tipc: fix unexpected link reset due to discovery messages > 95b2d4889fbd tipc: eliminate checking netns if node established > d6418829cef1 tipc: improve throughput between nodes in netns > d443308edbfb
Re: [OE-core] [PATCH] python3-pytest: Remove dependency on python3-toml
On Thu, 2023-02-02 at 13:52 +0100, Arnout Vandecappelle wrote: > > On 02/02/2023 13:49, Arnout Vandecappelle via lists.openembedded.org wrote: > > Since version 7.2.0 [1], pytest uses the "batteries included" tomllib > > module for parsing pyproject.toml configuration files [2]. It is > > therefore no longer necessary to have python3-toml in RDEPENDS. > > > > [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-2-0-2022-10-23 > > [2] https://github.com/pytest-dev/pytest/pull/9741 > > > > Signed-off-by: Arnout Vandecappelle > > --- > > This patch only applies to kirkstone and langdale branches. On master, > > Python 3.11 is used which no longer needs tomli at all. On dunfell, > > pytest is still on 5.3.5. > > Meh, I copy-pasted the commit message from the kirkstone/langdale patch and > forgot to remove this bit. I assume I don't need to resend for that? Correct, that won't make it into the applied commit. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176718): https://lists.openembedded.org/g/openembedded-core/message/176718 Mute This Topic: https://lists.openembedded.org/mt/96698820/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/2] barebox: add initial support
On Fri, 2023-02-03 at 14:50 +0100, Marco Felsch wrote: > This adds the support for the barebox bootloader to oe-core. The recipe > is based on the recipe found in meta-ptx [1] with a few minor adaptions. > > This basic support includes the bootloader and the target tools to > interact with the bootloader. The host tools support is not part of > this commit. This will be added later on as separate recipe. > > [1] https://github.com/pengutronix/meta-ptx/tree/master/recipes-bsp/barebox > > Signed-off-by: Marco Felsch > --- > meta/conf/documentation.conf | 7 + > meta/recipes-bsp/barebox/barebox.inc | 123 ++ > meta/recipes-bsp/barebox/barebox_2023.01.0.bb | 5 + > ...IMAGE_COMPRESSION-per-default-to-lz4.patch | 40 ++ > 4 files changed, 175 insertions(+) > create mode 100644 meta/recipes-bsp/barebox/barebox.inc > create mode 100644 meta/recipes-bsp/barebox/barebox_2023.01.0.bb > create mode 100644 > meta/recipes-bsp/barebox/files/0001-pbl-set-IMAGE_COMPRESSION-per-default-to-lz4.patch In order to add something to OE-Core, we need to see it being used by a reasonable portion of the ecosystem. Is there enough usage of barebox on common boards that justifies this? I noticed there is no maintainers entry being added so this will throw QA errors on the autobuilder. Also, I'm not sure adding doc varflags for individual recipe variables to documentation.conf makes sense. We should probably have them in the recipe or just put entries into the manual? Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176717): https://lists.openembedded.org/g/openembedded-core/message/176717 Mute This Topic: https://lists.openembedded.org/mt/96722579/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 1/2] barebox: add initial support
This adds the support for the barebox bootloader to oe-core. The recipe is based on the recipe found in meta-ptx [1] with a few minor adaptions. This basic support includes the bootloader and the target tools to interact with the bootloader. The host tools support is not part of this commit. This will be added later on as separate recipe. [1] https://github.com/pengutronix/meta-ptx/tree/master/recipes-bsp/barebox Signed-off-by: Marco Felsch --- meta/conf/documentation.conf | 7 + meta/recipes-bsp/barebox/barebox.inc | 123 ++ meta/recipes-bsp/barebox/barebox_2023.01.0.bb | 5 + ...IMAGE_COMPRESSION-per-default-to-lz4.patch | 40 ++ 4 files changed, 175 insertions(+) create mode 100644 meta/recipes-bsp/barebox/barebox.inc create mode 100644 meta/recipes-bsp/barebox/barebox_2023.01.0.bb create mode 100644 meta/recipes-bsp/barebox/files/0001-pbl-set-IMAGE_COMPRESSION-per-default-to-lz4.patch diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index a27d7a53c3..99e8f8e730 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -77,6 +77,13 @@ AUTOREV[doc] = "When SRCREV is set to the value of this variable, it specifies t B[doc] = "The Build Directory. The OpenEmbedded build system places generated objects into the Build Directory during a recipe's build process." BAD_RECOMMENDATIONS[doc] = "A list of packages not to install despite being recommended by a recipe. Support for this variable exists only when using the IPK or RPM packaging backends." +BAREBOX_BUILDSYSTEM_VERSION[doc] = "Build system version to add to the barebox image. By default this is the git description of the containing layer." +BAREBOX_CONFIG[doc] = "The barebox kconfig defconfig file. Not used if a file called defconfig is added to the SRC_URI." +BAREBOX_ENV_DIR[doc] = "Overlay the barebox built-in environment with the environment provided by the BSP if specified." +BAREBOX_BINARY[doc] = "Specify the barebox binary to install. If not specified all barebox artifacts are installed." +BAREBOX_IMAGE[doc] = "A unique barebox image name. Unused if ${BAREBOX_BINARY} is not set." +BAREBOX_SUFFIX[doc] = "Specify the suffix for ${BAREBOX_IMAGE}." +BAREBOX_FIRMWARE_DIR[doc] = "Overwrite barebox' firmware blobs search directory (CONFIG_EXTRA_FIRMWARE_DIR) with this path, default ${B}/firmware" BB_DANGLINGAPPENDS_WARNONLY[doc] = "Defines how BitBake handles situations where an append file (.bbappend) has no corresponding recipe file (.bb)." BB_DISKMON_DIRS[doc] = "Monitors disk space and available inodes during the build and allows you to control the build based on these parameters." BB_DISKMON_WARNINTERVAL[doc] = "Defines the disk space and free inode warning intervals. To set these intervals, define the variable in the conf/local.conf file in the Build Directory." diff --git a/meta/recipes-bsp/barebox/barebox.inc b/meta/recipes-bsp/barebox/barebox.inc new file mode 100644 index 00..896db9739f --- /dev/null +++ b/meta/recipes-bsp/barebox/barebox.inc @@ -0,0 +1,123 @@ +SUMMARY = "barebox is a bootloader designed for embedded systems. It runs on a variety of architectures including x86, ARM, MIPS, PowerPC and others." +HOMEPAGE = "https://barebox.org/; +SECTION = "bootloaders" +PROVIDES = "virtual/bootloader" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit kernel-arch deploy cml1 pkgconfig + +# libusb1 is only required for usb tools like imx-usb-loader. These tools may +# be enabled within the defconfig file so depend on it here to be more user +# friendly (do not abort the build). The actual tools are provided by the +# barebox-tools package. +DEPENDS = "libusb1 bison-native flex-native" + +export KBUILD_BUILD_USER ?= "oe-user" +export KBUILD_BUILD_HOST ?= "oe-host" + +SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2; + +S = "${WORKDIR}/barebox-${PV}" +B = "${WORKDIR}/build" + +def get_layer_rev(path): +try: +rev, _ = bb.process.run("git describe --match='' --always --dirty --broken", cwd=path) +except bb.process.ExecutionError: +rev = "" +return rev.strip() + +BAREBOX_BUILDSYSTEM_VERSION ??= "${@get_layer_rev(os.path.dirname(d.getVar('FILE')))}" + +BAREBOX_FIRMWARE_DIR ??= "${B}/firmware" + +EXTRA_OEMAKE = " \ +CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \ +BUILDSYSTEM_VERSION=${BAREBOX_BUILDSYSTEM_VERSION} \ +CONFIG_EXTRA_FIRMWARE_DIR=${BAREBOX_FIRMWARE_DIR} \ +" + +BAREBOX_CONFIG ?= "" + +do_configure() { +if [ -e ${WORKDIR}/defconfig ]; then +cp ${WORKDIR}/defconfig ${B}/.config +else +if [ -n "${BAREBOX_CONFIG}" ]; then +oe_runmake ${BAREBOX_CONFIG} +else +bbfatal "No defconfig given. Either add file 'file://defconfig' to SRC_URI or set
[OE-core] [PATCH 2/2] barebox-tools: add initial barebox tools support
Add initial support to build the barebox tools for the host and the target. Signed-off-by: Marco Felsch --- .../barebox/barebox-tools_2023.01.0.bb| 56 +++ 1 file changed, 56 insertions(+) create mode 100644 meta/recipes-bsp/barebox/barebox-tools_2023.01.0.bb diff --git a/meta/recipes-bsp/barebox/barebox-tools_2023.01.0.bb b/meta/recipes-bsp/barebox/barebox-tools_2023.01.0.bb new file mode 100644 index 00..b1f7aa0b91 --- /dev/null +++ b/meta/recipes-bsp/barebox/barebox-tools_2023.01.0.bb @@ -0,0 +1,56 @@ +SUMMARY = "barebox bootloader tools" +HOMEPAGE = "https://barebox.org/; + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=f5125d13e000b9ca1f0d3364286c4192" + +DEPENDS = "libusb1 bison-native flex-native" + +SRC_URI = "https://barebox.org/download/barebox-${PV}.tar.bz2; +SRC_URI[sha256sum] = "20532daff1720fbefa0e02dba0294e6817d29c155f49b9b549db9577435fc7b6" + +S = "${WORKDIR}/barebox-${PV}" +B = "${WORKDIR}/build" + +inherit pkgconfig + +EXTRA_OEMAKE = " \ + ARCH=sandbox \ + CROSS_COMPILE=${TARGET_PREFIX} -C ${S} O=${B} \ + CROSS_PKG_CONFIG=pkg-config \ + " + +do_compile:class-target () { +export userccflags="${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" +export userldflags="${TARGET_LDFLAGS}${TOOLCHAIN_OPTIONS}" +oe_runmake targettools_defconfig +oe_runmake scripts +} + +do_compile:class-native () { +oe_runmake hosttools_defconfig +oe_runmake scripts +} + +BAREBOX_TOOLS = " \ + bareboxenv \ + bareboxcrc32 \ + kernel-install \ + bareboximd \ + omap3-usb-loader \ + omap4_usbboot \ + imx/imx-usb-loader \ + " + +BAREBOX_TOOLS_SUFFIX = "" +BAREBOX_TOOLS_SUFFIX:class-target = "-target" + +do_install () { + install -d ${D}${bindir} + + for tool in ${BAREBOX_TOOLS}; do + install -m 0755 scripts/${tool}${BAREBOX_TOOLS_SUFFIX} ${D}${bindir}/${tool##*/} + done +} + +BBCLASSEXTEND = "native nativesdk" -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176715): https://lists.openembedded.org/g/openembedded-core/message/176715 Mute This Topic: https://lists.openembedded.org/mt/96722578/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] [meta-oe][PATCH V1] tar: add ptest
On Fri, 3 Feb 2023 at 04:08, Yan Xin Kuan wrote: > @@ -100,6 +100,7 @@ PTESTS_SLOW = "\ > python3-cryptography-ptest \ > python3-ptest \ > strace-ptest \ > +tar-ptest \ > tcl-ptest \ > util-linux-ptest \ > valgrind-ptest \ PTESTS_SLOW is for tests longer than 30 seconds. How long does the tar test take in your local testing? Is kvm in use? Alex -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176714): https://lists.openembedded.org/g/openembedded-core/message/176714 Mute This Topic: https://lists.openembedded.org/mt/96716263/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] bootchart2: Fix usrmerge support
bootchart2 introduced a variable EARLY_PREFIX for supporting systems with usrmerge [1]. Right now, the recipe here is sidestepping this feature and trying to replicate it by overwriting other variables and even patching the sources. This wasn't enough, however, as there are still problems: For example, some setup code in the bootchart-collector fails because it expects EARLY_PREFIX to be used [2]. Cleanup the recipe to set EARLY_PREFIX and remove the other workarounds. [1]: https://github.com/xrmx/bootchart/commit/56a638ace1d172163b6d636c89892446b8add4b6 [2]: https://github.com/xrmx/bootchart/blob/3d2136d0335718fbe1a8e2370ccbc30123a6e593/collector/collector.c#L670-L672 Fixes: 4157600d3122 ("bootchart2: switch to add patch from change source in do_install") Signed-off-by: Harald Seiler --- .../0001-bootchart2-support-usrmerge.patch| 37 --- .../bootchart2/bootchart2_0.14.9.bb | 11 ++ 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch deleted file mode 100644 index 88597cf3a9..00 --- a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 5 Sep 2019 18:37:31 +0800 -Subject: [PATCH] bootchart2: support usrmerge - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1cc2974..f988904 100644 a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ endif - PY_SITEDIR ?= $(PY_LIBDIR)/site-packages - LIBC_A_PATH = /usr$(LIBDIR) - # Always lib, even on systems that otherwise use lib64 --SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system -+SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system - COLLECTOR = \ - collector/collector.o \ - collector/output.o \ -@@ -99,7 +99,7 @@ install-chroot: - install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs - - install-collector: all install-chroot -- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) -+ install -m 755 -D bootchartd $(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) - install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf - install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector - --- -2.7.4 - diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index b4d5b7cd9b..297dbfb578 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -93,7 +93,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \ file://bootchartd_stop.sh \ file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ - file://0001-bootchart2-support-usrmerge.patch \ file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ file://0001-Do-not-include-linux-fs.h.patch \ " @@ -120,12 +119,11 @@ UPDATERCPN = "bootchartd-stop-initscript" INITSCRIPT_NAME = "bootchartd_stop.sh" INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." -EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"' - do_compile:prepend () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" -export LIBDIR="${base_libdir}" +export LIBDIR="/${baselib}" +export EARLY_PREFIX="${root_prefix}" } do_install () { @@ -133,9 +131,8 @@ do_install () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" export DESTDIR="${D}" -export LIBDIR="${base_libdir}" -export PKGLIBDIR="${base_libdir}/bootchart" -export SYSTEMD_UNIT_DIR="${systemd_system_unitdir}" +export LIBDIR="/${baselib}" +export EARLY_PREFIX="${root_prefix}" oe_runmake install NO_PYTHON_COMPILE=1 install -d ${D}${sysconfdir}/init.d -- 2.39.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176713): https://lists.openembedded.org/g/openembedded-core/message/176713 Mute This Topic: https://lists.openembedded.org/mt/96719958/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-