From: Alexander Dahl <post@lespocky.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH] add some patches with fixes, partly queued upstream
Date: Fri, 21 Mar 2014 14:35:16 +0100 [thread overview]
Message-ID: <088f5892e63bdae1b81e6ed7f2dd7d69@idefix.lespocky.dyndns.org> (raw)
In-Reply-To: <20140319094921.GH5223@pengutronix.de>
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
ptxdist@pengutronix.de
next prev parent reply other threads:[~2014-03-21 13:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-19 9:19 Alexander Dahl
2014-03-19 9:49 ` Michael Olbrich
2014-03-19 10:28 ` Alexander Dahl
2014-03-21 13:35 ` Alexander Dahl [this message]
2014-03-24 8:41 ` Michael Olbrich
2014-04-02 14:10 ` [ptxdist] [PATCH] libcgi: " Alexander Dahl
2014-04-04 9:58 ` Michael Olbrich
2014-03-19 9:49 ` [ptxdist] [PATCH] " Alexander Dahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=088f5892e63bdae1b81e6ed7f2dd7d69@idefix.lespocky.dyndns.org \
--to=post@lespocky.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox