| Message ID | 20231219143531.3514266-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | 599ac08a6f6fb3f6a89a897c8e06367c63c2f979 |
| Headers | show |
| Series | [1/5] testimage: Exclude wtmp from target-dumper commands | expand |
On Tue, 2023-12-19 at 14:35 +0000, Richard Purdie via lists.openembedded.org wrote: > If you build openssh, bump the version of base-passwd, then rerun openssh:do_create_spdx, > it will fail due to references to the old version of base-passwd. This is due to > base-passwd being listed in SIGGEN_EXCLUDERECIPES_ABISAFE. > > Ignore these recipes for the purposes of create_spdx and force rebuilds when things change. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > meta/lib/oe/sstatesig.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py > index 0342bcdc87a..1434690f1d1 100644 > --- a/meta/lib/oe/sstatesig.py > +++ b/meta/lib/oe/sstatesig.py > @@ -63,7 +63,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCaches): > return False > > # Exclude well defined machine specific configurations which don't change ABI > - if depname in siggen.abisaferecipes and not isImage(mc, fn): > + if depname in siggen.abisaferecipes and not isImage(mc, fn) and deptaskname != "do_create_spdx": > return False > > # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum This fails in testing: https://autobuilder.yoctoproject.org/typhoon/#/builders/80/builds/6158/steps/14/logs/stdio since the tune sdpx sigs and the allarch sigs are no longer stable :(. Not sure what we can do here... Cheers, Richard
diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index 7c56fe9674c..c6b7a1e142f 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -121,7 +121,7 @@ testimage_dump_target () { netstat -an ip address # Next command will dump logs from /var/log/ - find /var/log/ -type f 2>/dev/null -exec echo "====================" \; -exec echo {} \; -exec echo "====================" \; -exec cat {} \; -exec echo "" \; + find /var/log/ -type f -name !wtmp* 2>/dev/null -exec echo "====================" \; -exec echo {} \; -exec echo "====================" \; -exec cat {} \; -exec echo "" \; } testimage_dump_monitor () {
wtmp is filled with binary data which the run_serial command can't cope with. Catting this results in confusion of the serial interface and potentially large backlogs of data in the buffers which can hang qemu. Exclude the problematic files from the command. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/classes-recipe/testimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)