If anyone updated v3.1.x from github earlier today, you'll have to do a force pull to get the head of v3.1.x. There were a few changes I pushed which (in hindsight) belong elsewhere. So I've reverted them. We're working on fixing the server core to support a wide range of new features. The bad news is that these features will require configuration changes that are incompatible with the v3.x branch. The good news is that I've created a v4.0.x branch which will contain the changes. Alan DeKok.
Hi,
If anyone updated v3.1.x from github earlier today, you'll have to do a force pull to get the head of v3.1.x.
I was wondering what was going on a pull left the source non-compilable... what force pull do you advise? git fetch origin git reset --hard origin/master ? alan
On Jun 7, 2016, at 4:53 PM, A.L.M.Buxey@lboro.ac.uk wrote:
If anyone updated v3.1.x from github earlier today, you'll have to do a force pull to get the head of v3.1.x.
I was wondering what was going on a pull left the source non-compilable...
what force pull do you advise?
git reset HEAD^^^^^^^^^^^ git checkout . git pull --rebase and that should work. Alan DeKok.
On Tue, Jun 07, 2016 at 09:09:57PM +0000, A.L.M.Buxey@lboro.ac.uk wrote:
ignore..... did a full clean ... now works :)
My usual recipe (at root of git tree) $ rm -rf * $ git reset --hard HEAD (if building dpkgs, also rm -rf .pc) If head changes, easiest (though probably not the most "correct") is to just $ git fetch origin $ rm -rf * $ git reset --hard origin/v3.1.x It includes an "rm -rf". And a "git reset --hard". You have been suitably warned. Twice. :-) Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Specialist, Infrastructure Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
On 7 Jun 2016, at 22:20, Matthew Newton <mcn4@leicester.ac.uk> wrote:
On Tue, Jun 07, 2016 at 09:09:57PM +0000, A.L.M.Buxey@lboro.ac.uk wrote:
ignore..... did a full clean ... now works :)
My usual recipe (at root of git tree)
$ rm -rf * $ git reset --hard HEAD
(if building dpkgs, also rm -rf .pc)
If head changes, easiest (though probably not the most "correct") is to just
$ git fetch origin $ rm -rf * $ git reset --hard origin/v3.1.x
It includes an "rm -rf". And a "git reset --hard". You have been suitably warned. Twice. :-)
at this point you might as well $ rm -rf freeradius-server $ git pull https://github.com/FreeRADIUS/freeradius-server.git ;-)
On Wed, Jun 08, 2016 at 07:02:12PM +0100, Scott Armitage wrote:
If head changes, easiest (though probably not the most "correct") is to just
$ git fetch origin $ rm -rf * $ git reset --hard origin/v3.1.x
at this point you might as well
$ rm -rf freeradius-server $ git pull https://github.com/FreeRADIUS/freeradius-server.git
If you've got a fat Internet connection and not paying for usage, maybe... doing it locally is still faster. Matthew -- Matthew Newton, Ph.D. <mcn4@le.ac.uk> Systems Specialist, Infrastructure Services, I.T. Services, University of Leicester, Leicester LE1 7RH, United Kingdom For IT help contact helpdesk extn. 2253, <ithelp@le.ac.uk>
On 15 Jun 2016, at 05:31, Matthew Newton <mcn4@LEICESTER.AC.UK> wrote:
On Wed, Jun 08, 2016 at 07:02:12PM +0100, Scott Armitage wrote:
If head changes, easiest (though probably not the most "correct") is to just
$ git fetch origin $ rm -rf * $ git reset --hard origin/v3.1.x
at this point you might as well
$ rm -rf freeradius-server $ git pull https://github.com/FreeRADIUS/freeradius-server.git
If you've got a fat Internet connection and not paying for usage, maybe... doing it locally is still faster.
Unfortunately there's no way to really compact it any without breaking all the checked out repos for everyone. Arran Cudbard-Bell <a.cudbardb@freeradius.org> FreeRADIUS Development Team FD31 3077 42EC 7FCD 32FE 5EE2 56CF 27F9 30A8 CAA2
Hi, still problem make: *** No rule to make target `/usr/local/src/freeradius-server/src/freeradius-devel/modcall.h', needed by `build/objs/src/modules/rlm_always/rlm_always.lo'. Stop. alan
On Jun 7, 2016, at 5:05 PM, A.L.M.Buxey@lboro.ac.uk wrote:
make: *** No rule to make target `/usr/local/src/freeradius-server/src/freeradius-devel/modcall.h', needed by `build/objs/src/modules/rlm_always/rlm_always.lo'. Stop.
modcall.h was deleted a week or so ago. rm -rf build make Alan DeKok.
participants (5)
-
A.L.M.Buxey＠lboro.ac.uk -
Alan DeKok -
Arran Cudbard-Bell -
Matthew Newton -
Scott Armitage