Patch Application Failure on Yocto Zeus + Qt 5.15 Due to Source Revision Mismatch
-
Dear Qt Support Team,
We are currently working on an embedded Linux platform based on Yocto Zeus with meta-qt5, and Qt 5.15 is integrated and functioning correctly in our environment.
Recently, we received a set of patches from our client, which were originally shared by the Qt team. However, while attempting to apply these patches within our Yocto build environment, we are encountering patch failures during the do_patch stage.
https://codereview.qt-project.org/c/qt/qtdeclarative/+/687239
Environment Details:
Yocto Release: Zeus
Qt Version: 5.15
Layer Used: meta-qt5
Build System: Yocto / BitBake
Patch Mechanism: quilt (do_patch)
Target Platform: Embedded LinuxObserved Issue:
The patches fail to apply due to context/hunk mismatches. This appears to be caused by differences between:The Qt source revision against which the patches were originally generated
and
The Qt source revision currently fetched by our Yocto recipe.Our current setup appears to use a floating/fetched git revision (gitAUTOINC behavior), which may differ from the original upstream commit used during patch creation.
Typical errors observed:
Hunk FAILED
Patch does not apply
Context mismatch during quilt patchingWe would appreciate your guidance on the following points:
- Could you please share the exact Qt source version / branch / commit SHA against which these patches were generated?
- Would you recommend aligning our Qt source revision with a specific upstream commit before applying the patches?
- If available, could you please share the officially supported method for integrating these fixes within Yocto + meta-qt5 environments?
Additional Notes:
-> Qt is already operational in our platform.
-> The issue is specifically related to patch application compatibility across differing source revisions.Please let us know if any additional information is needed from our side.
Thanks in Advance
-
Dear Qt Support Team,
We are currently working on an embedded Linux platform based on Yocto Zeus with meta-qt5, and Qt 5.15 is integrated and functioning correctly in our environment.
Recently, we received a set of patches from our client, which were originally shared by the Qt team. However, while attempting to apply these patches within our Yocto build environment, we are encountering patch failures during the do_patch stage.
https://codereview.qt-project.org/c/qt/qtdeclarative/+/687239
Environment Details:
Yocto Release: Zeus
Qt Version: 5.15
Layer Used: meta-qt5
Build System: Yocto / BitBake
Patch Mechanism: quilt (do_patch)
Target Platform: Embedded LinuxObserved Issue:
The patches fail to apply due to context/hunk mismatches. This appears to be caused by differences between:The Qt source revision against which the patches were originally generated
and
The Qt source revision currently fetched by our Yocto recipe.Our current setup appears to use a floating/fetched git revision (gitAUTOINC behavior), which may differ from the original upstream commit used during patch creation.
Typical errors observed:
Hunk FAILED
Patch does not apply
Context mismatch during quilt patchingWe would appreciate your guidance on the following points:
- Could you please share the exact Qt source version / branch / commit SHA against which these patches were generated?
- Would you recommend aligning our Qt source revision with a specific upstream commit before applying the patches?
- If available, could you please share the officially supported method for integrating these fixes within Yocto + meta-qt5 environments?
Additional Notes:
-> Qt is already operational in our platform.
-> The issue is specifically related to patch application compatibility across differing source revisions.Please let us know if any additional information is needed from our side.
Thanks in Advance
@Poornesh said in Patch Application Failure on Yocto Zeus + Qt 5.15 Due to Source Revision Mismatch:
Dear Qt Support Team
Please be aware this forum is for users of Qt. It is not read by The Qt Company.
My limited understanding is that Qt for Yocto is part of "Boot to Qt" (https://doc.qt.io/Boot2Qt/b2qt-customization-requirements.html)? If that is true I believe this means you must have a commercial license for The Qt Company? And if that is so then, although you are welcome to post here and await any user answers which might come, you may have to contact TQtC for your issue?
