On 08/24/2018 10:14 AM, Tom McDermott via USRP-users wrote: > I installed and built gnuradio and UHD some time ago from the SBRAC script. > > I am at the head of gnuradio maint-3.7, and am on uhd maint. My > version of uhd is 3.10.2.0 and my FPGA > images are also 3.10.2. There appears to be 3.10.3 FPGA available (for > B205Mini). > > However git tells me that UHD has diverged from origin/maint although I > have not made any changes > to my local version. I am 30 ahead and 1023 behind origin/maint. A > guess would be that something in > uhd origin/maint repository was altered after I pulled from it, and that > it is necessary to do a git hard reset of > my local copy. > > Assuming I stick with gnuradio maint-3.7 should I then checkout a > specific tag of uhd, or the > head of uhd maint?
Tom, we deprecated the UHD maint branches a few weeks ago (Michael West sent an announcement), but for your case, that shouldn't matter. You can use a broad range of versions of UHD with GNU Radio, so if you're on maint-3.7 for GNU Radio, you can still use master branch for UHD, for example. -- M _______________________________________________ USRP-users mailing list USRP-users@lists.ettus.com http://lists.ettus.com/mailman/listinfo/usrp-users_lists.ettus.com