| *** tpb has joined #timvideos | 00:00 | |
| mithro | seaLne: Thanks for the patch - looking at it | 01:05 |
|---|---|---|
| mithro | CarlFK: back in the US? | 01:05 |
| CarlFK | mithro: not for another 4 days | 03:34 |
| mithro | CarlFK: conference over though? | 03:41 |
| CarlFK | mithro: talks over, 1 more day of sprints | 03:42 |
| mithro | CarlFK: so is there any more summary then "we need to get the flashing working so resetting the device is fast/easy" ? | 03:45 |
| CarlFK | mithro: there is still something buggy. I think we saw 3 classes of problems | 03:46 |
| CarlFK | mithro: 1 - need to power cycle the Atlys, then it just works | 03:46 |
| CarlFK | mithro: 2 - video_mode 9 and it works | 03:47 |
| mithro | CarlFK: I think we understand what is going on with (2) now - I logged a couple of bugs around that | 03:47 |
| CarlFK | mithro: 3 - laptop sees a display device, status shows 0x0, and plugging directly into a projector doen't work either so I blame the laptop | 03:49 |
| CarlFK | mithro: we have 2 good samples of #1 - tumbleweed';s main laptop and my small hp that has a full sized Display Port | 03:50 |
| CarlFK | tumbleweed has a DP to HDMI dongle, first time I ever used the HPs DP. | 03:50 |
| tumbleweed | CarlFK: keep the dongle if you want | 04:59 |
| *** travis-ci has joined #timvideos | 05:14 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/upstream/pr/88#5] (5db8aa2): The build passed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83519845) | 05:14 |
| *** travis-ci has left #timvideos | 05:14 | |
| *** travis-ci has joined #timvideos | 06:23 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/submodules#6] (48d8f1a): The build has errored. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83524221) | 06:23 |
| *** travis-ci has left #timvideos | 06:23 | |
| *** travis-ci has joined #timvideos | 06:43 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/submodules#7] (cb89442): The build has errored. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83525632) | 06:43 |
| *** travis-ci has left #timvideos | 06:43 | |
| *** travis-ci has joined #timvideos | 06:47 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/submodules#8] (3170c5d): The build has errored. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83525867) | 06:47 |
| *** travis-ci has left #timvideos | 06:47 | |
| *** travis-ci has joined #timvideos | 06:50 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/submodules#9] (b6dd773): The build has errored. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83525903) | 06:50 |
| *** travis-ci has left #timvideos | 06:50 | |
| *** travis-ci has joined #timvideos | 07:04 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/submodules#10] (70fd2d3): The build failed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83526742) | 07:04 |
| *** travis-ci has left #timvideos | 07:04 | |
| *** CarlFK has quit IRC | 07:42 | |
| *** travis-ci has joined #timvideos | 07:53 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/submodules#11] (fe3d8a8): The build was fixed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83527516) | 07:53 |
| *** travis-ci has left #timvideos | 07:53 | |
| *** rohitksingh has joined #timvideos | 08:07 | |
| *** CarlFK has joined #timvideos | 08:08 | |
| *** ChanServ sets mode: +v CarlFK | 08:08 | |
| *** travis-ci has joined #timvideos | 08:15 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/submodules#12] (a8cc8ae): The build was fixed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83527807) | 08:15 |
| *** travis-ci has left #timvideos | 08:15 | |
| *** travis-ci has joined #timvideos | 09:47 | |
| travis-ci | [timvideos/HDMI2USB-misoc-firmware/master#202] (92fd4c0): The build passed. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83534225) | 09:47 |
| *** travis-ci has left #timvideos | 09:47 | |
| mithro | seaLne: ping? | 09:48 |
| seaLne | mithro: pong | 09:48 |
| mithro | seaLne: I have some small changes to your pull request I think | 09:49 |
| seaLne | yeah they seemed sensible | 09:49 |
| mithro | seaLne: you've already taken a look at them? | 09:53 |
| seaLne | the changes in your comment? | 09:53 |
| seaLne | https://github.com/mithro/HDMI2USB-misoc-firmware/commit/dbcf1d8a1c28e7b440542f6fc095fffd0fc757ed ? | 09:54 |
| tpb | Title: Small fixes to #88. · mithro/HDMI2USB-misoc-firmware@dbcf1d8 · GitHub (at github.com) | 09:54 |
| seaLne | mithro: did you also fix the clean up? | 09:55 |
| mithro | seaLne: I wonder if this will work... | 09:56 |
| mithro | seaLne: I sent you a pull request :P | 09:56 |
| mithro | seaLne: https://github.com/sealne/HDMI2USB-misoc-firmware/pull/1 | 09:56 |
| tpb | Title: Some extra fixes to your PR. by mithro · Pull Request #1 · sealne/HDMI2USB-misoc-firmware · GitHub (at github.com) | 09:56 |
| mithro | seaLne: I think if you pull that into your branch, it'll end up in the pull request you sent... | 09:56 |
| mithro | seaLne: Never done that before :-P | 09:58 |
| seaLne | never stop learning :) | 09:58 |
| *** rohitksingh has quit IRC | 09:58 | |
| mithro | seaLne: can you try rebasing the changes on top of the latest changes in the repository? | 09:59 |
| seaLne | just about to | 09:59 |
| mithro | seaLne: you might want to squash some of your commits together | 10:00 |
| seaLne | that only works with sequential ones doesn't it? | 10:02 |
| mithro | seaLne: yeah kind of | 10:02 |
| mithro | seaLne: you can use rebase to reorder commits | 10:02 |
| seaLne | ah | 10:02 |
| mithro | seaLne: by just changing the order of the lines in the thing it pops up | 10:03 |
| mithro | seaLne: but it can quickly get out of hand | 10:03 |
| seaLne | ;) | 10:03 |
| seaLne | the automerge of master failed | 10:03 |
| seaLne | https://paste.kde.org/pojbjixdk | 10:05 |
| tpb | Title: KDE Paste (at paste.kde.org) | 10:05 |
| mithro | _florent_: ping? | 10:05 |
| mithro | seaLne: what does "git status" show? | 10:06 |
| seaLne | https://paste.kde.org/p5c9qdtom | 10:06 |
| tpb | Title: KDE Paste (at paste.kde.org) | 10:06 |
| mithro | seaLne: should be able to just do a "git add third_party/fx2lib; git commit" to continue | 10:07 |
| seaLne | error: unable to index file third_party/fx2lib | 10:08 |
| mithro | seaLne: maybe "rm -rf third_party/fx2lib; make third_party/fx2lib/.git" ? | 10:09 |
| seaLne | assuming make was mkdir -p still fails on git add | 10:13 |
| mithro | seaLne: nope - make was actually make | 10:13 |
| seaLne | oh | 10:14 |
| seaLne | things now seem very unhappy https://paste.kde.org/pxkeafeuw | 10:15 |
| tpb | Title: KDE Paste (at paste.kde.org) | 10:15 |
| seaLne | also grrr bash :) | 10:16 |
| mithro | seaLne: maybe "git submodule update --init --recursive" ? | 10:17 |
| seaLne | that is certainly doing something | 10:17 |
| seaLne | git add now happy | 10:18 |
| mithro | seaLne: what does git status look like now? | 10:19 |
| seaLne | Your branch is ahead of 'origin/test-clean' by 4 commits | 10:20 |
| seaLne | so some rebasing then push -f? | 10:20 |
| mithro | seaLne: yeah | 10:20 |
| seaLne | https://paste.kde.org/p3m80fts2 i just fixup all my changes after the first | 10:23 |
| tpb | Title: KDE Paste (at paste.kde.org) | 10:23 |
| mithro | seaLne: so, you rebase command should be something like | 10:25 |
| seaLne | i used git rebase -i HEAD~10 to get to that stage | 10:26 |
| mithro | seaLne: git rebase -i upstream/master (or what ever you called the timvideos git repo) | 10:26 |
| seaLne | that complains i 'm still in the middle of a rebase | 10:27 |
| mithro | seaLne: you'll have to abort the rebase you started before | 10:28 |
| mithro | git rebase --abort | 10:28 |
| seaLne | https://paste.kde.org/prp9tidsh | 10:30 |
| tpb | Title: KDE Paste (at paste.kde.org) | 10:30 |
| seaLne | even if i just fixup 1 i still get that | 10:31 |
| mithro | seaLne: I'm not sure what you mean - when rebasing you often have to "fix" your patches because the base isn't the same was what it use to be and git can't figure out how to fix them automatically | 10:32 |
| seaLne | even if i make no changes in the rebase it still gives the error | 10:34 |
| mithro | seaLne: hrm? | 10:35 |
| mithro | When you have resolved this problem, run "git rebase --continue". | 10:35 |
| seaLne | sorry i'm completly lost now | 10:36 |
| mithro | seaLne: when you do a "git rebase" - git will try and rebase the commits | 10:37 |
| mithro | but it will frequently get stuck | 10:37 |
| mithro | when it does, it stops | 10:37 |
| mithro | and asks you for help | 10:37 |
| mithro | type "git status" and it will list where it got stuck | 10:37 |
| mithro | fix that up manually | 10:37 |
| mithro | then do a "git rebase --continue" to ask git to continue going forward | 10:38 |
| *** travis-ci has joined #timvideos | 10:38 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/master#13] (92fd4c0): The build passed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83538483) | 10:38 |
| *** travis-ci has left #timvideos | 10:38 | |
| mithro | seaLne: make sense? | 10:43 |
| seaLne | yeah, need a break. will have another poke in a bit. my anti-nausea meds aren't working very well just now | 10:45 |
| mithro | seaLne: I'm going to head to bed | 10:51 |
| *** MaZderMind has quit IRC | 11:00 | |
| *** MaZderMind has joined #timvideos | 11:01 | |
| *** MaZderMind has joined #timvideos | 11:02 | |
| *** MaZderMind has joined #timvideos | 11:03 | |
| *** CarlFK has quit IRC | 13:25 | |
| *** CarlFK has joined #timvideos | 13:42 | |
| *** ChanServ sets mode: +v CarlFK | 13:42 | |
| *** CarlFK has quit IRC | 14:57 | |
| *** CarlFK has joined #timvideos | 15:13 | |
| *** ChanServ sets mode: +v CarlFK | 15:13 | |
| *** CarlFK has quit IRC | 15:35 | |
| *** rohitksingh has joined #timvideos | 15:58 | |
| *** rohitksingh has quit IRC | 17:24 | |
| *** rohitksingh has joined #timvideos | 17:43 | |
| *** CarlFK has joined #timvideos | 18:59 | |
| *** ChanServ sets mode: +v CarlFK | 18:59 | |
| *** springermac_ has joined #timvideos | 19:29 | |
| *** ysionnea1 has joined #timvideos | 19:31 | |
| *** Kripton_ has joined #timvideos | 19:31 | |
| *** Kripton has quit IRC | 19:32 | |
| *** ysionneau has quit IRC | 19:32 | |
| *** springermac has quit IRC | 19:34 | |
| *** cyrozap has quit IRC | 20:02 | |
| *** cyrozap has joined #timvideos | 20:06 | |
| *** CarlFK has quit IRC | 20:45 | |
| *** rohitksingh has quit IRC | 21:38 | |
| *** CarlFK has joined #timvideos | 21:48 | |
| *** ChanServ sets mode: +v CarlFK | 21:48 | |
Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!