Patch review
cover Patch review
Please review this set of patches for langdale and have comments back by end of day Monday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5152
The following changes since commit 6c9ca2f2de98c84d11beccbfde7c1e26cb25dfb6:
scripts/lib/buildstats: handle top-level build_stats not being complete (2023-03-30 04:10:26 -1000)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/langdale-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut
Andrew Geissler (1):
filemap.py: enforce maximum of 4kb block size
Arturo Buzarra (1):
run-postinsts: Set dependency for ldconfig to avoid boot issues
Enrico Jörns (7):
oeqa/selftest/cases/runqemu: update imports oeqa/targetcontrol: fix misspelled RuntimeError oeqa/targetcontrol: do not set dump_host_cmds redundantly oeqa/targetcontrol: remove unused imports oeqa/utils/commands: fix usage of undefined EPIPE oeqa/utils/commands: remove unused imports oeqa/utils/qemurunner: replace hard-coded user 'root' in debug output
Fawzi KHABER (2):
package.bbclass: check packages name conflict in do_package oeqa/selftest/cases/package.py: adding unittest for package rename
conflicts
Jose Quaresma (3):
oeqs/selftest: OESelftestTestContext: replace the os.environ after
subprocess.check_output
oeqa/selftest: OESelftestTestContext: convert relative to full path
when newbuilddir is provided
oeqa/selftest/reproducible: Split different packages from missing
packages output
Khem Raj (1):
Revert "runqemu: Add workaround for APIC hang on pre 4.15 kernels on
qemux86"
Martin Jansa (3):
selftest: runqemu: better check for ROOTFS: in the log
selftest: runqemu: use better error message when asserts fail
runqemu: respect IMAGE_LINK_NAME
Michael Halstead (1):
uninative: Upgrade to 3.9 to include glibc 2.37
Mingli Yu (1):
report-error: catch Nothing PROVIDES error
Richard Purdie (2):
xdg-utils: Add a patch for CVE-2020-27748
xdg-utils: Fix CVE number
Ross Burton (2):
tzdata: upgrade to 2023c
oeqa/runtime: clean up deprecated backslash expansion
Soumya (1):
shadow: Fix can not print full login timeout message
Tobias Hagelborn (1):
lib/oe/gpg_sign.py: Avoid race when creating .sig files in detach_sign
.../packagenameconflict.bb | 10 + meta/classes-global/package.bbclass | 9 + meta/classes-recipe/testimage.bbclass | 2 +- meta/classes/report-error.bbclass | 27 +- meta/conf/distro/include/yocto-uninative.inc | 10 +- meta/lib/oe/gpg_sign.py | 27 +- meta/lib/oeqa/runtime/cases/apt.py | 4 +- meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +- meta/lib/oeqa/runtime/cases/systemd.py | 2 +- meta/lib/oeqa/selftest/cases/package.py | 7 + meta/lib/oeqa/selftest/cases/reproducible.py | 10 +- meta/lib/oeqa/selftest/cases/runqemu.py | 16 +- meta/lib/oeqa/selftest/context.py | 20 +- meta/lib/oeqa/targetcontrol.py | 8 +- meta/lib/oeqa/utils/commands.py | 6 +- meta/lib/oeqa/utils/qemurunner.py | 4 +- .../run-postinsts/run-postinsts.service | 2 +- .../0001-Fix-can-not-print-full-login.patch | 41 +++ meta/recipes-extended/shadow/shadow.inc | 1 + meta/recipes-extended/timezone/timezone.inc | 6 +- .../timezone/tzcode-native.bb | 2 - ...0001-Fix-C23-related-conformance-bug.patch | 301 ------------------ .../xdg-utils/xdg-utils/CVE-2022-4055.patch | 145 +++++++++ .../xdg-utils/xdg-utils_1.1.3.bb | 1 + scripts/lib/wic/filemap.py | 7 + scripts/runqemu | 74 +++-- 26 files changed, 371 insertions(+), 378 deletions(-) create mode 100644 meta-selftest/recipes-test/packagenameconflict/packagenameconflict.bb create mode 100644 meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch delete mode 100644 meta/recipes-extended/timezone/tzcode/0001-Fix-C23-related-conformance-bug.patch create mode 100644 meta/recipes-extended/xdg-utils/xdg-utils/CVE-2022-4055.patch
Signature · 1 line
2.34.1
PATCH 1/26 xdg-utils: Add a patch for CVE-2020-27748
From: Richard Purdie <[email protected]>
Take a patch submitted upstream for the issue while upstream decide what to do. We don't use thunderbird integration so this isn't an issue for us.
--- .../xdg-utils/xdg-utils/CVE-2020-27748.patch | 145 ++++++++++++++++++ .../xdg-utils/xdg-utils_1.1.3.bb | 1 + 2 files changed, 146 insertions(+) create mode 100644 meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch
meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch new file +145 -0
@@ -0,0 +1,145 @@ +xdg-email does not parse mailto uris properly for thunderbird + +When using thunderbird as mailto handler xdg-email translates mailto uris into an 'thunderbird -compose' argument. While to, cc and bcc values are properly enclosed in single quotes this is not the case for subject or body. This breaks functionality and allows to use all thunderbird -compose arguments within a mailto uri, e.g. + +xdg-email 'mailto:[email protected]?subject=Test,attachment=~/.thunderbird/profiles.ini,message=/home/test/test.txt' + +translates into + +thunderbird -compose to='[email protected],',subject=Test,attachment=~/.thunderbird/profiles.ini,message=/home/test/test.txt + +with working attachment and message. (And, yes, ~ expands to the home directory.) + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/205] + +Signed-off-by: Richard Purdie <[email protected]> + +CVE: CVE-2020-27748 + + +Index: xdg-utils-1.1.3/scripts/xdg-email.in +=================================================================== +--- xdg-utils-1.1.3.orig/scripts/xdg-email.in ++++ xdg-utils-1.1.3/scripts/xdg-email.in +@@ -30,53 +30,6 @@ _USAGE + + #@xdg-utils-common@ + +-run_thunderbird() +-{ +- local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY +- THUNDERBIRD="$1" +- MAILTO=$(echo "$2" | sed 's/^mailto://') +- echo "$MAILTO" | grep -qs "^?" +- if [ "$?" = "0" ] ; then +- MAILTO=$(echo "$MAILTO" | sed 's/^?//') +- else +- MAILTO=$(echo "$MAILTO" | sed 's/^/to=/' | sed 's/?/\&/') +- fi +- +- MAILTO=$(echo "$MAILTO" | sed 's/&/\n/g') +- TO=$(/bin/echo -e $(echo "$MAILTO" | grep '^to=' | sed 's/^to=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) +- CC=$(/bin/echo -e $(echo "$MAILTO" | grep '^cc=' | sed 's/^cc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) +- BCC=$(/bin/echo -e $(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//;s/%\(..\)/\\x\1/g' | awk '{ printf "%s,",$0 }')) +- SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1) +- BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1) +- +- if [ -z "$TO" ] ; then +- NEWMAILTO= +- else +- NEWMAILTO="to='$TO'" +- fi +- if [ -n "$CC" ] ; then +- NEWMAILTO="${NEWMAILTO},cc='$CC'" +- fi +- if [ -n "$BCC" ] ; then +- NEWMAILTO="${NEWMAILTO},bcc='$BCC'" +- fi +- if [ -n "$SUBJECT" ] ; then +- NEWMAILTO="${NEWMAILTO},$SUBJECT" +- fi +- if [ -n "$BODY" ] ; then +- NEWMAILTO="${NEWMAILTO},$BODY" +- fi +- +- NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//') +- DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\"" +- "$THUNDERBIRD" -compose "$NEWMAILTO" +- if [ $? -eq 0 ]; then +- exit_success +- else +- exit_failure_operation_failed +- fi +-} +- + open_kde() + { + if [ -n "$KDE_SESSION_VERSION" ] && [ "$KDE_SESSION_VERSION" -ge 5 ]; then +@@ -130,15 +83,6 @@ open_kde() + + open_gnome3() + { +- local client +- local desktop +- desktop=`xdg-mime query default "x-scheme-handler/mailto"` +- client=`desktop_file_to_binary "$desktop"` +- echo $client | grep -E 'thunderbird|icedove' > /dev/null 2>&1 +- if [ $? -eq 0 ] ; then +- run_thunderbird "$client" "$1" +- fi +- + if gio help open 2>/dev/null 1>&2; then + DEBUG 1 "Running gio open \"$1\"" + gio open "$1" +@@ -159,13 +103,6 @@ open_gnome3() + + open_gnome() + { +- local client +- client=`gconftool-2 --get /desktop/gnome/url-handlers/mailto/command | cut -d ' ' -f 1` || "" +- echo $client | grep -E 'thunderbird|icedove' > /dev/null 2>&1 +- if [ $? -eq 0 ] ; then +- run_thunderbird "$client" "$1" +- fi +- + if gio help open 2>/dev/null 1>&2; then + DEBUG 1 "Running gio open \"$1\"" + gio open "$1" +@@ -231,15 +168,6 @@ open_flatpak() + + open_generic() + { +- local client +- local desktop +- desktop=`xdg-mime query default "x-scheme-handler/mailto"` +- client=`desktop_file_to_binary "$desktop"` +- echo $client | grep -E 'thunderbird|icedove' > /dev/null 2>&1 +- if [ $? -eq 0 ] ; then +- run_thunderbird "$client" "$1" +- fi +- + xdg-open "$1" + local ret=$? + +@@ -364,21 +292,6 @@ while [ $# -gt 0 ] ; do + shift + ;; + +- --attach) +- if [ -z "$1" ] ; then +- exit_failure_syntax "file argument missing for --attach option" +- fi +- check_input_file "$1" +- file=`readlink -f "$1"` # Normalize path +- if [ -z "$file" ] || [ ! -f "$file" ] ; then +- exit_failure_file_missing "file '$1' does not exist" +- fi +- +- url_encode "$file" +- options="${options}attach=${result}&" +- shift +- ;; +- + -*) + exit_failure_syntax "unexpected option '$parm'" + ;;
meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb +1 -0
@@ -21,6 +21,7 @@ SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ file://0001-Reinstate-xdg-terminal.patch \ file://0001-Don-t-build-the-in-script-manual.patch \ file://1f199813e0eb0246f63b54e9e154970e609575af.patch \ + file://CVE-2020-27748.patch \ " SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff"
Signature · 1 line
2.34.1
PATCH 2/26 xdg-utils: Fix CVE number
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
In the previous commit I somehow mixed up and used an incorrect CVE number. Use the correct one.
---
.../xdg-utils/{CVE-2020-27748.patch => CVE-2022-4055.patch} | 2 +-
meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/xdg-utils/xdg-utils/{CVE-2020-27748.patch => CVE-2022-4055.patch} (99%)meta/recipes-extended/xdg-utils/xdg-utils/CVE-2022-4055.patch renamed from meta/recipes-extended/xdg-utils/xdg-utils/CVE-2020-27748.patch +1 -1
@@ -14,7 +14,7 @@ Upstream-Status: Submitted [https://gitlab.freedesktop.org/xdg/xdg-utils/-/issue Signed-off-by: Richard Purdie <[email protected]> -CVE: CVE-2020-27748 +CVE: CVE-2022-4055 Index: xdg-utils-1.1.3/scripts/xdg-email.in
meta/recipes-extended/xdg-utils/xdg-utils_1.1.3.bb +1 -1
@@ -21,7 +21,7 @@ SRC_URI = "https://portland.freedesktop.org/download/${BPN}-${PV}.tar.gz \ file://0001-Reinstate-xdg-terminal.patch \ file://0001-Don-t-build-the-in-script-manual.patch \ file://1f199813e0eb0246f63b54e9e154970e609575af.patch \ - file://CVE-2020-27748.patch \ + file://CVE-2022-4055.patch \ " SRC_URI[md5sum] = "902042508b626027a3709d105f0b63ff"
Signature · 1 line
2.34.1
PATCH 3/26 tzdata: upgrade to 2023c
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
Drop a backport patch as it is now integrated.
--- meta/recipes-extended/timezone/timezone.inc | 6 +- .../timezone/tzcode-native.bb | 2 - ...0001-Fix-C23-related-conformance-bug.patch | 301 ------------------ 3 files changed, 3 insertions(+), 306 deletions(-) delete mode 100644 meta/recipes-extended/timezone/tzcode/0001-Fix-C23-related-conformance-bug.patch
meta/recipes-extended/timezone/timezone.inc +3 -3
@@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2022g" +PV = "2023c" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode;subdir=tz \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata;subdir=tz \
@@ -16,5 +16,5 @@ S = "${WORKDIR}/tz" UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "9610bb0b9656ff404c361a41f3286da53064b5469d84f00c9cb2314c8614da74" -SRC_URI[tzdata.sha256sum] = "4491db8281ae94a84d939e427bdd83dc389f26764d27d9a5c52d782c16764478" +SRC_URI[tzcode.sha256sum] = "46d17f2bb19ad73290f03a203006152e0fa0d7b11e5b71467c4a823811b214e7" +SRC_URI[tzdata.sha256sum] = "3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c"
meta/recipes-extended/timezone/tzcode-native.bb +0 -2
@@ -2,8 +2,6 @@ require timezone.inc SUMMARY = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect" -SRC_URI += "file://0001-Fix-C23-related-conformance-bug.patch" - inherit native EXTRA_OEMAKE += "cc='${CC}'"
meta/recipes-extended/timezone/tzcode/0001-Fix-C23-related-conformance-bug.patch deleted +0 -301
301 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 4/26 uninative: Upgrade to 3.9 to include glibc 2.37
In reply to Steve SakomanFrom: Michael Halstead <[email protected]>
Update uninative to work with the new glibc 2.37.
--- meta/conf/distro/include/yocto-uninative.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/conf/distro/include/yocto-uninative.inc +5 -5
@@ -6,10 +6,10 @@ # to the distro running on the build machine. # -UNINATIVE_MAXGLIBCVERSION = "2.36" -UNINATIVE_VERSION = "3.8.1" +UNINATIVE_MAXGLIBCVERSION = "2.37" +UNINATIVE_VERSION = "3.9" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "3f15d420049b21854bd7a8843da0f42f17064559492c8b752d7a6f998ff5ea65" -UNINATIVE_CHECKSUM[i686] ?= "a6dcf316d738ade2e5e463bd3b33a270b4bfc25bba41770ad5cbdc3b0e24044c" -UNINATIVE_CHECKSUM[x86_64] ?= "5fab9a5c97fc73a21134e5a81f74498cbaecda75d56aab971c934e0b803bcc00" +UNINATIVE_CHECKSUM[aarch64] ?= "de35708c95c34573af140da910132c3291ba4fd26ebf7b74b755ada432cdf07b" +UNINATIVE_CHECKSUM[i686] ?= "adac07b08adb88eb26fc7fd87fee0cec9d5be167bf7c5ffd3a549a2a6699c29c" +UNINATIVE_CHECKSUM[x86_64] ?= "3dd82c3fbdb59e87bf091c3eef555a05fae528eeda3083828f76cd4deaceca8b"
Signature · 1 line
2.34.1
PATCH 5/26 filemap.py: enforce maximum of 4kb block size
In reply to Steve SakomanFrom: Andrew Geissler <[email protected]>
The logic in this script validates that the length of data sections are evenly divisible by the block size. On most systems the block size is 4KB and all is good. Some systems though, such as ppc64le, have a block size larger then 4KB. For example on a POWER9 based ppc64le system, the block size is 64KB.
This results in this script failing with errors like this when building wic images:
|440, in _do_get_mapped_ranges | assert extent_len % self.block_size == 0 | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | AssertionError
In this case the data section size was 268KB and the block size was 64KB, resulting in the above assert failure.
Resolves https://bugzilla.yoctoproject.org/show_bug.cgi?id=15075
--- scripts/lib/wic/filemap.py | 7 +++++++ 1 file changed, 7 insertions(+)
scripts/lib/wic/filemap.py +7 -0
@@ -46,6 +46,13 @@ def get_block_size(file_obj): bsize = stat.st_blksize else: raise IOError("Unable to determine block size") + + # The logic in this script only supports a maximum of a 4KB + # block size + max_block_size = 4 * 1024 + if bsize > max_block_size: + bsize = max_block_size + return bsize class ErrorNotSupp(Exception):
Signature · 1 line
2.34.1
PATCH 6/26 oeqs/selftest: OESelftestTestContext: replace the os.environ after subprocess.check_output
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
No function change but is needed to simplify the next patch.
--- meta/lib/oeqa/selftest/context.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
meta/lib/oeqa/selftest/context.py +5 -5
@@ -86,17 +86,17 @@ class OESelftestTestContext(OETestContext): oe.path.copytree(builddir + "/cache", newbuilddir + "/cache") oe.path.copytree(selftestdir, newselftestdir) + subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) + + # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow + subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + for e in os.environ: if builddir + "/" in os.environ[e]: os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/") if os.environ[e].endswith(builddir): os.environ[e] = os.environ[e].replace(builddir, newbuilddir) - subprocess.check_output("git init; git add *; git commit -a -m 'initial'", cwd=newselftestdir, shell=True) - - # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow - subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) - os.chdir(newbuilddir) def patch_test(t):
Signature · 1 line
2.34.1
PATCH 7/26 oeqa/selftest: OESelftestTestContext: convert relative to full path when newbuilddir is provided
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
Relative paths in BBLAYERS only works when the new build dir are on the same ascending directory node:
.
├── build ├── build-st
It works because they share the same ascending relative directory node.
So use the full path when the argument newbuilddir is provided to make the oe-selftest work everywere regardless of the location chosen.
--- meta/lib/oeqa/selftest/context.py | 10 ++++++++++ 1 file changed, 10 insertions(+)
meta/lib/oeqa/selftest/context.py +10 -0
@@ -91,6 +91,16 @@ class OESelftestTestContext(OETestContext): # Tried to used bitbake-layers add/remove but it requires recipe parsing and hence is too slow subprocess.check_output("sed %s/conf/bblayers.conf -i -e 's#%s#%s#g'" % (newbuilddir, selftestdir, newselftestdir), cwd=newbuilddir, shell=True) + # Relative paths in BBLAYERS only works when the new build dir share the same ascending node + if self.newbuilddir: + bblayers = subprocess.check_output("bitbake-getvar --value BBLAYERS | tail -1", cwd=builddir, shell=True, text=True) + if '..' in bblayers: + bblayers_abspath = [os.path.abspath(path) for path in bblayers.split()] + with open("%s/conf/bblayers.conf" % newbuilddir, "a") as f: + newbblayers = "# new bblayers to be used by selftest in the new build dir '%s'\n" % newbuilddir + newbblayers += 'BBLAYERS = "%s"\n' % ' '.join(bblayers_abspath) + f.write(newbblayers) + for e in os.environ: if builddir + "/" in os.environ[e]: os.environ[e] = os.environ[e].replace(builddir + "/", newbuilddir + "/")
Signature · 1 line
2.34.1
PATCH 8/26 oeqa/selftest/reproducible: Split different packages from missing packages output
In reply to Steve SakomanFrom: Jose Quaresma <[email protected]>
When we provide sstate_targets recipes they are reported as missing which is not quite correct because they are proveided to cut build/debugging time.
--- meta/lib/oeqa/selftest/cases/reproducible.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
meta/lib/oeqa/selftest/cases/reproducible.py +7 -3
@@ -292,9 +292,13 @@ class ReproducibleTests(OESelftestTestCase): self.copy_file(d.reference, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.reference)])) self.copy_file(d.test, '/'.join([save_dir, 'packages-excluded', strip_topdir(d.test)])) - if result.missing or result.different: - fails.append("The following %s packages are missing or different and not in exclusion list: %s" % - (c, '\n'.join(r.test for r in (result.missing + result.different)))) + if result.different: + fails.append("The following %s packages are different and not in exclusion list:\n%s" % + (c, '\n'.join(r.test for r in (result.different)))) + + if result.missing and len(self.sstate_targets) == 0: + fails.append("The following %s packages are missing and not in exclusion list:\n%s" % + (c, '\n'.join(r.test for r in (result.missing)))) # Clean up empty directories if self.save_results:
Signature · 1 line
2.34.1
PATCH 9/26 run-postinsts: Set dependency for ldconfig to avoid boot issues
In reply to Steve SakomanFrom: Arturo Buzarra <[email protected]>
If a package with a postsints script requires ldconfig, the package class adds a ldconfig postinst fragment to initialize it before. Systemd has its own ldconfig.service to initialize it and sometimes if both services are running at the same time in the first boot, the first one will work, but the second one will fail with the following error:
ldconfig[141]: /sbin/ldconfig: Renaming of /etc/ld.so.cache~ to /etc/ld.so.cache failed: No such file or directory
This commit adds a ordering dependency between them to make sure that only one service is running at the same time.
--- .../run-postinsts/run-postinsts/run-postinsts.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/run-postinsts/run-postinsts/run-postinsts.service +1 -1
@@ -1,7 +1,7 @@ [Unit] Description=Run pending postinsts DefaultDependencies=no -After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount +After=systemd-remount-fs.service systemd-tmpfiles-setup.service tmp.mount ldconfig.service Before=sysinit.target [Service]
Signature · 1 line
2.34.1
PATCH 10/26 package.bbclass: check packages name conflict in do_package
In reply to Steve SakomanFrom: Fawzi KHABER <[email protected]>
It is possible to rename packages with the macro PKG:${PN} and result in a package name conflict if the target name exists already.
Add a fatal check to prevent this issue to go unnoticed.
Fix [Yocto #12060]
--- meta/classes-global/package.bbclass | 9 +++++++++ 1 file changed, 9 insertions(+)
meta/classes-global/package.bbclass +9 -0
@@ -2449,6 +2449,15 @@ python do_package () { bb.build.exec_func("package_convert_pr_autoinc", d) + # Check for conflict between renamed packages and existing ones + # for each package in PACKAGES, check if it will be renamed to an existing one + for p in packages: + localdata = bb.data.createCopy(d) + localdata.setVar('OVERRIDES', p) + rename = localdata.getVar('PKG') + if (rename != None) and rename in packages: + bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists'%(p,rename,p)) + ########################################################################### # Optimisations ###########################################################################
Signature · 1 line
2.34.1
PATCH 11/26 oeqa/selftest/cases/package.py: adding unittest for package rename conflicts
In reply to Steve SakomanFrom: Fawzi KHABER <[email protected]>
This Unittest tries to rename a package, using an already used name and fails on do_package.
--- .../packagenameconflict/packagenameconflict.bb | 10 ++++++++++ meta/lib/oeqa/selftest/cases/package.py | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 meta-selftest/recipes-test/packagenameconflict/packagenameconflict.bb
meta-selftest/recipes-test/packagenameconflict/packagenameconflict.bb new file +10 -0
@@ -0,0 +1,10 @@ +SUMMARY = "Test case that tries to rename a package to an existing one and fails" +DESCRIPTION = "This generates a packaging error when a package is renamed to a pre-existing name" +LICENSE = "MIT" + +# Add a new package ${PN}-renametest +PACKAGES += "${PN}-renametest" +# ... and try to rename the ${PN}-dev to the new ${PN}-renametest (conflict) +PKG:${PN}-dev = "${PN}-renametest" + +EXCLUDE_FROM_WORLD = "1"
meta/lib/oeqa/selftest/cases/package.py +7 -0
@@ -89,6 +89,13 @@ class VersionOrdering(OESelftestTestCase): self.assertEqual(status - 100, sort, "%s %s (%d) failed" % (ver1, ver2, sort)) class PackageTests(OESelftestTestCase): + # Verify that a recipe cannot rename a package into an existing one + def test_package_name_conflict(self): + res = bitbake("packagenameconflict", ignore_status=True) + self.assertNotEqual(res.status, 0) + err = "package name already exists" + self.assertTrue(err in res.output) + # Verify that a recipe which sets up hardlink files has those preserved into split packages # Also test file sparseness is preserved def test_preserve_sparse_hardlinks(self):
Signature · 1 line
2.34.1
PATCH 12/26 Revert "runqemu: Add workaround for APIC hang on pre 4.15 kernels on qemux86"
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
This reverts commit 82e67b82ea8e12aa0b7b9db1d84fec0436dec71b.
It was commited as part of https://bugzilla.yoctoproject.org/show_bug.cgi?id=12301
for kernels < 4.15, as of now oldest builder kernel we have is 4.15 on ubuntu 18.04 so we should not require this workaround. Moreover, this fixes an smp problem with qemux86 where no matter what -smp <x> option is used, qemu always starts with single core.
--- scripts/runqemu | 5 ----- 1 file changed, 5 deletions(-)
scripts/runqemu +0 -5
@@ -591,11 +591,6 @@ class BaseConfig(object): if os.access(dev_kvm, os.W_OK|os.R_OK): self.qemu_opt_script += ' -enable-kvm' - if self.get('MACHINE') == "qemux86": - # Workaround for broken APIC window on pre 4.15 host kernels which causes boot hangs - # See YOCTO #12301 - # On 64 bit we use x2apic - self.kernel_cmdline_script += " clocksource=kvm-clock hpet=disable noapic nolapic" else: logger.error("You have no read or write permission on /dev/kvm.") logger.error("Please change the ownership of this file as described at:")
Signature · 1 line
2.34.1
PATCH 13/26 lib/oe/gpg_sign.py: Avoid race when creating .sig files in detach_sign
In reply to Steve SakomanFrom: Tobias Hagelborn <[email protected]>
Move the signature file into place only after it is successfully signed. This to avoid race and corrupted .sig files in cases multiple onging builds write to a shared sstate-cache dir.
--- meta/lib/oe/gpg_sign.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
meta/lib/oe/gpg_sign.py +17 -10
@@ -5,11 +5,12 @@ # """Helper module for GPG signing""" -import os import bb -import subprocess +import os import shlex +import subprocess +import tempfile class LocalSigner(object): """Class for handling local (on the build host) signing"""
@@ -73,8 +74,6 @@ class LocalSigner(object): cmd += ['--homedir', self.gpg_path] if armor: cmd += ['--armor'] - if output_suffix: - cmd += ['-o', input_file + "." + output_suffix] if use_sha256: cmd += ['--digest-algo', "SHA256"]
@@ -83,19 +82,27 @@ class LocalSigner(object): if self.gpg_version > (2,1,): cmd += ['--pinentry-mode', 'loopback'] - cmd += [input_file] - try: if passphrase_file: with open(passphrase_file) as fobj: passphrase = fobj.readline(); - job = subprocess.Popen(cmd, stdin=subprocess.PIPE, stderr=subprocess.PIPE) - (_, stderr) = job.communicate(passphrase.encode("utf-8")) + if not output_suffix: + output_suffix = 'asc' if armor else 'sig' + output_file = input_file + "." + output_suffix + with tempfile.TemporaryDirectory(dir=os.path.dirname(output_file)) as tmp_dir: + tmp_file = os.path.join(tmp_dir, os.path.basename(output_file)) + cmd += ['-o', tmp_file] + + cmd += [input_file] + + job = subprocess.Popen(cmd, stdin=subprocess.PIPE, stderr=subprocess.PIPE) + (_, stderr) = job.communicate(passphrase.encode("utf-8")) - if job.returncode: - bb.fatal("GPG exited with code %d: %s" % (job.returncode, stderr.decode("utf-8"))) + if job.returncode: + bb.fatal("GPG exited with code %d: %s" % (job.returncode, stderr.decode("utf-8"))) + os.rename(tmp_file, output_file) except IOError as e: bb.error("IO error (%s): %s" % (e.errno, e.strerror)) raise Exception("Failed to sign '%s'" % input_file)
Signature · 1 line
2.34.1
PATCH 14/26 oeqa/selftest/cases/runqemu: update imports
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
'tempfile' and 'oeqa.utils.command.runCmd' are unused while 'os' is actually used.
--- meta/lib/oeqa/selftest/cases/runqemu.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/cases/runqemu.py +2 -2
@@ -4,13 +4,13 @@ # SPDX-License-Identifier: MIT # +import os import re -import tempfile import time import oe.types from oeqa.core.decorator import OETestTag from oeqa.selftest.case import OESelftestTestCase -from oeqa.utils.commands import bitbake, runqemu, get_bb_var, runCmd +from oeqa.utils.commands import bitbake, runqemu, get_bb_var @OETestTag("runqemu") class RunqemuTests(OESelftestTestCase):
Signature · 1 line
2.34.1
PATCH 15/26 oeqa/targetcontrol: fix misspelled RuntimeError
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
--- meta/lib/oeqa/targetcontrol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/targetcontrol.py +1 -1
@@ -205,7 +205,7 @@ class QemuTarget(BaseTarget): self.server_ip = self.runner.server_ip self.connection = SSHControl(ip=self.ip, logfile=self.sshlog) else: - raise RuntimError("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn) + raise RuntimeError("%s - FAILED to re-start qemu - check the task log and the boot log" % self.pn) def run_serial(self, command, timeout=60): return self.runner.run_serial(command, timeout=timeout)
Signature · 1 line
2.34.1
PATCH 16/26 oeqa/targetcontrol: do not set dump_host_cmds redundantly
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
This is already set above, thus simply use the set value from there.
--- meta/lib/oeqa/targetcontrol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oeqa/targetcontrol.py +1 -1
@@ -145,7 +145,7 @@ class QemuTarget(BaseTarget): boottime = int(d.getVar("TEST_QEMUBOOT_TIMEOUT")), use_kvm = use_kvm, dump_dir = dump_dir, - dump_host_cmds = d.getVar("testimage_dump_host"), + dump_host_cmds = dump_host_cmds, logger = logger, tmpfsdir = d.getVar("RUNQEMU_TMPFS_DIR"), serial_ports = len(d.getVar("SERIAL_CONSOLES").split()))
Signature · 1 line
2.34.1
PATCH 17/26 oeqa/targetcontrol: remove unused imports
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
--- meta/lib/oeqa/targetcontrol.py | 4 ---- 1 file changed, 4 deletions(-)
meta/lib/oeqa/targetcontrol.py +0 -4
@@ -7,18 +7,14 @@ # This module is used by testimage.bbclass for setting up and controlling a target machine. import os -import shutil import subprocess import bb -import traceback -import sys import logging from oeqa.utils.sshcontrol import SSHControl from oeqa.utils.qemurunner import QemuRunner from oeqa.utils.qemutinyrunner import QemuTinyRunner from oeqa.utils.dump import TargetDumper from oeqa.utils.dump import MonitorDumper -from oeqa.controllers.testtargetloader import TestTargetLoader from abc import ABCMeta, abstractmethod class BaseTarget(object, metaclass=ABCMeta):
Signature · 1 line
2.34.1
PATCH 18/26 oeqa/utils/commands: fix usage of undefined EPIPE
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
--- meta/lib/oeqa/utils/commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/utils/commands.py +2 -1
@@ -21,6 +21,7 @@ from oeqa.utils import CommandError from oeqa.utils import ftools import re import contextlib +import errno # Export test doesn't require bb try: import bb
@@ -85,7 +86,7 @@ class Command(object): except OSError as ex: # It's not an error when the command does not consume all # of our data. subprocess.communicate() also ignores that. - if ex.errno != EPIPE: + if ex.errno != errno.EPIPE: raise # We write in a separate thread because then we can read
Signature · 1 line
2.34.1
PATCH 19/26 oeqa/utils/commands: remove unused imports
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
--- meta/lib/oeqa/utils/commands.py | 3 --- 1 file changed, 3 deletions(-)
meta/lib/oeqa/utils/commands.py +0 -3
@@ -8,11 +8,8 @@ # This module is mainly used by scripts/oe-selftest and modules under meta/oeqa/selftest # It provides a class and methods for running commands on the host in a convienent way for tests. - - import os import sys -import signal import subprocess import threading import time
Signature · 1 line
2.34.1
PATCH 20/26 oeqa/utils/qemurunner: replace hard-coded user 'root' in debug output
In reply to Steve SakomanFrom: Enrico Jörns <[email protected]>
Since login user is configurable with boot_patterns['send_login_user'], unconditionally using 'root' in the debug message can be confusing.
Also fix the debug message to say 'Logged in' instead of 'Logged'.
--- meta/lib/oeqa/utils/qemurunner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/utils/qemurunner.py +2 -2
@@ -511,7 +511,7 @@ class QemuRunner: (status, output) = self.run_serial(self.boot_patterns['send_login_user'], raw=True, timeout=120) if re.search(self.boot_patterns['search_login_succeeded'], output): self.logged = True - self.logger.debug("Logged as root in serial console") + self.logger.debug("Logged in as %s in serial console" % self.boot_patterns['send_login_user'].replace("\n", "")) if netconf: # configure guest networking cmd = "ifconfig eth0 %s netmask %s up\n" % (self.ip, self.netmask)
@@ -522,7 +522,7 @@ class QemuRunner: self.logger.debug("Couldn't configure guest networking") else: self.logger.warning("Couldn't login into serial console" - " as root using blank password") + " as %s using blank password" % self.boot_patterns['send_login_user'].replace("\n", "")) self.logger.warning("The output:\n%s" % output) except: self.logger.warning("Serial console failed while trying to login")
Signature · 1 line
2.34.1
PATCH 21/26 selftest: runqemu: better check for ROOTFS: in the log
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
* it was searching for line like this:
ROOTFS: [/OE/build/poky/build/build-st-2023-03-20-esdk-runqemu-patch1/runqemu.RunqemuTests.test_boot_machine_ext4/build-st/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64-20230320081121.rootfs.ext4] but with IMAGE_NAME_SUFFIX changed to something else than default ".rootfs"
or with my pending changes the line looks like this:
ROOTFS: [/OE/build/poky/build/build-st-2023-03-20-esdk-runqemu-patch2/runqemu.RunqemuTests.test_boot_machine_ext4/build-st/tmp/deploy/images/qemux86-64/core-image-minimal-qemux86-64.rootfs-20230320085744.ext4] and test was failing.
* Check for whole line starting with ROOTFS: and ending just with .ext4
[YOCTO #12937]
--- meta/lib/oeqa/selftest/cases/runqemu.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oeqa/selftest/cases/runqemu.py +2 -1
@@ -57,7 +57,8 @@ SYSLINUX_TIMEOUT = "10" cmd = "%s %s ext4" % (self.cmd_common, self.machine) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('rootfs.ext4', f.read(), "Failed: %s" % cmd) + regexp = r'\nROOTFS: .*\.ext4]\n' + self.assertRegex(f.read(), regexp, "Failed to find '%s' in '%s' after running '%s'" % (regexp, qemu.qemurunnerlog, cmd)) def test_boot_machine_iso(self): """Test runqemu machine iso"""
Signature · 1 line
2.34.1
PATCH 22/26 selftest: runqemu: use better error message when asserts fail
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
* It was showing whole log and that the runqemu command failed, but not where the log file is, nor why it thinks the runqemu failed
[YOCTO #12937]
--- meta/lib/oeqa/selftest/cases/runqemu.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
meta/lib/oeqa/selftest/cases/runqemu.py +6 -3
@@ -65,7 +65,8 @@ SYSLINUX_TIMEOUT = "10" cmd = "%s %s iso" % (self.cmd_common, self.machine) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('media=cdrom', f.read(), "Failed: %s" % cmd) + text_in = 'media=cdrom' + self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) def test_boot_recipe_image(self): """Test runqemu recipe-image"""
@@ -80,14 +81,16 @@ SYSLINUX_TIMEOUT = "10" cmd = "%s %s wic.vmdk" % (self.cmd_common, self.recipe) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('format=vmdk', f.read(), "Failed: %s" % cmd) + text_in = 'format=vmdk' + self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) def test_boot_recipe_image_vdi(self): """Test runqemu recipe-image vdi""" cmd = "%s %s wic.vdi" % (self.cmd_common, self.recipe) with runqemu(self.recipe, ssh=False, launch_cmd=cmd) as qemu: with open(qemu.qemurunnerlog) as f: - self.assertIn('format=vdi', f.read(), "Failed: %s" % cmd) + text_in = 'format=vdi' + self.assertIn(text_in, f.read(), "Failed to find '%s' in '%s' after running '%s'" % (text_in, qemu.qemurunnerlog, cmd)) def test_boot_deploy(self): """Test runqemu deploy_dir_image"""
Signature · 1 line
2.34.1
PATCH 23/26 oeqa/runtime: clean up deprecated backslash expansion
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
--- meta/lib/oeqa/runtime/cases/apt.py | 4 ++-- meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +++++-- meta/lib/oeqa/runtime/cases/systemd.py | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)
meta/lib/oeqa/runtime/cases/apt.py +2 -2
@@ -39,9 +39,9 @@ class AptRepoTest(AptTest): self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server)) def setup_source_config_for_package_install_signed(self): - apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port) + apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port) apt_get_sourceslist_dir = '/etc/apt/' - self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server)) def cleanup_source_config_for_package_install(self): apt_get_sourceslist_dir = '/etc/apt/'
meta/lib/oeqa/runtime/cases/buildcpio.py +5 -2
@@ -29,7 +29,10 @@ class BuildCpioTest(OERuntimeTestCase): @OEHasPackage(['autoconf']) def test_cpio(self): self.project.download_archive() - self.project.run_configure('--disable-maintainer-mode', - 'sed -i -e "/char \*program_name/d" src/global.c;') + self.project.run_configure('--disable-maintainer-mode') + # This sed is needed until + # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb + # is in a release. + self.project._run(r'sed -i -e "/char \*program_name/d" %s/src/global.c' % self.project.targetdir) self.project.run_make() self.project.run_install()
meta/lib/oeqa/runtime/cases/systemd.py +1 -1
@@ -154,7 +154,7 @@ class SystemdJournalTests(SystemdTest): """ # The expression chain that uniquely identifies the time boot message. - expr_items=['Startup finished', 'kernel', 'userspace','\.$'] + expr_items=['Startup finished', 'kernel', 'userspace', r'\.$'] try: output = self.journalctl(args='-o cat --reverse') except AssertionError:
Signature · 1 line
2.34.1
PATCH 24/26 shadow: Fix can not print full login timeout message
In reply to Steve SakomanFrom: Soumya <[email protected]>
When we do not enter password during login, it is expected to display message "Login timed out after 60 seconds". But it prints only first few bytes(like "Login t") when write is immediately followed by exit. Fix - Calling exit from new handler provides enough time to display full message.
Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c]
--- .../0001-Fix-can-not-print-full-login.patch | 41 +++++++++++++++++++ meta/recipes-extended/shadow/shadow.inc | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch
meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch new file +41 -0
@@ -0,0 +1,41 @@ +commit 670cae834827a8f794e6f7464fa57790d911b63c +Author: SoumyaWind <[email protected]> +Date: Tue Dec 27 17:40:17 2022 +0530 + + shadow: Fix can not print full login timeout message + + Login timed out message prints only first few bytes when write is immediately followed by exit. + Calling exit from new handler provides enough time to display full message. + +Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] + +diff --git a/src/login.c b/src/login.c +index 116e2cb3..c55f4de0 100644 +--- a/src/login.c ++++ b/src/login.c +@@ -120,6 +120,7 @@ static void get_pam_user (char **ptr_pam_user); + + static void init_env (void); + static void alarm_handler (int); ++static void exit_handler (int); + + /* + * usage - print login command usage and exit +@@ -391,11 +392,16 @@ static void init_env (void) + #endif /* !USE_PAM */ + } + ++static void exit_handler (unused int sig) ++{ ++ _exit (0); ++} + + static void alarm_handler (unused int sig) + { + write (STDERR_FILENO, tmsg, strlen (tmsg)); +- _exit (0); ++ signal(SIGALRM, exit_handler); ++ alarm(2); + } + + #ifdef USE_PAM
meta/recipes-extended/shadow/shadow.inc +1 -0
@@ -15,6 +15,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \ file://0001-shadow-use-relaxed-usernames.patch \ ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ file://useradd \ + file://0001-Fix-can-not-print-full-login.patch \ " SRC_URI:append:class-target = " \
Signature · 1 line
2.34.1
PATCH 25/26 runqemu: respect IMAGE_LINK_NAME
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
* when searching for qemuboot.conf
* don't assume that IMAGE_LINK_NAME is always <rootfs>-<machine> (with <rootfs>-<machine>.qemuboot.conf)
* runqemu: use IMAGE_LINK_NAME set by testimage.bbclass or query with bitbake -e
* testimage.bbclass was setting DEPLOY_DIR which I don't see used anywhere else, so I assume it was supposed to be DEPLOY_DIR_IMAGE as mentioned in corresponding runqemu code, do the same with IMAGE_LINK_NAME variable
* add virtual/kernel as bitbake -e target in run_bitbake_env to make sure IMAGE_LINK_NAME is defined (kernel-artifact-names.bbclass inherits image-artifact-names.bbclass as well)
* improve .qemuboot.conf search
1st search for file matching the rootfs and only when not found try again with .rootfs suffix removed
[YOCTO #12937]
--- meta/classes-recipe/testimage.bbclass | 2 +- scripts/runqemu | 69 ++++++++++++++++++++------- 2 files changed, 52 insertions(+), 19 deletions(-)
meta/classes-recipe/testimage.bbclass +1 -1
@@ -98,7 +98,7 @@ TESTIMAGELOCK:qemuall = "" TESTIMAGE_DUMP_DIR ?= "${LOG_DIR}/runtime-hostdump/" -TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR" +TESTIMAGE_UPDATE_VARS ?= "DL_DIR WORKDIR DEPLOY_DIR_IMAGE IMAGE_LINK_NAME" testimage_dump_target () { top -bn1
scripts/runqemu +51 -18
132 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 26/26 report-error: catch Nothing PROVIDES error
In reply to Steve SakomanFrom: Mingli Yu <[email protected]>
Make the report-error catch Nothing PROVIDES error and then we can check it directly via error report web.
--- meta/classes/report-error.bbclass | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
meta/classes/report-error.bbclass +26 -1
@@ -107,6 +107,31 @@ python errorreport_handler () { errorreport_savedata(e, jsondata, "error-report.txt") bb.utils.unlockfile(lock) + elif isinstance(e, bb.event.NoProvider): + bb.utils.mkdirhier(logpath) + data = {} + machine = e.data.getVar("MACHINE") + data['machine'] = machine + data['build_sys'] = e.data.getVar("BUILD_SYS") + data['nativelsb'] = nativelsb() + data['distro'] = e.data.getVar("DISTRO") + data['target_sys'] = e.data.getVar("TARGET_SYS") + data['failures'] = [] + data['component'] = str(e._item) + data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data)) + data['bitbake_version'] = e.data.getVar("BB_VERSION") + data['layer_version'] = get_layers_branch_rev(e.data) + data['local_conf'] = get_conf_data(e, 'local.conf') + data['auto_conf'] = get_conf_data(e, 'auto.conf') + taskdata={} + taskdata['log'] = str(e) + taskdata['package'] = str(e._item) + taskdata['task'] = "Nothing provides " + "'" + str(e._item) + "'" + data['failures'].append(taskdata) + lock = bb.utils.lockfile(datafile + '.lock') + errorreport_savedata(e, data, "error-report.txt") + bb.utils.unlockfile(lock) + elif isinstance(e, bb.event.BuildCompleted): lock = bb.utils.lockfile(datafile + '.lock') jsondata = json.loads(errorreport_getdata(e))
@@ -120,4 +145,4 @@ python errorreport_handler () { } addhandler errorreport_handler -errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed" +errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider"
Signature · 1 line
2.34.1