Mokoptach series doesn't apply

Andy Green andy at openmoko.com
Sun Feb 24 06:35:06 CET 2008


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Somebody in the thread at some point said:

> The only thing I can imagine now is that my svn update-d dir of
> mokopatches is poisoned (interesting feature of git is the hashes
> disallow this possibility BTW).  If I try svn update it says
> 
> $ svn update
> At revision 4102.

OK the stuff in my mokopatch dir from the original tree and what I check
out fresh at

http://svn.openmoko.org/trunk/src/target/kernel/patches

is a bit evil now because we no longer use 2.6.22.5 as our default
kernel if I understood it.

The real stuff is at

http://svn.openmoko.org/branches/src/target/kernel/2.6.24.x/patches

If I use this I get correct application -- well stgit import still
rejects several patches due to uncorrected fuzz but I can get those
applied with patch and resume the import.

I diff my original tracked mokopatches and they differ, so this is the
problem, whether because I edited them or some other problem I dunno.
But at least I can go on.

We discussed last night we will move to a frozen mokopatch in git
shortly, so this class of problem will simply go away.

- -Andy
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFHwQIKOjLpvpq7dMoRAlPfAJ4g7eb7ggjNGguntf5zh6H5XFu2lQCeMtNC
Pl4pnpxHlFKV68/Tldi8sDI=
=/wWu
-----END PGP SIGNATURE-----




More information about the openmoko-kernel mailing list