Hi Ryan,
On 13/03/26 12:27 am, Ryan Eatmon wrote:
>
> I'm getting build errors with this patch.
>
> ERROR: linuxptp-4.4-r0.arago0 do_patch: Applying patch '/scratch/
> jenkins_builds/arago-master-wip/build/sources/meta-arago/meta-arago-
> distro/recipes-connectivity/linuxptp/linuxptp/0002-port-Add-the-concept-
> of-doubly-attached-clock.patch' on target directory '/scratch/
> jenkins_builds/arago-master-wip/build/build/arago-tmp-default/work/
> armv7at2hf-neon-oe-linux-gnueabi/linuxptp/4.4/sources/linuxptp-4.4'
> CmdError('quilt --quiltrc /scratch/jenkins_builds/arago-master-wip/
> build/build/arago-tmp-default/work/armv7at2hf-neon-oe-linux-gnueabi/
> linuxptp/4.4/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout:
> Applying patch 0002-port-Add-the-concept-of-doubly-attached-clock.patch
> patching file clock.c
> Hunk #1 FAILED at 151.
> Hunk #2 succeeded at 1350 (offset -44 lines).
> Hunk #3 succeeded at 1428 (offset -50 lines).
> Hunk #4 succeeded at 2320 (offset -62 lines).
> 1 out of 4 hunks FAILED -- rejects in file clock.c
> patching file clock.h
> patching file config.c
> Hunk #2 succeeded at 355 (offset -1 lines).
> patching file ptp4l.8
> Hunk #1 succeeded at 902 (offset -10 lines).
> patching file ptp4l.c
> Patch 0002-port-Add-the-concept-of-doubly-attached-clock.patch does not
> apply (enforce with -f)
>
These patches are based on master branch of linuxptp. Is there any way I
can find out which branch these patches are being applied to?
> stderr: ')
> ERROR: Logfile of failure stored in: /scratch/jenkins_builds/arago-
> master-wip/build/build/arago-tmp-default/work/armv7at2hf-neon-oe-linux-
> gnueabi/linuxptp/4.4/temp/log.do_patch.1134123
> NOTE: recipe linuxptp-4.4-r0.arago0: task do_patch: Failed
>
>From the logs it seems like it is applying to `(tag: v4.4) Version 4.4`.
I will try rebasing the patches here and send a v4
>
> So this is a no go.
>
>
>
--
Thanks and Regards,
Danish
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17333):
https://lists.yoctoproject.org/g/meta-arago/message/17333
Mute This Topic: https://lists.yoctoproject.org/mt/118258845/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
