Hi, On Fri, Mar 21, 2014 at 02:35:16PM +0100, Alexander Dahl wrote: > Am 2014-03-19 10:49, schrieb Michael Olbrich: > > Can you replace our patches with whatever was applied upstream? That will > > make it easier in the future if we ever get a release. > > And mark them as upstream (like patches/opkg-utils-r4747/series for > > example). > > I'm a little stuck with this. :-/ I managed to prepare a new libcgi > patch queue and got it correctly imported in > platform-*/build-target/libcgi-1.0 where it is a git repository (ptxdist > --git extract libcgi). Using git rebase -i and some cherry picking in my > libcgi repo I got all the new patches there in the right order. I looked > into opkg-utils as suggested and saw some tags on certain changesets in > the temporary git repository, I also noticed the special markers in the > series file of opkg-utils patch queue. What I thought was: just create > similar tags, run `git ptx-patches` and you get those special markers. > However this does not work. Sure the patches are created correctly, but > the series file only contains the "ordinary" ptxdist magic without the > tag stuff. > > How do I do this correctly? I'm afraid reading scripts/git-ptx-patches > does not point me to the right thing.
It's a bit tricky. I usually do it like this: 1. Make one series without the special marker. 2. export the patches with ptx-patches 3. ptxdist clean <pkg> 4. edit the series and insert the marker with start numbers 5. ptxdist extract --git <pkg> 6. git ptx-patches -f -t <tag> for all tags Now you should have the makers and patches with the correct numbering. > btw: Due to your support over the last years, I'm able to get this far, > using multiple branches, format-patch, send-email, rebase -i and this is > awesome. Thanks for that. You're welcome. You've submitted a lot of patches in return. So I think it was well worth my time. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list [email protected]
