Hello...
> I assumed that you'd already compiled emc2 for yourself, but not to > worry. Instructions for compiling emc2 from source are on our wiki: > http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Installing_EMC2#On_Ubuntu_6_06_or_8_04_from_source > install required packages, get the source with 'git', configure and > build. > > Yes I'm already recompiled emc2. > then you can save my message with the proposed change as a text file and > use 'git am' to apply it to your copy of emc. compile again, test, and > report if the change meets your needs. > http://wiki.linuxcnc.org/cgi-bin/emcinfo.pl?Git#from_patches > > Jeff > I can't do that. Something doesn't work. In my EMC computer I doesn't have mail program set up. So I save your patch (patch.txt) and copy to emc computer. When I start git am --signoff patch.txt i get error. So I think that was problem as I already edit the stepgen.c So I delete entire directory and start fresh as is... sla...@emc2-laptop:~$ git clone git://git.linuxcnc.org/git/emc2.git emc2-dev Initialized empty Git repository in /home/slavko/emc2-dev/.git/ remote: Counting objects: 73914, done. remote: Compressing objects: 100% (20820/20820), done. remote: Total 73914 (delta 58091), reused 67007 (delta 52570) Receiving objects: 100% (73914/73914), 36.28 MiB | 54 KiB/s, done. Resolving deltas: 100% (58091/58091), done. sla...@emc2-laptop:~$ cd emc2-dev sla...@emc2-laptop:~/emc2-dev$ git branch --track v2_3_branch origin/v2_3_branch Branch v2_3_branch set up to track remote branch refs/remotes/origin/v2_3_branch. sla...@emc2-laptop:~/emc2-dev$ git checkout v2_3_branch Switched to branch "v2_3_branch" sla...@emc2-laptop:~/emc2-dev$ git pull --rebase Current branch v2_3_branch is up to date. sla...@emc2-laptop:~/emc2-dev$ git am --signoff popravek.txt Applying Allow the user to specify a stepping waveform .dotest/patch:149: trailing whitespace. error: patch failed: src/hal/components/stepgen.c:314 error: src/hal/components/stepgen.c: patch does not apply Patch failed at 0001. When you have resolved this problem run "git-am --resolved". If you would prefer to skip this patch, instead run "git-am --skip". sla...@emc2-laptop:~/emc2-dev$ Can you send me just stepgen.c file? Thanks ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
