Hi Erich; (Yves has probably more tips and hindsight, but I'll give it a try)
Am Samstag, 4. Oktober 2014, 16:07:48 schrieb Erich Titl: > Hi KP > > on 04.10.2014 01:08, kp kirchdoerfer wrote: > > Hi ERich; > > > > Am Freitag, 3. Oktober 2014, 18:45:22 schrieb Erich Titl: > >> Hi Folks > >> > >> I am trying to reconnect with leaf. The uboot build still fails at the > >> same place. > >> How do you build uboot and what compiler version do you use > > > > uboot should be updated, fixed whatever. It fails for me as well. > > And more, uboot should be tested, documented and intergrated. > > It had been just a testand a start if someone wants to work on it. > > > > So either ignore it, or probably you help to fix it. > > I played around with the Makefile for a while, could not pass the > parameters to the Makefile in disk, as everything seems to be blanked > out by config.mk in the u-boot root directory. Whatever, for the moment > I will just skip it. > > For curiosity I looked at my git status > > mega@leafbuilder:~/leaf/devel/bering-uclibc$ git status > # On branch master > # Your branch is behind 'origin/master' by 303 commits, and can be > fast-forwarded. > > so far so good > > # Changes to be committed: > # (use "git reset HEAD <file>..." to unstage) > # > # deleted: conf/sources.d/uboot.cfg > # > # Changes not staged for commit: > # (use "git add <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > directory) > # > # modified: conf/buildtool.conf > # modified: repo/openswan/buildtool.cfg > > Yes, I made a local change to conf/buildtool.conf (I set the packagers > name). > > Now trying to get in sync with master I get > > mega@leafbuilder:~/leaf/devel/bering-uclibc$ git pull > Password: > Updating baf2e1e..5ef80e2 > error: Your local changes to the following files would be overwritten by > merge: > conf/buildtool.conf > Please, commit your changes or stash them before you can merge. > Aborting > > That does not make much sense IMHO. Why should I commit my local changes > to buildtool.conf? I don't want them to go to to the master. > > I am sure this is just a gross misunderstanding on my side about what > commit really means. To me this means to make this change to go into the > the modification history of the project and that is definitely not what > I want. > > Please advise First you may work work with branch maint, which is stable, whereas master is in work, and some things may fail. Now what I'd do in your place is to save the files in question elsewhere and to reset the branch "hard" to origin/master. There is a mail where Yves explained the command. With a clean master(or maint), create a local branch, check it out and make your changes there. Once you'll ready to push into the remote repository merge that branch with master (or maint). See: http://bering-uclibc.zetam.org/wiki/Bering-uClibc_5.x_-_Developer_Guide_-_Hints_and_Tips_for_using_Git_SCM#Creating_a_Branch hth kp PS: I have been able to compile strongswan, the buildtool.mk was pretty small and a lot easier than for openswan. I haven't made any tests and accidently hit the wrong key, so I have to create it from scratch again :( ------------------------------------------------------------------------------ Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
