Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Friday, August 23
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/7256
The following changes since commit bbb8db8fec7fbee56fcdbc665a758b911d73a767:
u-boot.inc: Refactor do_* steps into functions that can be overridden (2024-08-15 06:02:17 -0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Alexis Lothoré (1):
oeqa/utils/postactions: transfer whole archive over ssh instead of
doing individual copies
Ashish Sharma (1):
ruby: Backport fix for CVE-2024-27282
Daniel Semkowicz (1):
os-release: Fix VERSION_CODENAME in case it is empty
Gauthier HADERER (1):
populate_sdk_ext.bclass: make sure OECORE_NATIVE_SYSROOT is exported.
Jon Mason (2):
oeqa/runtime/ssh: add retry logic and sleeps to allow for slower
systems
oeqa/runtime/ssh: check for all errors at the end
Jose Quaresma (1):
go: upgrade 1.22.5 -> 1.22.6
Kai Kang (1):
glibc: fix fortran header file conflict for arm
Martin Jansa (1):
libgfortran.inc: fix nativesdk-libgfortran dependencies
Mingli Yu (1):
llvm: Enable libllvm for native build
Richard Purdie (2):
oeqa/runtime/ssh: In case of failure, show exit code and handle -15
(SIGTERM)
oeqa/selftest/reproducibile: Explicitly list virtual targets
Ross Burton (2):
gstreamer1.0: disable flaky baseparser tests
librsvg: don't try to run target code at build time
Siddharth Doshi (1):
Tiff: Security fix for CVE-2024-7006
Trevor Gamblin (1):
maintainers.inc: add self for unassigned python recipes
Ulrich Ölmann (1):
initramfs-framework: fix typos
Weisser, Pascal.ext (1):
qemuboot: Trigger write_qemuboot_conf task on changes of kernel image
realpath
meta/classes-recipe/populate_sdk_ext.bbclass | 2 +-
meta/classes-recipe/qemuboot.bbclass | 3 +-
meta/conf/distro/include/maintainers.inc | 8 +--
meta/lib/oeqa/runtime/cases/ssh.py | 31 ++++++---
meta/lib/oeqa/selftest/cases/reproducible.py | 3 +-
meta/lib/oeqa/utils/postactions.py | 19 +++---
meta/recipes-core/glibc/glibc-package.inc | 8 ++-
.../initrdscripts/initramfs-framework/init | 2 +-
.../initrdscripts/initramfs-framework/rootfs | 2 +-
meta/recipes-core/os-release/os-release.bb | 2 +-
meta/recipes-devtools/gcc/libgfortran.inc | 3 +-
.../go/{go-1.22.5.inc => go-1.22.6.inc} | 2 +-
...e_1.22.5.bb => go-binary-native_1.22.6.bb} | 6 +-
..._1.22.5.bb => go-cross-canadian_1.22.6.bb} | 0
...{go-cross_1.22.5.bb => go-cross_1.22.6.bb} | 0
...osssdk_1.22.5.bb => go-crosssdk_1.22.6.bb} | 0
...runtime_1.22.5.bb => go-runtime_1.22.6.bb} | 0
.../go/{go_1.22.5.bb => go_1.22.6.bb} | 0
meta/recipes-devtools/llvm/llvm_18.1.6.bb | 1 -
.../ruby/ruby/CVE-2024-27282.patch | 28 ++++++++
meta/recipes-devtools/ruby/ruby_3.2.2.bb | 1 +
.../librsvg/disable-rsvg-loader-test.patch | 40 ++++++++++++
meta/recipes-gnome/librsvg/librsvg_2.57.1.bb | 1 +
.../gstreamer/gstreamer1.0/run-ptest | 7 +-
.../libtiff/tiff/CVE-2024-7006.patch | 65 +++++++++++++++++++
meta/recipes-multimedia/libtiff/tiff_4.6.0.bb | 1 +
26 files changed, 198 insertions(+), 37 deletions(-)
rename meta/recipes-devtools/go/{go-1.22.5.inc => go-1.22.6.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.22.5.bb => go-binary-native_1.22.6.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.22.5.bb => go-cross-canadian_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.22.5.bb => go-cross_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.22.5.bb => go-crosssdk_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.22.5.bb => go-runtime_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go_1.22.5.bb => go_1.22.6.bb} (100%)
create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch
create mode 100644 meta/recipes-gnome/librsvg/librsvg/disable-rsvg-loader-test.patch
create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patchSignature · 1 line
2.34.1
PATCH 1/18 ruby: Backport fix for CVE-2024-27282
From: Ashish Sharma <[email protected]>
Upstream-Status: Backport [https://github.com/ruby/ruby/commit/989a2355808a63fc45367785c82ffd46d18c900a]
--- .../ruby/ruby/CVE-2024-27282.patch | 28 +++++++++++++++++++ meta/recipes-devtools/ruby/ruby_3.2.2.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch
meta/recipes-devtools/ruby/ruby/CVE-2024-27282.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 989a2355808a63fc45367785c82ffd46d18c900a Mon Sep 17 00:00:00 2001 +From: Hiroshi SHIBATA <[email protected]> +Date: Fri, 12 Apr 2024 15:01:47 +1000 +Subject: [PATCH] Fix Use-After-Free issue for Regexp + +Co-authored-by: Isaac Peka <[email protected]> + +Upstream-Status: Backport [https://github.com/ruby/ruby/commit/989a2355808a63fc45367785c82ffd46d18c900a] +CVE: CVE-2024-27282 +Signed-off-by: Ashish Sharma <[email protected]> + + regexec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/regexec.c b/regexec.c +index 73694ab14a0b0a..140691ad42489f 100644 +--- a/regexec.c ++++ b/regexec.c +@@ -3449,8 +3449,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, + CASE(OP_MEMORY_END_PUSH_REC) MOP_IN(OP_MEMORY_END_PUSH_REC); + GET_MEMNUM_INC(mem, p); + STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */ +- STACK_PUSH_MEM_END(mem, s); + mem_start_stk[mem] = GET_STACK_INDEX(stkp); ++ STACK_PUSH_MEM_END(mem, s); + MOP_OUT; + JUMP; +
meta/recipes-devtools/ruby/ruby_3.2.2.bb +1 -0
@@ -34,6 +34,7 @@ SRC_URI = "http://cache.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \ file://CVE-2023-36617_1.patch \ file://CVE-2023-36617_2.patch \ file://CVE-2024-27281.patch \ + file://CVE-2024-27282.patch \ " UPSTREAM_CHECK_URI = "https://www.ruby-lang.org/en/downloads/"
Signature · 1 line
2.34.1
PATCH 2/18 Tiff: Security fix for CVE-2024-7006
In reply to Steve SakomanFrom: Siddharth Doshi <[email protected]>
Upstream-Status: Backport from [https://gitlab.com/libtiff/libtiff/-/commit/818fb8ce881cf839fbc710f6690aadb992aa0f9e]
CVE's Fixed:
CVE-2024-7006 libtiff: NULL pointer dereference in tif_dirinfo.c
--- .../libtiff/tiff/CVE-2024-7006.patch | 65 +++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.6.0.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch
meta/recipes-multimedia/libtiff/tiff/CVE-2024-7006.patch new file +65 -0
@@ -0,0 +1,65 @@ +From 8ee0e7d2bdcc1a5a5a3241904b243964ab947b7b Mon Sep 17 00:00:00 2001 +From: Su_Laus <[email protected]> +Date: Fri, 1 Dec 2023 20:12:25 +0100 +Subject: [PATCH] Check return value of _TIFFCreateAnonField(). + +Fixes #624 + +Upstream-Status: Backport [https://gitlab.com/libtiff/libtiff/-/commit/818fb8ce881cf839fbc710f6690aadb992aa0f9e] +CVE: CVE-2024-7006 +Signed-off-by: Siddharth Doshi <[email protected]> +--- + libtiff/tif_dirinfo.c | 2 +- + libtiff/tif_dirread.c | 16 ++++++---------- + 2 files changed, 7 insertions(+), 11 deletions(-) + +diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c +index 0e705e8..4cfdaad 100644 +--- a/libtiff/tif_dirinfo.c ++++ b/libtiff/tif_dirinfo.c +@@ -887,7 +887,7 @@ const TIFFField *_TIFFFindOrRegisterField(TIFF *tif, uint32_t tag, + if (fld == NULL) + { + fld = _TIFFCreateAnonField(tif, tag, dt); +- if (!_TIFFMergeFields(tif, fld, 1)) ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) + return NULL; + } + +diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c +index 58a4276..738df9f 100644 +--- a/libtiff/tif_dirread.c ++++ b/libtiff/tif_dirread.c +@@ -4275,11 +4275,9 @@ int TIFFReadDirectory(TIFF *tif) + dp->tdir_tag, dp->tdir_tag); + /* the following knowingly leaks the + anonymous field structure */ +- if (!_TIFFMergeFields( +- tif, +- _TIFFCreateAnonField(tif, dp->tdir_tag, +- (TIFFDataType)dp->tdir_type), +- 1)) ++ const TIFFField *fld = _TIFFCreateAnonField( ++ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type); ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) + { + TIFFWarningExtR( + tif, module, +@@ -5153,11 +5151,9 @@ int TIFFReadCustomDirectory(TIFF *tif, toff_t diroff, + "Unknown field with tag %" PRIu16 " (0x%" PRIx16 + ") encountered", + dp->tdir_tag, dp->tdir_tag); +- if (!_TIFFMergeFields( +- tif, +- _TIFFCreateAnonField(tif, dp->tdir_tag, +- (TIFFDataType)dp->tdir_type), +- 1)) ++ const TIFFField *fld = _TIFFCreateAnonField( ++ tif, dp->tdir_tag, (TIFFDataType)dp->tdir_type); ++ if (fld == NULL || !_TIFFMergeFields(tif, fld, 1)) + { + TIFFWarningExtR(tif, module, + "Registering anonymous field with tag %" PRIu16 +-- +2.44.1 +
meta/recipes-multimedia/libtiff/tiff_4.6.0.bb +1 -0
@@ -16,6 +16,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2023-52355-0001.patch \ file://CVE-2023-52355-0002.patch \ file://CVE-2023-52356.patch \ + file://CVE-2024-7006.patch \ " SRC_URI[sha256sum] = "88b3979e6d5c7e32b50d7ec72fb15af724f6ab2cbf7e10880c360a77e4b5d99a"
Signature · 1 line
2.34.1
PATCH 4/18 llvm: Enable libllvm for native build
In reply to Steve SakomanFrom: Mingli Yu <[email protected]>
The bpftrace recipe under meta-clang[1] needs llvm-objcopy [2] during do_confgure phase otherwise there comes below error:
| CMake Error at tests/data/CMakeLists.txt:6 (find_program): | Could not find LLVM_OBJCOPY using the following names: llvm-objcopy, | llvm-objcopy-18, llvm18-objcopy
The commit ec22bfa67f llvm: allow building libllvm in native builds, subject to PACKAGECONFIG [3] introduces libllvm to manage the llvm function for native build
maybe because there is only mesa-native to use llvm-native.
Considering there are other recipes such as bpftrace needs llvm-native, so enable libllvm for native build.
[1] https://github.com/kraj/meta-clang
[2] https://github.com/bpftrace/bpftrace/blob/master/tests/data/CMakeLists.txt
[3] https://git.openembedded.org/openembedded-core/commit/?id=ec22bfa67f6f1766102501d4593ce29aafe8c166
--- meta/recipes-devtools/llvm/llvm_18.1.6.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-devtools/llvm/llvm_18.1.6.bb +0 -1
@@ -55,7 +55,6 @@ def get_llvm_host_arch(bb, d): return get_llvm_arch(bb, d, 'HOST_ARCH') PACKAGECONFIG ??= "libllvm" -PACKAGECONFIG:class-native = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libllvm', '', d)}" # if optviewer OFF, force the modules to be not found or the ones on the host would be found PACKAGECONFIG[optviewer] = ",-DPY_PYGMENTS_FOUND=OFF -DPY_PYGMENTS_LEXERS_C_CPP_FOUND=OFF -DPY_YAML_FOUND=OFF,python3-pygments python3-pyyaml,python3-pygments python3-pyyaml" PACKAGECONFIG[libllvm] = ""
Signature · 1 line
2.34.1
PATCH 5/18 maintainers.inc: add self for unassigned python recipes
In reply to Steve SakomanFrom: Trevor Gamblin <[email protected]>
Add myself as maintainer for the following:
- python3-setuptools
- python3-smmap
- python3-subunit
- python3-testtools
With that, every Python recipe in oe-core has a maintainer assigned.
--- meta/conf/distro/include/maintainers.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/conf/distro/include/maintainers.inc +4 -4
@@ -697,12 +697,12 @@ RECIPE_MAINTAINER:pn-python3-rpds-py = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-ruamel-yaml = "Bruce Ashfield <[email protected]>" RECIPE_MAINTAINER:pn-python3-scons = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-semantic-version = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-setuptools = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-python3-setuptools = "Trevor Gamblin <[email protected]>" RECIPE_MAINTAINER:pn-python3-setuptools-rust = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-setuptools-scm = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-six = "Zang Ruochen <[email protected]>" RECIPE_MAINTAINER:pn-python3-smartypants = "Alexander Kanavin <[email protected]>" -RECIPE_MAINTAINER:pn-python3-smmap = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-python3-smmap = "Trevor Gamblin <[email protected]>" RECIPE_MAINTAINER:pn-python3-snowballstemmer = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-sortedcontainers = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-spdx-tools = "Marta Rybczynska <[email protected]>"
@@ -715,8 +715,8 @@ RECIPE_MAINTAINER:pn-python3-sphinxcontrib-jquery = "Tim Orling <tim.orling@kons RECIPE_MAINTAINER:pn-python3-sphinxcontrib-qthelp = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-sphinxcontrib-serializinghtml = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-sphinx-rtd-theme = "Tim Orling <[email protected]>" -RECIPE_MAINTAINER:pn-python3-subunit = "Unassigned <[email protected]>" -RECIPE_MAINTAINER:pn-python3-testtools = "Unassigned <[email protected]>" +RECIPE_MAINTAINER:pn-python3-subunit = "Trevor Gamblin <[email protected]>" +RECIPE_MAINTAINER:pn-python3-testtools = "Trevor Gamblin <[email protected]>" RECIPE_MAINTAINER:pn-python3-toml = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-tomli = "Tim Orling <[email protected]>" RECIPE_MAINTAINER:pn-python3-trove-classifiers = "Trevor Gamblin <[email protected]>"
Signature · 1 line
2.34.1
PATCH 3/18 go: upgrade 1.22.5 -> 1.22.6
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
Upgrade to latest 1.22.x release [1]:
$ git --no-pager log --oneline go1.22.5..go1.22.6 cb4eee693c (tag: go1.22.6, origin/release-branch.go1.22) [release-branch.go1.22] go1.22.6 8c8adffd53 [release-branch.go1.22] cmd/compile: add 0-sized-value simplification to copyelim 70a1aae67f [release-branch.go1.22] cmd/trace/v2: make the -pprof actually useful 2c88c1d599 [release-branch.go1.22] cmd/trace/v2: handle the -pprof flag 4c50f9162c [release-branch.go1.22] cmd/internal/cov: close counter data files eagerly 9e148a4150 [release-branch.go1.22] internal/bytealg: extend memchr result correctly on wasm 4b27560db9 [release-branch.go1.22] go/types: fix assertion failure when range over int is not permitted 4e548f2c8e [release-branch.go1.22] cmd/link: don't let dsymutil delete our temp directory 45f9ded1df [release-branch.go1.22] cmd/compile: don't elide zero extension on top of signed values 49906f9575 [release-branch.go1.22] cmd/go: fix build config before creating actions for 'go list -cover' ea96074191 [release-branch.go1.22] os/exec: only use cachedLookExtensions if Cmd.Path is unmodified
[1] https://github.com/golang/go/compare/go1.22.5...go1.22.6
---
meta/recipes-devtools/go/{go-1.22.5.inc => go-1.22.6.inc} | 2 +-
...o-binary-native_1.22.5.bb => go-binary-native_1.22.6.bb} | 6 +++---
...cross-canadian_1.22.5.bb => go-cross-canadian_1.22.6.bb} | 0
.../go/{go-cross_1.22.5.bb => go-cross_1.22.6.bb} | 0
.../go/{go-crosssdk_1.22.5.bb => go-crosssdk_1.22.6.bb} | 0
.../go/{go-runtime_1.22.5.bb => go-runtime_1.22.6.bb} | 0
meta/recipes-devtools/go/{go_1.22.5.bb => go_1.22.6.bb} | 0
7 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/go/{go-1.22.5.inc => go-1.22.6.inc} (89%)
rename meta/recipes-devtools/go/{go-binary-native_1.22.5.bb => go-binary-native_1.22.6.bb} (78%)
rename meta/recipes-devtools/go/{go-cross-canadian_1.22.5.bb => go-cross-canadian_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go-cross_1.22.5.bb => go-cross_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go-crosssdk_1.22.5.bb => go-crosssdk_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go-runtime_1.22.5.bb => go-runtime_1.22.6.bb} (100%)
rename meta/recipes-devtools/go/{go_1.22.5.bb => go_1.22.6.bb} (100%)meta/recipes-devtools/go/go-1.22.6.inc renamed from meta/recipes-devtools/go/go-1.22.5.inc +1 -1
@@ -15,4 +15,4 @@ SRC_URI += "\ file://0008-src-cmd-dist-buildgo.go-do-not-hardcode-host-compile.patch \ file://0009-go-Filter-build-paths-on-staticly-linked-arches.patch \ " -SRC_URI[main.sha256sum] = "ac9c723f224969aee624bc34fd34c9e13f2a212d75c71c807de644bb46e112f6" +SRC_URI[main.sha256sum] = "9e48d99d519882579917d8189c17e98c373ce25abaebb98772e2927088992a51"
meta/recipes-devtools/go/go-binary-native_1.22.6.bb renamed from meta/recipes-devtools/go/go-binary-native_1.22.5.bb +3 -3
@@ -9,9 +9,9 @@ PROVIDES = "go-native" # Checksums available at https://go.dev/dl/ SRC_URI = "https://dl.google.com/go/go${PV}.${BUILD_GOOS}-${BUILD_GOARCH}.tar.gz;name=go_${BUILD_GOTUPLE}" -SRC_URI[go_linux_amd64.sha256sum] = "904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0" -SRC_URI[go_linux_arm64.sha256sum] = "8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a" -SRC_URI[go_linux_ppc64le.sha256sum] = "5312bb420ac0b59175a58927e70b4660b14ab7319aab54398b6071fabcbfbb09" +SRC_URI[go_linux_amd64.sha256sum] = "999805bed7d9039ec3da1a53bfbcafc13e367da52aa823cb60b68ba22d44c616" +SRC_URI[go_linux_arm64.sha256sum] = "c15fa895341b8eaf7f219fada25c36a610eb042985dc1a912410c1c90098eaf2" +SRC_URI[go_linux_ppc64le.sha256sum] = "9d99fce3f6f72a76630fe91ec0884dfe3db828def4713368424900fa98bb2bd6" UPSTREAM_CHECK_URI = "https://golang.org/dl/" UPSTREAM_CHECK_REGEX = "go(?P<pver>\d+(\.\d+)+)\.linux"
meta/recipes-devtools/go/go-cross-canadian_1.22.6.bb renamed from meta/recipes-devtools/go/go-cross-canadian_1.22.5.bb +0 -0
meta/recipes-devtools/go/go-cross_1.22.6.bb renamed from meta/recipes-devtools/go/go-cross_1.22.5.bb +0 -0
meta/recipes-devtools/go/go-crosssdk_1.22.6.bb renamed from meta/recipes-devtools/go/go-crosssdk_1.22.5.bb +0 -0
meta/recipes-devtools/go/go-runtime_1.22.6.bb renamed from meta/recipes-devtools/go/go-runtime_1.22.5.bb +0 -0
meta/recipes-devtools/go/go_1.22.6.bb renamed from meta/recipes-devtools/go/go_1.22.5.bb +0 -0
Signature · 1 line
2.34.1
PATCH 6/18 initramfs-framework: fix typos
In reply to Steve SakomanFrom: Ulrich Ölmann <[email protected]>
Fix typos in debugging and error messages.
--- meta/recipes-core/initrdscripts/initramfs-framework/init | 2 +- meta/recipes-core/initrdscripts/initramfs-framework/rootfs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-core/initrdscripts/initramfs-framework/init +1 -1
@@ -117,7 +117,7 @@ if grep -q devtmpfs /proc/filesystems; then mount -t devtmpfs devtmpfs /dev else if [ ! -d /dev ]; then - fatal "ERROR: /dev doesn't exist and kernel doesn't has devtmpfs enabled." + fatal "ERROR: /dev doesn't exist and kernel doesn't have devtmpfs enabled." fi fi
meta/recipes-core/initrdscripts/initramfs-framework/rootfs +1 -1
@@ -59,7 +59,7 @@ rootfs_run() { fi fi fi - debug "Sleeping for $delay second(s) to wait root to settle..." + debug "Sleeping for $delay second(s) to wait for root to settle..." sleep $delay C=$(( $C + 1 )) done
Signature · 1 line
2.34.1
PATCH 7/18 os-release: Fix VERSION_CODENAME in case it is empty
In reply to Steve SakomanFrom: Daniel Semkowicz <[email protected]>
If DISTRO_CODENAME was not set, VERSION_CODENAME field was populated with unparsed string. This resulted in the following line in os-release file:
VERSION_CODENAME="${DISTRO_CODENAME}"According to systemd documentation, this field is optional. Fix the problem by setting VERSION_CODENAME conditionally, only if DISTRO_CODENAME was set.
--- meta/recipes-core/os-release/os-release.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/os-release/os-release.bb +1 -1
@@ -24,7 +24,7 @@ ID = "${DISTRO}" NAME = "${DISTRO_NAME}" VERSION = "${DISTRO_VERSION}${@' (%s)' % DISTRO_CODENAME if 'DISTRO_CODENAME' in d else ''}" VERSION_ID = "${DISTRO_VERSION}" -VERSION_CODENAME = "${DISTRO_CODENAME}" +VERSION_CODENAME = "${@d.getVar('DISTRO_CODENAME') or ''}" PRETTY_NAME = "${DISTRO_NAME} ${VERSION}" # The vendor field is hardcoded to "openembedded" deliberately. We'd
Signature · 1 line
2.34.1
PATCH 8/18 libgfortran.inc: fix nativesdk-libgfortran dependencies
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
* use virtual/* variables as INHIBIT_DEFAULT_DEPS does to avoid dependency on gcc-cross- from nativesdk-libgfortran
* the dependency was added in:
https://git.openembedded.org/openembedded-core/commit/?id=00fba52c8a6f6383137cf89fc7aa34cc3e2ff45f
causing:
build/oe-core $ bitbake -g nativesdk-libgfortran
NOTE: Resolving any missing task queue dependencies
ERROR: Nothing PROVIDES 'gcc-cross-x86_64' (but virtual:nativesdk:/OE/build/oe-core/openembedded-core/meta/recipes-devtools/gcc/libgfortran_14.1.bb DEPENDS on or otherwise requires it). Close matches:
gcc-cross-aarch64
...
with:
MACHINE=qemuarm64
FORTRAN:forcevariable = ",fortran"
* after:
https://git.openembedded.org/openembedded-core/commit/?id=44fc7aa1468ff042739cc5a91c84ef5c2a09e0a3
nativesdk-libgfortran is pulled as dependency of nativesdk-gcc so this affects more people who didn't explicitly use nativesdk-libgfortran before
* the INHIBIT_DEFAULT_DEPS and gcc-runtime was there since gcc-4.8:
https://git.openembedded.org/openembedded-core/commit/?id=a5e7ee5770b9e0cf719c573efffd874440f74289
--- meta/recipes-devtools/gcc/libgfortran.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-devtools/gcc/libgfortran.inc +2 -1
@@ -47,8 +47,9 @@ do_install () { chown -R root:root ${D} } +# avoid virtual/libc INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "gcc-runtime gcc-cross-${TARGET_ARCH}" +DEPENDS = "virtual/${HOST_PREFIX}gcc virtual/${HOST_PREFIX}compilerlibs" BBCLASSEXTEND = "nativesdk"
Signature · 1 line
2.34.1
PATCH 9/18 glibc: fix fortran header file conflict for arm
In reply to Steve SakomanFrom: Kai Kang <[email protected]>
There is a file conflict for arm when multilib enabled:
| Error: Transaction test error:
| file /usr/include/finclude/math-vector-fortran.h conflicts between attempted installs of
lib32-libc6-dev-2.39+git0+312e159626-r0.armv7at2hf_neon and libc6-dev-2.39+git0+312e159626-r0.cortexa72
Install math-vector-fortran.h to the gfortran default search directory which is arch specific to avoid the conflict.
--- meta/recipes-core/glibc/glibc-package.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-package.inc +7 -1
@@ -39,7 +39,7 @@ FILES:sln = "${base_sbindir}/sln" FILES:${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o" FILES:libsotruss = "${libdir}/audit/sotruss-lib.so" FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}" -FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal" +FILES:${PN}-dev += "${libdir}/libpthread.a ${libdir}/libdl.a ${libdir}/libutil.a ${libdir}/libanl.a ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal ${libdir}/gcc/${TARGET_SYS}/*/finclude" RDEPENDS:${PN}-dev = "linux-libc-headers-dev" FILES:${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a" FILES:nscd = "${sbindir}/nscd* ${sysconfdir}/init.d/nscd ${systemd_system_unitdir}/nscd* ${nonarch_libdir}/tmpfiles.d/nscd.conf \
@@ -169,6 +169,12 @@ do_install_armmultilib () { oe_multilib_header sys/elf.h sys/procfs.h sys/ptrace.h sys/ucontext.h sys/user.h } +do_install_armmultilib:append:class-target() { + gcc_version=$($CC -dumpversion) + mkdir -p ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude + mv ${D}${includedir}/finclude/math-vector-fortran.h ${D}${libdir}/gcc/${TARGET_SYS}/${gcc_version}/finclude/ + rmdir --ignore-fail-on-non-empty ${D}${includedir}/finclude +} LOCALESTASH = "${WORKDIR}/stashed-locale" bashscripts = "mtrace sotruss xtrace"
Signature · 1 line
2.34.1
PATCH 10/18 gstreamer1.0: disable flaky baseparser tests
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
There are three baseparser tests which are causing trouble on the AB, so disable them as we've filed an upstream bug.
Also fix a typo when we were attempting to disable parser_pull_short_read where a colon was used instead of a comma.
--- meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0/run-ptest +6 -1
@@ -16,6 +16,11 @@ GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_functioning" GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,test_infinite_seek_50_src_live" # Known unreliable tests as per subprojects/gst-devtools/validate/launcher/testsuites/check.py: -GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE:parser_pull_short_read" +GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_pull_short_read" + +# These tests are fragile +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=14884 +# https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3524 +GST_CHECKS_IGNORE="$GST_CHECKS_IGNORE,parser_convert_duration,parser_pull_frame_growth,parser_reverse_playback" gnome-desktop-testing-runner gstreamer
Signature · 1 line
2.34.1
PATCH 11/18 librsvg: don't try to run target code at build time
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
The rsvg-loader test binary isn't installed but building it causes a mix of build host and target code to be executed. As we don't install the test, don't build it.
--- .../librsvg/disable-rsvg-loader-test.patch | 40 +++++++++++++++++++ meta/recipes-gnome/librsvg/librsvg_2.57.1.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-gnome/librsvg/librsvg/disable-rsvg-loader-test.patch
meta/recipes-gnome/librsvg/librsvg/disable-rsvg-loader-test.patch new file +40 -0
@@ -0,0 +1,40 @@ +From df94cfa4a637c229fef32c349b5c2dfee2dca3fc Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Thu, 27 Jun 2024 17:09:11 +0100 +Subject: [PATCH] Don't build rsvg-loader in cross builds + +This binary is a non-installed test binary that isn't any use in cross builds, and +causes problems because it generates a gdk-pixbuf loader cache at build time using +a mix of host and target libraries. + +As we don't install the binary, we can just not build it. + +Upstream-Status: Inappropriate [upstream has moved to Meson] +Signed-off-by: Ross Burton <[email protected]> +--- + gdk-pixbuf-loader/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am +index 44df9c6c..fb417d24 100644 +--- a/gdk-pixbuf-loader/Makefile.am ++++ b/gdk-pixbuf-loader/Makefile.am +@@ -30,6 +30,7 @@ if PLATFORM_WIN32 + libpixbufloader_svg_la_LDFLAGS += -no-undefined + endif + ++if !CROSS_COMPILING + noinst_PROGRAMS = rsvg-loader + + rsvg_loader_SOURCES = \ +@@ -52,6 +53,7 @@ EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders + + gdk-pixbuf-loaders: Makefile + $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null ++endif + + if CROSS_COMPILING + RUN_QUERY_LOADER_TEST=false +-- +2.34.1 +
meta/recipes-gnome/librsvg/librsvg_2.57.1.bb +1 -0
@@ -21,6 +21,7 @@ require ${BPN}-crates.inc SRC_URI += " \ file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ + file://disable-rsvg-loader-test.patch \ " SRC_URI[archive.sha256sum] = "074671a3ed6fbcd67cae2a40e539107f4f097ca8a4ab1a894c05e2524ff340ef"
Signature · 1 line
2.34.1
PATCH 12/18 populate_sdk_ext.bclass: make sure OECORE_NATIVE_SYSROOT is exported.
In reply to Steve SakomanFrom: Gauthier HADERER <[email protected]>
Fixes bug 15464.
OECORE_NATIVE_SYSROOT is correctly set up and exported in the SDK's environment file. But it's then unset in buildtools/environment-setup-*. The value is restored in the SDK's environment file but is not exported again.
--- meta/classes-recipe/populate_sdk_ext.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/populate_sdk_ext.bbclass +1 -1
@@ -732,7 +732,7 @@ sdk_ext_postinst() { echo "# Save and reset OECORE_NATIVE_SYSROOT as buildtools may change it" >> $env_setup_script echo "SAVED=\"\$OECORE_NATIVE_SYSROOT\"" >> $env_setup_script echo ". $target_sdk_dir/buildtools/environment-setup*" >> $env_setup_script - echo "OECORE_NATIVE_SYSROOT=\"\$SAVED\"" >> $env_setup_script + echo "export OECORE_NATIVE_SYSROOT=\"\$SAVED\"" >> $env_setup_script fi # Allow bitbake environment setup to be ran as part of this sdk.
Signature · 1 line
2.34.1
PATCH 13/18 qemuboot: Trigger write_qemuboot_conf task on changes of kernel image realpath
In reply to Steve SakomanFrom: "Weisser, Pascal.ext" <[email protected]>
The qemuboot.conf file contains the realpath of the kernel image referenced by QB_DEFAULT_KERNEL. So, it must be recreated in case the realpath of the referenced kernel image changes.
The variables KERNEL_IMAGE_NAME and KERNEL_IMAGE_BIN_EXT determine the realpath of the kernel image relative to DEPLOY_DIR_IMAGE. Adding both of them to the vardeps of the write_qemuboot_conf task triggers the write_qemuboot_conf task in case the realpath of the kernel image referenced by QB_DEFAULT_KERNEL changes.
--- meta/classes-recipe/qemuboot.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes-recipe/qemuboot.bbclass +2 -1
@@ -129,7 +129,8 @@ addtask do_write_qemuboot_conf after do_rootfs before do_image def qemuboot_vars(d): build_vars = ['MACHINE', 'TUNE_ARCH', 'DEPLOY_DIR_IMAGE', - 'KERNEL_IMAGETYPE', 'IMAGE_NAME', 'IMAGE_LINK_NAME', + 'KERNEL_IMAGETYPE', 'KERNEL_IMAGE_NAME', + 'KERNEL_IMAGE_BIN_EXT', 'IMAGE_NAME', 'IMAGE_LINK_NAME', 'STAGING_DIR_NATIVE', 'STAGING_BINDIR_NATIVE', 'STAGING_DIR_HOST', 'SERIAL_CONSOLES', 'UNINATIVE_LOADER'] return build_vars + [k for k in d.keys() if k.startswith('QB_')]
Signature · 1 line
2.34.1
PATCH 14/18 oeqa/runtime/ssh: add retry logic and sleeps to allow for slower systems
In reply to Steve SakomanFrom: Jon Mason <[email protected]>
On exceptionally slow systems, the ssh test can intermittently fail due to a race between when ping works and the networking applications being brought up. To work around this issue, add some retry logic when ssh fails to connect. According to the man page of ssh, "ssh exits with the exit status of the remote command or with 255 if an error occurred." So, only retry if the return code is 255, and limit the number of retries to prevent it looping forever.
--- meta/lib/oeqa/runtime/cases/ssh.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
meta/lib/oeqa/runtime/cases/ssh.py +19 -9
@@ -4,6 +4,8 @@ # SPDX-License-Identifier: MIT # +import time + from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends from oeqa.runtime.decorator.package import OEHasPackage
@@ -13,12 +15,20 @@ class SSHTest(OERuntimeTestCase): @OETestDepends(['ping.PingTest.test_ping']) @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): - (status, output) = self.target.run('sleep 20', timeout=2) - msg='run() timed out but return code was zero.' - self.assertNotEqual(status, 0, msg=msg) - (status, output) = self.target.run('uname -a') - self.assertEqual(status, 0, msg='SSH Test failed: %s' % output) - (status, output) = self.target.run('cat /etc/controllerimage') - msg = "This isn't the right image - /etc/controllerimage " \ - "shouldn't be here %s" % output - self.assertEqual(status, 1, msg=msg) + for i in range(5): + status, output = self.target.run("uname -a", timeout=5) + if status == 0: + break + elif status == 255: + # ssh returns 255 only if a ssh error occurs. This could + # be an issue with "Connection refused" because the port + # isn't open yet, and this could check explicitly for that + # here. However, let's keep it simple and just retry for + # all errors a limited amount of times with a sleep to + # give it time for the port to open. + time.sleep(5) + continue + else: + self.fail("uname failed with \"%s\"" %output) + if status == 255: + self.fail("ssh error %s" %output)
Signature · 1 line
2.34.1
PATCH 15/18 oeqa/runtime/ssh: In case of failure, show exit code and handle -15 (SIGTERM)
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
Ensure we show the failing exit code in case of failures.
We're seeing autobuilder failures with -15 (SIGTERM) which is probably from slow boot/init. Retry in these cases for now.
--- meta/lib/oeqa/runtime/cases/ssh.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/ssh.py +5 -2
@@ -5,6 +5,7 @@ # import time +import signal from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends
@@ -19,16 +20,18 @@ class SSHTest(OERuntimeTestCase): status, output = self.target.run("uname -a", timeout=5) if status == 0: break - elif status == 255: + elif status == 255 or status == -signal.SIGTERM: # ssh returns 255 only if a ssh error occurs. This could # be an issue with "Connection refused" because the port # isn't open yet, and this could check explicitly for that # here. However, let's keep it simple and just retry for # all errors a limited amount of times with a sleep to # give it time for the port to open. + # We sometimes see -15 (SIGTERM) on slow emulation machines too, likely + # from boot/init not being 100% complete, retry for these too. time.sleep(5) continue else: - self.fail("uname failed with \"%s\"" %output) + self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) if status == 255: self.fail("ssh error %s" %output)
Signature · 1 line
2.34.1
PATCH 16/18 oeqa/runtime/ssh: check for all errors at the end
In reply to Steve SakomanFrom: Jon Mason <[email protected]>
With the retry for the -SIGTERM, it is possible to still see that error after the 5th attempt and mark the run a success. Check for any non-zero status in the final check and error out to close the gap. While there, make the error print match the one above and be a little more verbose. Also, I'm seeing it take roughly 6 attempts on my local (very slow) system to pass. So, increasing the number of attempts to 10.
--- meta/lib/oeqa/runtime/cases/ssh.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/lib/oeqa/runtime/cases/ssh.py +3 -3
@@ -16,7 +16,7 @@ class SSHTest(OERuntimeTestCase): @OETestDepends(['ping.PingTest.test_ping']) @OEHasPackage(['dropbear', 'openssh-sshd']) def test_ssh(self): - for i in range(5): + for i in range(10): status, output = self.target.run("uname -a", timeout=5) if status == 0: break
@@ -33,5 +33,5 @@ class SSHTest(OERuntimeTestCase): continue else: self.fail("uname failed with \"%s\" (exit code %s)" % (output, status)) - if status == 255: - self.fail("ssh error %s" %output) + if status != 0: + self.fail("ssh failed with \"%s\" (exit code %s)" % (output, status))
Signature · 1 line
2.34.1
PATCH 17/18 oeqa/selftest/reproducibile: Explicitly list virtual targets
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
We're seeing reproducibility failures where some packages don't appear in the "from sstate" builds. The common factor is these are all recipes with PROVIDES = "virtual/XXX".
In a full build from scratch, these are build but in a build from sstate, there are situations where they aren't. For now, to try and keep builds working, work around the problem until we can better look into the problem. It is likely recent taskhash imrovements have caused this to occur more regularly.
--- meta/lib/oeqa/selftest/cases/reproducible.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/reproducible.py +2 -1
@@ -133,7 +133,8 @@ class ReproducibleTests(OESelftestTestCase): max_report_size = 250 * 1024 * 1024 # targets are the things we want to test the reproducibility of - targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world'] + # Have to add the virtual targets manually for now as builds may or may not include them as they're exclude from world + targets = ['core-image-minimal', 'core-image-sato', 'core-image-full-cmdline', 'core-image-weston', 'world', 'virtual/librpc', 'virtual/libsdl2', 'virtual/crypt'] # sstate targets are things to pull from sstate to potentially cut build/debugging time sstate_targets = []
Signature · 1 line
2.34.1
PATCH 18/18 oeqa/utils/postactions: transfer whole archive over ssh instead of doing individual copies
In reply to Steve SakomanFrom: Alexis Lothoré <[email protected]>
Fixes [YOCTO 15536]
The postactions retrieval actions currently rely on scp executed individually on any file or directory expanded from TESTIMAGE_FAILED_QA_ARTIFACTS. Unfortunately, symlinks are not preserved with this mechanism, which lead to big storage space consumption. Things may go even worse if those symlinks create some circular chains. This mechanism then needs to be updated to preserve symlinks instead of following them during copy. There are multiple ways to do it:
- create a local archive on the target and execute scp on this file
- use rsync instead of scp for all files
- create an archive and pipe it to ssh instead of storing it onto the target
The first solution may create pressure on targets storage space, while the second assumes that rsync is installed on the target, which may not be true. So the third one is a compromise: tar is very likely present, at least through busybox, and no disk space is used on the target.
Replace the current per-file scp call by a single call to tar run on the target. Retrieve the generated compressed archive directly from SSH output, and feed it to another tar process but on host, to uncompress and extract it at the same place as before.
--- meta/lib/oeqa/utils/postactions.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
meta/lib/oeqa/utils/postactions.py +9 -10
@@ -62,17 +62,16 @@ def get_artifacts_list(target, raw_list): return result def retrieve_test_artifacts(target, artifacts_list, target_dir): + import io, subprocess local_artifacts_dir = os.path.join(target_dir, "artifacts") - for artifact_path in artifacts_list: - if not os.path.isabs(artifact_path): - bb.warn(f"{artifact_path} is not an absolute path") - continue - try: - dest_dir = os.path.join(local_artifacts_dir, os.path.dirname(artifact_path[1:])) - os.makedirs(dest_dir, exist_ok=True) - target.copyFrom(artifact_path, dest_dir) - except Exception as e: - bb.warn(f"Can not retrieve {artifact_path} from test target: {e}") + try: + cmd = "tar zcf - " + " ".join(artifacts_list) + (status, output) = target.run(cmd, raw = True) + if status != 0 or not output: + raise Exception("Error while fetching compressed artifacts") + p = subprocess.run(["tar", "zxf", "-", "-C", local_artifacts_dir], input=output) + except Exception as e: + bb.warn(f"Can not retrieve {artifact_path} from test target: {e}") def list_and_fetch_failed_tests_artifacts(d, tc): artifacts_list = get_artifacts_list(tc.target, d.getVar("TESTIMAGE_FAILED_QA_ARTIFACTS"))
Signature · 1 line
2.34.1