[mc1322x] Contiki tree resync

Jon Smirl jonsmirl at gmail.com
Thu Oct 22 01:08:04 EDT 2009


I identified the CVS commit you are based off from:

Author: fros4943 <fros4943>
Date:   Mon May 18 10:32:56 2009 +0000
    decreased default elfloader memory usage for sky platform

I used sed to strip the CVS keywords....
find . -type f -print0 | xargs -0 sed -i -e 's/\$Id.*\$/\$Id\$/'
.. with various keywords ...

I generated a patch against the May 18 CVS snapshot and then used git
to port it forward to CVS head.
I have to manually merge a few files. Not sure I got things 100% right.

    Conflicts:
        core/net/rime/collect.c
        examples/rime/example-abc.c
        examples/rime/example-collect.c
        examples/rime/example-mesh.c
        examples/rime/example-trickle.c


The attached patch applies cleanly against Conitiki CVS head. You
should inspect this and make sure it is what you want. Once you are
happy with it we can make a new Contiki CVS import tree without the
keyword expansion in it and start from this patch.

-- 
Jon Smirl
jonsmirl at gmail.com
-------------- next part --------------
An embedded message was scrubbed...
From: unknown sender
Subject: no subject
Date: no date
Size: 178224
URL: <http://devl.org/pipermail/mc1322x/attachments/20091022/045d75f2/attachment-0001.eml>


More information about the mc1322x mailing list