Merging the vrt- branch

Hi list,

I have previously merged the vrt- branch into the gnuradio- tree and
successfully compiled and used it.

However… I’m in the middle of creating a script that sets up gnuradio
and other programs I need from a fresh installation, and I ran into some
troubles while merging different branches.

Is the procedure below the way to do this, since I get a lot of merge-
conflicts, which I don’t want to script around…

git clone http://gnuradio.org/git/gnuradio.git
cd gnuradio
git remote add jblum http://gnuradio.org/git/jblum.git <-- Gives merge-
conflicts…
git pull jblum usrp2_vrt

BR
//Mattias

Its probably the set antenna feature that was added to the usrp2 in the
git master. The merge will definitely not be clean. The easiest thing
you can do would be to merge the reverse diffs for the "set antenna
"change set. Then your rebase/merge should work.

-Josh

On Thu, Mar 11, 2010 at 11:19, Josh B. [email protected] wrote:

Its probably the set antenna feature that was added to the usrp2 in the git
master. The merge will definitely not be clean. The easiest thing you can do
would be to merge the reverse diffs for the "set antenna "change set. Then
your rebase/merge should work.

I think it is important to point out that the VRT branch in question
is no longer being developed and no longer planned to be merged into
the 3.3git master. Instead this functionality is intended to be
reimplemented as part of the UHD software from Ettus R… The
above merge conflict is an indication that the git master is evolving
in incompatible ways and that such merge conflicts will only increase.

While developer experiences with the VRT branch are useful feedback
for UHD development, it is very likely that user code written to the
VRT branch’s version of the libusrp2 API will need to be rewritten.

Johnathan

What is the estimated time frame for UHD release?
Thanks
-Mike

By doing:

git clone http://gnuradio.org/git/jblum.git
git checkout -b perz origin/usrp2_vrt

I get VRT code without the need to merge.

Question:
Can I save the VRT code and re-distribute it ? The reason for this is
that I am planning to write paper. In order for others to be able to
repeat my results I want to make all the code available … so …

BR/
Per

Quoting Mattias K. [email protected]:

On 03/15/2010 12:48 PM, Per Z. wrote:

repeat my results I want to make all the code available … so …
You could set up a personal git repository on github and refer to that
in your paper.

Philip

By April 15th 2009, I plan to have a pre-alpha uhd released and a
gnuradio wrapper (gr-uhd). This initial release will only support the
usrp2 platform and a subset of the daughter boards. And yes, UDP and VRT
will be working.

-Josh

On Mon, Mar 15, 2010 at 12:48, Per Z. [email protected]
wrote:

git clone http://gnuradio.org/git/jblum.git
git checkout -b perz origin/usrp2_vrt

I get VRT code without the need to merge.

Of course. But this branch doesn’t have any features on the master
branch since it was branched, like WBX support. That’s probably okay
for purposes of your paper.

Johnathan

This forum is not affiliated to the Ruby language, Ruby on Rails framework, nor any Ruby applications discussed here.

| Privacy Policy | Terms of Service | Remote Ruby Jobs