[Milkymist-devel] milkymist network driver bug

Daron Chabot daron.chabot at gmail.com
Thu Feb 24 20:03:20 UTC 2011


On Thu, Feb 24, 2011 at 1:07 PM, Yann Sionneau <yann at minet.net> wrote:

> Hi Daron,
>
> How did you do your git mirror of the CVS ? Is there any tool to do that ?
>

I simply used what git provides. See,  "git help cvsimport".

The first step is doing a cvs checkout (HEAD will work):
1)    cvs -d :pserver:anoncvs at www.rtems.com:/usr1/CVS co rtems
2)    mv rtems rtems.cvs

Then the commands I use to create my pristine, git-mirror of the CVS repo
is:
 3)   cd rtems.cvs
 4)   git cvsimport -i -v -C ../rtems.mirror.git

!!!!!!!!!!!!!!! Beware: this will take *many* hours over the network
!!!!!!!!!!!!!!!!!!!!
i.e. do this at night (Alabama time) if you want to avoid annoying repo
users/administrators.

I seem to recall this initially taking on the order of nine hours. If done
locally, this operation is orders of magnitude faster (wink, wink, nudge,
nudge Joel).

If people are interested, I may be able to put my "rtems.mirror.git" in a
publicly accessible location to spare them the 10 hours of suspense.

To update the git-mirror when the CVS repo changes, just repeat 3) and 4).
This will take around 15 min over the network.

As recommended by the "git-cvsimport" man page, *do not* use the git-mirror
for working in. Do this:
5)    git clone rtems.mirror.git rtems.git       # assuming you want these
in same directory

Then, use the "rtems.git" repo to play around in...

FYI -- my "rtems.mirror.git" branches look like this:

(~/RTEMS/rtems.mirror.git)
djc at TooLBox--> git branch -a
  B_beatnik_import_from_SLAC
  B_rtems_mvme3100_bsp_slac
  MOVED-ASM_H-TO-RTEMS-SUBDIR-4-6-branch
  MOVED-FROM-C-SRC-EXEC-TO-CPUKIT-rtems-eng-200108xx
  MOVED-FROM-C-SRC-TO-CPUKIT-rtems-4-5-branch
  MOVED-FROM-LIBBSP-TO-LIBCHIP-rtems-4-6-branch
  MOVED-FROM-SCORE-TO-RTEMS-rtems-4-6-branch
  MOVED-FTPD-TO-CPUKIT-4-5-branch
  MOVED-RTEMS_WEBSERVER-TO-CPUKIT-HTTPD-4-5-branch
  MOVED-TO-LIBCPU-4-6-branch
  MOVED-from-C-SRC-TO-CPUKIT-rtems-4-5-branch
  MOVED-from-C-SRC-TO-CPUKIT-rtems-4-6-branch
  OAR
  SLAC
* master
  origin
  rtems-4-0-0-branch
  rtems-4-10-branch
  rtems-4-5-branch
  rtems-4-6-branch
  rtems-4-7-branch
  rtems-4-8-branch
  rtems-4-8-testing
  rtems-4-9-branch
  rtems-am-branch
  rtems-eng-200108xx
  rtemsdoc-4-5-branch
  shttpd
  zlib

"master" ---> HEAD, all the rtems-4-X-branches appear as in the CVS repo,
and I really don't know (or care!) about the rest.

HTH.


-- dc


>
> Did you just cvs checkout and then git init . && git add * ?
>
> You had to keep the CVS related files into your git, in order to be able to
> to cvs up, right ?
>
> Can you explain to me how to do like you ?
>
> Thanks :)
>
> Regards,
>
> Yann
>
> Le 24/02/11 16:34, Daron Chabot a écrit :
>
>> Hi Till,
>>
>> I'm not sure if Yann is doing the same, but I've been tracking the RTEMS
>> cvs repos with git for some time and update it semi-regularly (doing an
>> update now). I maintain one git repo that is a "mirror" of the cvs repo,
>> and another git repo (clone of the mirror) for local development where I
>> "rebase" my work on top of the cvs HEAD.
>>
>> You could do something similar, pulling Yann's branch(es) into your
>> scratchpad repo...
>>
>> Just a thought.
>>
>>
>> -- dc
>>
>> On Thu, Feb 24, 2011 at 10:17 AM, Till Straumann
>> <strauman at slac.stanford.edu <mailto:strauman at slac.stanford.edu>> wrote:
>>
>>    On 02/24/2011 03:55 PM, Yann Sionneau wrote:
>>
>>        Le 24/02/11 14:40, Till Straumann a écrit :
>>
>>            On 02/24/2011 03:12 PM, Sebastien Bourdeauducq wrote:
>>
>>                On Thu, 2011-02-24 at 11:13 +0000, Yann Sionneau wrote:
>>
>>                    Feel free to merge these commits with the CVS, but
>>                    it will not be a
>>                    straight forward merge since my github repository
>>                    has a lot of commit
>>                    that your CVS doesn't have. We are out of sync.
>>
>>
>>                Joel told me that the 4.11 release is not before a
>>                while. To reduce the
>>                administrative overhead, and unless someone sees this as an
>>                inconvenience, let's continue working on this BSP in the
>>                Git repository
>>                for now and I'll submit one big patch before the 4.11
>>                release.
>>
>>                S.
>>
>>
>>
>>            Hmm - but I'd rather get only the BSP from your git repo
>>            and work with the main-line RTEMS otherwise.
>>
>>            How can I do that?
>>
>>            Thanks
>>
>>
>>        Well you can checkout my git repo, it's a clone of RTEMS CVS of
>>        when I
>>        started the GSoC back in the middle of 2010.
>>
>>
>>    Well - that's not exactly what I want. I want to stay in-sync with
>>    the current RTEMS development and use your latest BSP.
>>
>>
>>    T.
>>
>>
>>        Just check it out and you can play with RTEMS and the up-to-date
>>        Milkymist BSP as if you were playing with RTEMS CVS :)
>>
>>        The qemu to use is a special one (with milkymist support) btw,
>>        it's the
>>        one from this git repo :
>>        http://git.serverraum.org/?p=mw/qemu-lm32.git;a=summary
>>
>>        Link for how to compile lm32-qemu :
>>        http://milkymist.org/wiki/index.php?title=Using_QEMU
>>        Link for how to compile the BSP (but you sure know how to do
>>        that better
>>        than me :)) :
>>        http://milkymist.org/wiki/index.php?title=RTEMS_build_instructions
>>
>>        Link on how to run some tests :
>>
>> http://milkymist.org/wiki/index.php?title=Run_RTEMS_sample_applications_on_the_Milkymist_One_board_and_on_Qemu
>>
>>
>>        And eventually if you want to try flickernoise (a GUI application)
>> :
>>
>> http://milkymist.org/wiki/index.php?title=Flickernoise_build_instructions
>>
>>        Have fun :)
>>
>>
>>    _______________________________________________
>>    rtems-users mailing list
>>    rtems-users at rtems.org <mailto:rtems-users at rtems.org>
>>
>>    http://www.rtems.org/mailman/listinfo/rtems-users
>>
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/users/attachments/20110224/a86388b5/attachment.html>


More information about the users mailing list