Hi,
I am having problems applying kernel patches in the context of a Xilinx
Petalinux project (Yocto-based).
Xilinx provides a 5.4.0 kernel, according to make kernelconfig, though
how this corresponds to the upstream 5.4.0 kernel, I'm not sure.
My understanding is that, in order to apply the latest 5.4 rt patch
(106-rt54), I have to apply the upstream 106 patch first. Is this
correct?
When applying the patches using petalinux-config -c kernel, the
upstream patch appears to be accepted, but the rt patch is not. I get
the sequence of errors below, picked out in red.
I am not familiar enough with the kernel, or the Petalinux tools, to
get a handle on the problem. The log file mentioned at the bottom does
not exist following the completion of the command.
Is anyone able to help with this?
Many thanks,
Jack White
----------------------------------------------------------------------
ERROR: Could not apply patches for zynqmp-generic.
ERROR: Patch failures can be resolved in the linux source directory
/home/jack/ws_zcu102/petalinux/2021_03_25_Ubuntu_Petalinux/build/tmp/wo
rk/zynqmp_generic-xilinx-linux/linux-xlnx/5.4+gitAUTOINC+62ea514294-
r0/devtooltmp-rh17ls9u/workdir/source)
ERROR: Execution of
'/home/jack/ws_zcu102/petalinux/2021_03_25_Ubuntu_Petalinux/build/tmp/w
ork/zynqmp_generic-xilinx-linux/linux-xlnx/5.4+gitAUTOINC+62ea514294-
r0/devtooltmp-rh17ls9u/temp/run.do_patch.1045876' failed with exit code
1:
(1/1) patch-5.4.106-rt54.patch
[INFO]: check of .kernel-meta//patches//./patch-5.4.106-rt54.patch with
"git am" did not pass, trying reduced context.
[INFO]: Context reduced git-am of .kernel-meta//patches//./patch-
5.4.106-rt54.patch with "git am" did not work, trying "apply".
error: patch failed: arch/arm/kernel/smp.c:682
error: arch/arm/kernel/smp.c: patch does not apply
error: patch failed: arch/powerpc/Kconfig:222
error: arch/powerpc/Kconfig: patch does not apply
error: patch failed: arch/powerpc/kernel/traps.c:261
error: arch/powerpc/kernel/traps.c: patch does not apply
error: patch failed: arch/powerpc/platforms/pseries/iommu.c:209
error: arch/powerpc/platforms/pseries/iommu.c: patch does not apply
Context reduced to (1/1) to apply fragment at 25
Context reduced to (1/1) to apply fragment at 1727
error: patch failed: drivers/char/tpm/tpm_tis.c:50
error: drivers/char/tpm/tpm_tis.c: patch does not apply
error: patch failed: drivers/pci/switch/switchtec.c:175
error: drivers/pci/switch/switchtec.c: patch does not apply
Context reduced to (2/2) to apply fragment at 1975
Context reduced to (2/2) to apply fragment at 2082
error: patch failed: fs/jbd2/transaction.c:2331
error: fs/jbd2/transaction.c: patch does not apply
error: patch failed: fs/nfs/nfs4proc.c:2969
error: fs/nfs/nfs4proc.c: patch does not apply
error: patch failed: include/linux/genhd.h:755
error: include/linux/genhd.h: patch does not apply
error: patch failed: include/linux/printk.h:202
error: include/linux/printk.h: patch does not apply
error: patch failed: include/linux/sched/mm.h:49
error: include/linux/sched/mm.h: patch does not apply
error: patch failed: kernel/bpf/stackmap.c:290
error: kernel/bpf/stackmap.c: patch does not apply
error: patch failed: kernel/futex.c:1639
error: kernel/futex.c: patch does not apply
error: patch failed: kernel/locking/rtmutex_common.h:130
error: kernel/locking/rtmutex_common.h: patch does not apply
error: patch failed: kernel/printk/internal.h:1
error: kernel/printk/internal.h: patch does not apply
error: patch failed: kernel/printk/printk.c:452
error: kernel/printk/printk.c: patch does not apply
error: patch failed: kernel/printk/printk_safe.c:1
error: kernel/printk/printk_safe.c: patch does not apply
Context reduced to (2/2) to apply fragment at 767
Context reduced to (2/2) to apply fragment at 405
error: patch failed: kernel/signal.c:432
error: kernel/signal.c: patch does not apply
error: patch failed: kernel/trace/trace.c:3592
error: kernel/trace/trace.c: patch does not apply
error: patch failed: kernel/workqueue.c:2533
error: kernel/workqueue.c: patch does not apply
Context reduced to (1/1) to apply fragment at 1268
Context reduced to (2/2) to apply fragment at 1382
[ERROR]: Application of .kernel-meta//patches//./patch-5.4.106-
rt54.patch failed.
Patch needs to be refreshed. Sample resolution script:
.git/rebase-apply/resolve_rejects
WARNING:
/home/jack/ws_zcu102/petalinux/2021_03_25_Ubuntu_Petalinux/build/tmp/wo
rk/zynqmp_generic-xilinx-linux/linux-xlnx/5.4+gitAUTOINC+62ea514294-
r0/devtooltmp-rh17ls9u/temp/run.do_patch.1045876:1 exit 1 from 'exit 1'
ERROR: Logfile of failure stored in:
/home/jack/ws_zcu102/petalinux/2021_03_25_Ubuntu_Petalinux/build/tmp/wo
rk/zynqmp_generic-xilinx-linux/linux-xlnx/5.4+gitAUTOINC+62ea514294-
r0/devtooltmp-rh17ls9u/temp/log.do_patch.1045876
----------------------------------------------------------------------
