> On Nov 3, 2016, at 9:29 AM, Christopher Larson <clar...@kergoth.com> wrote: > > > On Thu, Nov 3, 2016 at 9:01 AM, Alexander Kanavin > <alexander.kana...@linux.intel.com > <mailto:alexander.kana...@linux.intel.com>> wrote: > it would be very useful if devtool offered support for rebasing source > patches when they fail to apply, but currently there does not seem to be any > such feature: > > ak@kanavin-desktop:~/development/poky/build$ devtool modify libksba > Parsing recipes..done. > NOTE: Fetching libksba... > NOTE: Unpacking... > NOTE: Patching... > ERROR: Applying 'ksba-add-pkgconfig-support.pa > <http://ksba-add-pkgconfig-support.pa/>tch' failed: > checking file Makefile.am > Hunk #1 FAILED at 21. > 1 out of 1 hunk FAILED > checking file configure.ac <http://configure.ac/> > Hunk #1 succeeded at 414 (offset 14 lines). > checking file ksba.pc.in <http://ksba.pc.in/> > checking file src/ksba.m4 > ERROR: Function failed: patch_do_patch > ak@kanavin-desktop:~/development/poky/build$ > > What devtool could do here is apply the patches that can be applied and then > partially apply the patches that fail. Then give the developer some kind of > UI for dealing with the rejected hunks (which typically means finding the > place in the target file where the changes should go and then manually > editing them in, while looking at the original patch). > > Without this feature devtool is half as useful as it could be particularly > for recipe version updates. > > That would be useful, indeed. > > git already provides such a UI, afaik devtool just needs to use git-am to > apply the patches, ideally passing -3 to it, and let the user use git am to > resolve and continue applying patches.
this seems good. Although, I have seen that all patches are not git am applicable, then I use git apply, something even that does not work, then third option is to use patch < patch and this works if it does not work then patch needs manual work. > -- > Christopher Larson > clarson at kergoth dot com > Founder - BitBake, OpenEmbedded, OpenZaurus > Maintainer - Tslib > Senior Software Engineer, Mentor Graphics > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core
signature.asc
Description: Message signed with OpenPGP using GPGMail
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
