Hei Michael, 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. Greets Alex 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. -- »With the first link, the chain is forged. The first speech censured, the first thought forbidden, the first freedom denied, chains us all irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie) *** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601 D1D5 8FBA 7744 CC87 10D0 *** -- ptxdist mailing list [email protected]
