On 14/01/16 16:25, Stuart Haslam wrote:
On Thu, Jan 14, 2016 at 04:13:06PM +0000, Zoltan Kiss wrote:
On 13/01/16 13:37, Mike Holmes wrote:
On 13 January 2016 at 03:49, Maxim Uvarov <maxim.uva...@linaro.org
<mailto:maxim.uva...@linaro.org>> wrote:
On 01/12/2016 21:57, Zoltan Kiss wrote:
Hi,
We have a couple of places where the entire source file couldn't
be copied from linux-generic, but some of the functions are.
E.g. the loopback implementation from linux-generic's pktio code
is something like that. It would be nice to somehow get the
updates and fixes for this codebase, but my current best way is
to compare the code of these copies and based on the differences
use diff to figure out which commits are relevant for us.
Does anyone have a more automated idea for this problem?
In that case we should move that functions to separate file in
linux-generic. Or reorganize code somehow in linux-generic to make
your work simpler.
Agree, what needs to be split out ?
I'm not sure splitting out works everywhere. The mentioned example
of loopback pktio could use that. But there could be places where
you can't clearly cut out a logical block of functions, because the
ODP-DPDK alteration is probably a few lines in one of them. And I
don't think it's a good idea to have odp_pool.c and
odp_pool_stuff_needed_by_odp_dpdk.c, if you know what I mean.
I'm thinking about creating a script which does the following:
- takes all the commits affecting linux-generic in an interval
- remove commits from this list which are only modifying files which
are symlinks in linux-dpdk directory
- also remove commits which are only modifying .c files in
linux-generic which are not present in linux-dpdk (but new file
creations stay!)
This list would be a good starting point as a shortlist for patches
needed to be ported.
But this script only makes sense once you manually synced up the two
directories, so then you can specify your interval eg. as
"v1.6.0.0..v1.7.0.0"
Not sure I understand your workflow, but it might be worth looking into
using rerere - https://git-scm.com/docs/git-rerere
rerere seems to be an useful tool, but doesn't help here: we don't have
separate branches, but copies of files in the same branch, and some
commits to the original should be applied to the copy as well.
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
