On Saturday 18 April 2020 18:02:47 andy pugh wrote: > On Sat, 18 Apr 2020 at 21:12, Gene Heskett <[email protected]> wrote: > > git branch --set-upstream 2.8 origin/2.8. > > which says I am 600 commits ahead, crazy. > > should I just blow it away. > > Yes. > But a reset --hard should be enough.
wasn't, blew it away & recloned it, branch says * master. 60 tests fails, but I believe its actually bailing out of either ./configure --with-realtime=3.4.9-rtai-pae, or very early in the make. It bails out in make: Compiling hal/user_comps/xhc-whb04b-6/xhc-whb04b6.cc hal/user_comps/xhc-whb04b-6/usb.cc: In member function ‘bool XhcWhb04b6::Usb::init()’: hal/user_comps/xhc-whb04b-6/usb.cc:632:5: error: ‘libusb_log_level’ was not declared in this scope hal/user_comps/xhc-whb04b-6/usb.cc:632:22: error: expected ‘;’ before ‘logLevel’ hal/user_comps/xhc-whb04b-6/usb.cc:634:31: error: ‘logLevel’ was not declared in this scope make: *** [objects/hal/user_comps/xhc-whb04b-6/usb.o] Error 1 make: *** Waiting for unfinished jobs.... Looks like that file, xhc-whb04b6.cc, needs help. And I've never played with a ".cc" file, only straight K&R 30 years ago. And thats pretty rusty. Cheers, Gene Heskett -- "There are four boxes to be used in defense of liberty: soap, ballot, jury, and ammo. Please use in that order." -Ed Howdershelt (Author) If we desire respect for the law, we must first make the law respectable. - Louis D. Brandeis Genes Web page <http://geneslinuxbox.net:6309/gene> _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
