#linuxcnc-devel Logs

Aug 16 2017

10:09 AM hazzy1 is now known as hazzy
12:03 PM seb_kuzminsky: happy debian day y'all! https://wiki.debian.org/DebianDay
12:16 PM hazzy: Same to you Seb!
12:17 PM hazzy: I did not know it was a thing, but it is appropriate as I am installing Debian on some of our office PC today to begin the end of our reliance on Windoze
12:18 PM seb_kuzminsky: :-)
12:57 PM andypugh: What process merges 2.7 changes up to Master?
12:58 PM cradek: someone has to do it manually
12:58 PM cradek: you can if you want
12:58 PM cradek: or if it's not important to do right now, your changes will get merged up later by someone else
12:58 PM andypugh: I think it is absolutely crucially vital right now :-(
12:59 PM cradek: do you know how to do it?
12:59 PM andypugh: Not with any great confidence in my ability not to make things even worse.
01:00 PM cradek: ok do you want help or do you want me to do it?
01:01 PM cradek: err I need to update my checkout to github
01:01 PM andypugh: I can try to do it
01:01 PM andypugh: Do I merge locally then push, or is it some other process?
01:03 PM cradek: yes that's how
01:03 PM cradek: git checkout master; git pull; git merge 2.7; check it out and push as usual
01:04 PM cradek: I just tried it and the merge is trivial because there are no conflicts and it's not many changes
01:04 PM seb_kuzminsky: i prefer a slightly different way
01:04 PM seb_kuzminsky: i agree with "git checkout master; git pull"
01:04 PM cradek: there are many ways
01:05 PM seb_kuzminsky: but then i'd say "git merge origin/2.7"
01:05 PM seb_kuzminsky: does "git pull" update all local branches that have upstreams on origin?
01:05 PM seb_kuzminsky: if not, then you can merge the wrong commit into master
01:05 PM cradek: no
01:05 PM cradek: that's true
01:06 PM cradek: in andy's case right now, his 2.7 matches origin because he juuust pushed it
01:06 PM cradek: it's true that's not always the case
01:06 PM seb_kuzminsky: oh, right
01:10 PM andypugh: Now, if someone can kick of the Buildbot we should be able to get Eric H Johnson’s machine moving again.
01:12 PM cradek: it's currently building dee05, your 2.7 push. it'll build master next.
01:12 PM seb_kuzminsky: thanks andypugh
01:12 PM cradek: (if you were more interested in master and you had a time machine, you could go back and push it first)
01:13 PM cradek: what's interesting is master has changed already - ideally buildbot would skip the first master and only build dewey's new one, but I bet it doesn't know how to do that
01:18 PM seb_kuzminsky: it does do that
01:18 PM andypugh: I am glad I caught that email, I was planning on going straight out to the workshop
01:18 PM seb_kuzminsky: when it comes time to build a branch, the buildbot builds the tip of the branch
01:18 PM seb_kuzminsky: (if it's not been asked to build a specific commit)
02:26 PM jepler: If you are a developer with direct push access on github, you may get another invitation. This is to join the LinuxCNC "team". By having a "team", I can add contributors en masse to other repositories, such as wlo for the website.
02:30 PM jepler: cradek: the 4 public repos on glo are now all imported to github.
02:30 PM cradek: sweet
02:31 PM jepler: cradek: is there anything else on glo that you're aware of?
02:32 PM jepler: if not I think there's no reason to keep its lights on
02:32 PM cradek: that's all I see in /git
02:32 PM jepler: I assume you'd have a backup around for <length of time> even if you take the site offline
02:33 PM jepler: in case someone remembers "oh I stashed my mars bars in glo/tmp and would like to eat them pls"
02:35 PM cradek: Stopping jails: git.linuxcnc.org.
02:45 PM jepler: cradek: Thank you for running that for so long
02:45 PM cradek: welcome :-)
02:46 PM seb_kuzminsky: yeah, glo was great
02:46 PM seb_kuzminsky: i'll pour a cup of coffee on the ground next time i make a pot
02:47 PM jepler: ooh is it time for a cup of coffee?
02:47 PM jepler: </couldquitatanytimestopjudgingme>
07:30 PM CaptHindsight: memleak wrote/is writing and crosstool for arm64 without any wrappers, binaries, magic etc
07:31 PM CaptHindsight: i skimmed the ML and saw a discussion on LCNC packages for ARM
07:44 PM andypugh: Whether that is the right thing to do depends on whether the buildbot is about making packages or confirming build-ability. My impression is that it is the latter, and the only way to really be sure that you can compile and run on a Pi or Beagle is to do it.
07:44 PM andypugh: If we are just looking to cross-build packages then I wonder if the Yocto project can help us at all?
07:52 PM CaptHindsight: he already has it working
07:52 PM CaptHindsight: https://github.com/NTULINUX/clfs-arm64
07:52 PM CaptHindsight: it already has less bugs and issues than crosstool-ng and others
07:52 PM CaptHindsight: we saw the build system for the rpi and after being ill he wrote this
07:56 PM CaptHindsight: we needed the tool to build Linux for ARM boards without having install a whole distro
07:56 PM CaptHindsight: say you just want a kernel, file system and iptables or similar
08:02 PM TurBoss[m]: i have played with yocto
08:04 PM TurBoss[m]: it builds ditros
08:13 PM andypugh: I know one of the developers of Yocto, I keep trying to persuade him to CNC his milling machine.
08:14 PM andypugh: But I think that he is probably too busy and not at home enough. (being a Linux Fellow)
08:36 PM CaptHindsight: yocto uses bitbake
08:36 PM CaptHindsight: so good luck with that
08:40 PM CaptHindsight: if I wanted a Linux distro on ARM I'd use Gentoo