Jim Ramsay wrote:
I was thinking that you *somehow* apply a patch to get yourself from
2.6.19 to 2.6.20, and then somehow resolve the conflicts inherent in
this merge since the 2.6.19-uc0 patch altered some 2.6.19 files, and
then you should be able to apply linux-2.6.20-uc0.patch.gz.
I've done this before - basically apply a reversed 2.6.19-uc0 patch to
2.6.19-uc0 tree, then apply the kernel.org 2.6.20 patch, then apply
2.6.20-uc0. But, it's a pain in the neck.
But what is this magic process to get to the point where
linux-2.6.20-uc0.patch.gz will apply cleanly?
apply it to a stock 2.6.20 kernel
Unless I've misunderstood what you are trying to do, it is likely that
any local changes you have made to your 2.6.19 tree are much smaller
than the changes the rest of the kernel have made from 2.6.19 - 2.6.20.
So, diff your internal tree against 2.6.19-uc0, save that as
my_local_changes.patch
Then, get a stock 2.6.20, apply 2.6.20-uc0, then reapply (and cleanup)
your local changes.
Cheers,
John
_______________________________________________
uClinux-dev mailing list
[email protected]
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by [email protected]
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
