<br><br><div class="gmail_quote">On Thu, Feb 24, 2011 at 1:07 PM, Yann Sionneau <span dir="ltr"><<a href="mailto:yann@minet.net">yann@minet.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Hi Daron,<br>
<br>
How did you do your git mirror of the CVS ? Is there any tool to do that ?<br></blockquote><div><br>I simply used what git provides. See, "git help cvsimport".<br><br>The first step is doing a cvs checkout (HEAD will work):<br>
1) cvs -d :pserver:anoncvs@www.rtems.com:/usr1/CVS co rtems<br>2) mv rtems rtems.cvs<br><br>Then the commands I use to create my pristine, git-mirror of the CVS repo is:<br> 3) cd rtems.cvs<br> 4) git cvsimport -i -v -C ../rtems.mirror.git<br>
<br>!!!!!!!!!!!!!!! Beware: this will take *many* hours over the network !!!!!!!!!!!!!!!!!!!!<br>i.e. do this at night (Alabama time) if you want to avoid annoying repo users/administrators.<br><br>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).<br>
<br>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.<br><br>To update the git-mirror when the CVS repo changes, just repeat 3) and 4). This will take around 15 min over the network.<br>
<br>As recommended by the "git-cvsimport" man page, *do not* use the git-mirror for working in. Do this:<br>5) git clone rtems.mirror.git rtems.git # assuming you want these in same directory<br><br>Then, use the "rtems.git" repo to play around in...<br>
<br>FYI -- my "rtems.mirror.git" branches look like this:<br><br>(~/RTEMS/rtems.mirror.git)<br>djc@TooLBox--> git branch -a<br> B_beatnik_import_from_SLAC<br> B_rtems_mvme3100_bsp_slac<br> MOVED-ASM_H-TO-RTEMS-SUBDIR-4-6-branch<br>
MOVED-FROM-C-SRC-EXEC-TO-CPUKIT-rtems-eng-200108xx<br> MOVED-FROM-C-SRC-TO-CPUKIT-rtems-4-5-branch<br> MOVED-FROM-LIBBSP-TO-LIBCHIP-rtems-4-6-branch<br> MOVED-FROM-SCORE-TO-RTEMS-rtems-4-6-branch<br> MOVED-FTPD-TO-CPUKIT-4-5-branch<br>
MOVED-RTEMS_WEBSERVER-TO-CPUKIT-HTTPD-4-5-branch<br> MOVED-TO-LIBCPU-4-6-branch<br> MOVED-from-C-SRC-TO-CPUKIT-rtems-4-5-branch<br> MOVED-from-C-SRC-TO-CPUKIT-rtems-4-6-branch<br> OAR<br> SLAC<br>* master<br> origin<br>
rtems-4-0-0-branch<br> rtems-4-10-branch<br> rtems-4-5-branch<br> rtems-4-6-branch<br> rtems-4-7-branch<br> rtems-4-8-branch<br> rtems-4-8-testing<br> rtems-4-9-branch<br> rtems-am-branch<br> rtems-eng-200108xx<br>
rtemsdoc-4-5-branch<br> shttpd<br> zlib<br><br>"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.<br><br>HTH.<br><br><br>-- dc<br>
</div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<br>
Did you just cvs checkout and then git init . && git add * ?<br>
<br>
You had to keep the CVS related files into your git, in order to be able to to cvs up, right ?<br>
<br>
Can you explain to me how to do like you ?<br>
<br>
Thanks :)<br>
<br>
Regards,<br>
<br>
Yann<br>
<br>
Le 24/02/11 16:34, Daron Chabot a écrit :<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="im">
Hi Till,<br>
<br>
I'm not sure if Yann is doing the same, but I've been tracking the RTEMS<br>
cvs repos with git for some time and update it semi-regularly (doing an<br>
update now). I maintain one git repo that is a "mirror" of the cvs repo,<br>
and another git repo (clone of the mirror) for local development where I<br>
"rebase" my work on top of the cvs HEAD.<br>
<br>
You could do something similar, pulling Yann's branch(es) into your<br>
scratchpad repo...<br>
<br>
Just a thought.<br>
<br>
<br>
-- dc<br>
<br>
On Thu, Feb 24, 2011 at 10:17 AM, Till Straumann<br></div><div><div></div><div class="h5">
<<a href="mailto:strauman@slac.stanford.edu" target="_blank">strauman@slac.stanford.edu</a> <mailto:<a href="mailto:strauman@slac.stanford.edu" target="_blank">strauman@slac.stanford.edu</a>>> wrote:<br>
<br>
On 02/24/2011 03:55 PM, Yann Sionneau wrote:<br>
<br>
Le 24/02/11 14:40, Till Straumann a écrit :<br>
<br>
On 02/24/2011 03:12 PM, Sebastien Bourdeauducq wrote:<br>
<br>
On Thu, 2011-02-24 at 11:13 +0000, Yann Sionneau wrote:<br>
<br>
Feel free to merge these commits with the CVS, but<br>
it will not be a<br>
straight forward merge since my github repository<br>
has a lot of commit<br>
that your CVS doesn't have. We are out of sync.<br>
<br>
<br>
Joel told me that the 4.11 release is not before a<br>
while. To reduce the<br>
administrative overhead, and unless someone sees this as an<br>
inconvenience, let's continue working on this BSP in the<br>
Git repository<br>
for now and I'll submit one big patch before the 4.11<br>
release.<br>
<br>
S.<br>
<br>
<br>
<br>
Hmm - but I'd rather get only the BSP from your git repo<br>
and work with the main-line RTEMS otherwise.<br>
<br>
How can I do that?<br>
<br>
Thanks<br>
<br>
<br>
Well you can checkout my git repo, it's a clone of RTEMS CVS of<br>
when I<br>
started the GSoC back in the middle of 2010.<br>
<br>
<br>
Well - that's not exactly what I want. I want to stay in-sync with<br>
the current RTEMS development and use your latest BSP.<br>
<br>
<br>
T.<br>
<br>
<br>
Just check it out and you can play with RTEMS and the up-to-date<br>
Milkymist BSP as if you were playing with RTEMS CVS :)<br>
<br>
The qemu to use is a special one (with milkymist support) btw,<br>
it's the<br>
one from this git repo :<br>
<a href="http://git.serverraum.org/?p=mw/qemu-lm32.git;a=summary" target="_blank">http://git.serverraum.org/?p=mw/qemu-lm32.git;a=summary</a><br>
<br>
Link for how to compile lm32-qemu :<br>
<a href="http://milkymist.org/wiki/index.php?title=Using_QEMU" target="_blank">http://milkymist.org/wiki/index.php?title=Using_QEMU</a><br>
Link for how to compile the BSP (but you sure know how to do<br>
that better<br>
than me :)) :<br>
<a href="http://milkymist.org/wiki/index.php?title=RTEMS_build_instructions" target="_blank">http://milkymist.org/wiki/index.php?title=RTEMS_build_instructions</a><br>
<br>
Link on how to run some tests :<br>
<a href="http://milkymist.org/wiki/index.php?title=Run_RTEMS_sample_applications_on_the_Milkymist_One_board_and_on_Qemu" target="_blank">http://milkymist.org/wiki/index.php?title=Run_RTEMS_sample_applications_on_the_Milkymist_One_board_and_on_Qemu</a><br>
<br>
<br>
And eventually if you want to try flickernoise (a GUI application) :<br>
<a href="http://milkymist.org/wiki/index.php?title=Flickernoise_build_instructions" target="_blank">http://milkymist.org/wiki/index.php?title=Flickernoise_build_instructions</a><br>
<br>
Have fun :)<br>
<br>
<br>
_______________________________________________<br>
rtems-users mailing list<br></div></div>
<a href="mailto:rtems-users@rtems.org" target="_blank">rtems-users@rtems.org</a> <mailto:<a href="mailto:rtems-users@rtems.org" target="_blank">rtems-users@rtems.org</a>><div class="im"><br>
<a href="http://www.rtems.org/mailman/listinfo/rtems-users" target="_blank">http://www.rtems.org/mailman/listinfo/rtems-users</a><br>
<br>
<br>
</div></blockquote>
<br>
</blockquote></div><br>