On Wed, Jul 04, 2012 at 05:12:00AM +0200, Helmut Hullen wrote:> Hallo, Dag, > Du meintest am 04.07.12: > > > I tried to package 5.00-pre6 on RHEL using the known routine: > > > make clean > > make installer > > make install-all > > > and I get: > > [...] > > Perhaps you try Matt Flemings 5.00-pre8 version: > > git://git.zytor.com/users/mfleming/syslinux.git > > > It solved all my problems compiling and running syslinux 5.00.I have the feeling that I'm lost in the magic forest of git trees. So now I need some judgement where I am. This is what I did: git checkout master # starting point is my clone of hpa's git tree git remote add mfleming git://git.zytor.com/users/mfleming/syslinux.git git branch --remote # no mfleming branch visible git pull # should probably have been `git fetch` git branch --remote # yes, now I have mfleming branches visible git branch mfleming mfleming/master # "activate" git diff master mfleming git diff elflink mfleming Those both show new MCONFIG files with copyright headers of 2008. I would expect newer copyright headers. git checkout mfleming git log Shows as most recent commit a hpa commit from april 2011. How to explain the unexpected output from `git diff` and `git log`? Cheers Geert Stappers -- stappers at inertia:/usr/src/syslinux $ git diff master mfleming | head diff --git a/MCONFIG b/MCONFIG new file mode 100644 index 0000000..a71fd13 --- /dev/null +++ b/MCONFIG @@ -0,0 +1,83 @@ +## -*- makefile -*- ------------------------------------------------------- +## +## Copyright 2008 H. Peter Anvin - All Rights Reserved +## stappers at inertia:/usr/src/syslinux $ git branch | grep '*' * mfleming stappers at inertia:/usr/src/syslinux $ git log | head -n 3 commit 868c474546ba68e9e448734e1833f873fd50ec0a Author: H. Peter Anvin <hpa at linux.intel.com> Date: Mon Apr 4 17:38:18 2011 -0700 stappers at inertia:/usr/src/syslinux $
On Fri, 2012-07-06 at 13:01 +0200, Geert Stappers wrote:> On Wed, Jul 04, 2012 at 05:12:00AM +0200, Helmut Hullen wrote: > > Hallo, Dag, > > Du meintest am 04.07.12: > > > > > I tried to package 5.00-pre6 on RHEL using the known routine: > > > > > make clean > > > make installer > > > make install-all > > > > > and I get: > > > > [...] > > > > Perhaps you try Matt Flemings 5.00-pre8 version: > > > > git://git.zytor.com/users/mfleming/syslinux.git > > > > > > It solved all my problems compiling and running syslinux 5.00. > > > I have the feeling that I'm lost in the magic forest of git trees. > > So now I need some judgement where I am. > > This is what I did: > > git checkout master # starting point is my clone of hpa's git tree > git remote add mfleming git://git.zytor.com/users/mfleming/syslinux.git > git branch --remote # no mfleming branch visible > git pull # should probably have been `git fetch` > git branch --remote # yes, now I have mfleming branches visible > git branch mfleming mfleming/master # "activate"This should have been, git branch mfleming mfleming/elflink All the 5.0 work is on my elflink branch.