Jason Kridner wrote:
Khasim,
Please correct me where I'm wrong...
Khasim,
Khasim Syed Mohammed wrote:
Hi all,
I have hosted a GIT for consolidating the work for REV C Out of the
box u-boot.
Details below:
http://gitorious.org/projects/beagleboard-default-u-boot/repos/mainline/logs/omap3dev
This tree is cloned from Sakoman's omap3dev branch.
How do you plan to make your work you do in your "fork" of Sakoman's
git is going back to that?
I understand that you might need some additional features for REV C
Out of the box U-Boot we don't want in (upstream preparation)
Sakoman's git (e.g. logo, some additional test functionality).
I'd guess is that is all that should live on Khasim's fork. The logo is
currently the only patch on it.
Yes. Let us see if somebody (from TI) will take the time and clean it
up now. Then I will be glad and this mail thread resulted in what it
was good for.
Sorry if I was unclear about this, but my impression is/was that this
"fork" we talk about here will have added some more (Rev C test)
features. Not only logo. So I tried to "release early" how I'd like to
deal with this tree.
But we should avoid to have x "forks" of Sakoman's git confusing the
user. Having x "forks" wouldn't be better than the ugly tar balls we
had in the past.
I disagree, since at least forks have the opportunity to have common
commits, so that you can tell where they are different.
Hmm, yes, maybe it is a little easier to pick diffs from git commits.
But if this isn't done by the commiter (Khasim?), then it is some work
for somebody else (like it is work diffing two tar balls).
This serves the
purpose of keeping everything open. Sakoman's git is currently the
upstream for Beagle u-boot, but even that is a distraction from denx.de
which is the real upstream.
Yes. The point here is that we (the commiters of Sakoman's git)
regularly send patches to mailing list. Again: If the maintainer of a
git "fork" regularly cares about sending his patches/pull requests to
mailing list I'm totally fine with git clones. I.e. what I want to say
is: "If you create a git clone, it's *your* job to ensure that your
changes are going back to parent git in a clean way." If this will
happen with your U-Boot branches, too, I will be glad.
I'd like that we discuss *all* the changes you make and then decide:
(a) if it is something we like to have in Sakoman's git you send a
patch to this list and/or ask Steve to pull it from your git into his
If this was something that should go onto Sakoman's git, the patch
would have been submitted.
This will be fine. I will believe it if it happens
This is only for diagnostics and out-of-box
experience (logo, etc.).
As I don't know what you plan to add to this clone, I talk in a more
general way, not about specific patches. Therefore I asked for
discussion. With logo patch this happened, we will see if it will
happen with further changes, too.
(b) if it is something we don't want in Sakoman's git (e.g. logo, test
functions) you send them as consolidated patch to this list (compare
[1]). This would enable user's to easily take them and apply them on
top of Sakoman's git if they like. This avoids that they need to deal
with an other git which might be confusing.
Final result can be a consolidated patch set, but this provides the
daily visibility into the process.
We could establish that within TI,
but
I think that goes against the community development approach.
What's wrong to send an updated logo patch in reply to [1] if you
think logo patch is ready?
I am
very glad this is public.
Yes, agreed, better than an outdated tar ball hitting us in some month
I don't want that we have to check your git regularly, have to extract
the changes and have to do (a) or (b) our own. I'd like you to do
this. Additionally, this means that review results are fixed, too.
I'd really like that we avoid "here is the (TI) code (tar ball), clean
up and merge into community tree is communities job, we are busy to
get the product out" this time!
This isn't a step in that direction at all.
Nice to hear!
You should notice TI
patches
going directly to the denx.de mailing list.
About which (OMAP3) patches are you talking? The DaVinci patches?
E.g. we asked Mani several times to send his patches to U-Boot list,
nothing happened (?).
This effort is only for
board
production changes that aren't suitable for upstream.
Ok. Then a consolidated (clean) patch (at the end of development
process) against Steve's git would be fine.
And as mentioned above, if you find e.g. a bug while doing your
production test code which goes in category (a) above, a patch/pull
request would be required.
There is no need
for you to closely monitor unless you care about *exactly* what is going
to go into the Rev C boards (with diagnostic patches).
I have to monitor unless I can be sure that you really care about (a)
and (b)
A really bad experience is
http://marc.info/?l=linux-omap&m=122911571519657&w=2
with omapzoom git: Creating a git clone, fixing there main bugs and
then some weeks later a mail "this bug is fixed in the clone already".
This is exactly what I try to avoid with this mail thread.
If this doesn't happen here as you promised above, everything will be
fine!
At least it seems to be good that we are talking about it
Thanks
Dirk