Re: [OE-core] [PATCH 097/114] strace: upgrade 6.17 -> 6.18

["Mathieu Dubois-Briand" <mathieu.dubois-briand@bootlin.com>]

On Mon Dec 22, 2025 at 9:07 PM CET, Alexander Kanavin via lists.openembedded.org wrote:
> From: Alexander Kanavin <alex@linutronix.de>
>
> Add a patch to skip tests with newly appeared failures.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---

Hi Alexander,

Thanks for your patches.

It did work well a first, but then the bpf patch got merged separately
[1] and now we have some clash between patches applied by the recipe:

ERROR: strace-6.18-r0 do_patch: Applying patch '0001-tests-skip-bpf-tests.patch' on target directory '/srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/core2-64-poky-linux/strace/6.18/sources/strace-6.18'
CmdError('quilt --quiltrc /srv/pokybuild/yocto-worker/genericx86-64/build/build/tmp/work/core2-64-poky-linux/strace/6.18/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch 0001-tests-skip-bpf-tests.patch
patching file tests/bpf-v.gen.test
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file tests/bpf-v.gen.test
patching file tests/bpf.gen.test
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file tests/bpf.gen.test
Patch 0001-tests-skip-bpf-tests.patch does not apply (enforce with -f)

https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/2924

Do you mind to refresh the patch?

[1] https://git.openembedded.org/openembedded-core/commit/?id=640b43073dc5b185781e2789860af6a07560bcef

Thanks,
Mathieu

-- 
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com