| 00:11.06 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-nyxvkeavqkroqwqs) |
| 00:14.34 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-etvonlvfariatqit) |
| 00:15.04 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-jbcymxdoolrhdzcf) |
| 00:15.34 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-sgrealzaekhnybgn) |
| 00:17.34 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-thonwtrtrgflktxw) |
| 00:20.37 | *** join/#edev risca (~risca@wnpgmb0903w-ds01-249-233.dynamic.mtsallstream.net) |
| 00:27.04 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-fjgsowtxwxtamqfo) |
| 00:27.34 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-yaxmvvpjpikyzode) |
| 00:31.04 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-qzqtdvregvxafcrx) |
| 00:33.34 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-szrkeelgpmofetti) |
| 00:57.27 | *** join/#edev dijenerate (~dijenerat@173.225.251.175) |
| 01:07.14 | *** join/#edev djerome (~djerome@ip68-2-20-108.ph.ph.cox.net) |
| 01:08.04 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-qkydfoaubgjjrvgq) |
| 01:14.34 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-lmqkqxwsphktldvk) |
| 01:20.06 | *** join/#edev skynet (SkyNet-200@gateway/shell/trekweb.org/x-dbwsbmpwprzlmbhr) |
| 01:20.34 | *** join/#edev Guest52595 (SkyNet-200@gateway/shell/trekweb.org/x-supsckfkomddiwvf) |
| 01:23.34 | *** join/#edev skyneu (SkyNet-200@gateway/shell/trekweb.org/x-qloofiboiqhddfmy) |
| 01:23.42 | *** join/#edev skynet-2000 (SkyNet-200@unaffiliated/skynet2000) |
| 01:23.42 | *** join/#edev skynet-2000 (SkyNet-200@gateway/shell/trekweb.org/x-qloofiboiqhddfmy) |
| 01:43.48 | *** join/#edev NightMonkey (~NightrMon@pdpc/supporter/professional/nightmonkey) |
| 03:06.03 | *** join/#edev blupp (~blupp@dslb-188-099-250-019.pools.arcor-ip.net) |
| 05:08.17 | *** join/#edev mbuf (user@nat/redhat/x-wwwioahzechqemyy) |
| 05:25.36 | *** join/#edev n17ikh (~peter@c-174-56-150-44.hsd1.sc.comcast.net) |
| 06:28.25 | *** join/#edev amarsman (~marsman@90-145-17-249.wxdsl.nl) |
| 06:43.42 | *** join/#edev clio (~andrej@85.159.109.222) |
| 06:44.09 | *** join/#edev wiml (~wiml@underhill.hhhh.org) |
| 08:25.31 | *** join/#edev florian (~fuchs@Maemo/community/contributor/florian) |
| 09:39.43 | *** join/#edev mrcan (~mrcan@unaffiliated/mrcan) |
| 09:55.32 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 10:03.05 | *** join/#edev g1powermac (~g1powerma@rrcs-173-197-150-24.west.biz.rr.com) |
| 10:03.08 | *** join/#edev g1powermac (~g1powerma@unaffiliated/g1powermac) |
| 11:57.19 | T0mW | any git experts here today that can help with a 'non-fast-forward updates were rejected' problem. Not sure how I screwed the remote repo up, I'm the only one currently using it (it is not git-hub). |
| 11:57.36 | keesj | interesting the FlySwatter2 has a real casing ! |
| 11:57.53 | T0mW | It tells me to pull from the remote, then resolve the merge. |
| 11:58.15 | keesj | did you rebase your code? |
| 11:58.33 | T0mW | keesj: maybe they sold more than a couple and now are "professional"? |
| 11:58.56 | T0mW | no, not sure what a rebase is. |
| 11:59.48 | T0mW | I had a couple of local branches going, then decided to merge one of them back into master and push master. That is when the problem came up. |
| 12:00.08 | T0mW | what is a rebase? |
| 12:00.33 | keesj | a rebase is if you re-apply your patches on top of a newer branch |
| 12:00.50 | T0mW | AH |
| 12:01.30 | keesj | The result in terms of code is usually the same but as you are re-applying patched the commit id's change |
| 12:01.35 | T0mW | I did do a diff on one of the branches to get some of the "good" changes. Then patched the master with it. |
| 12:02.09 | T0mW | After I tested the new master is when I did a local commit, then pushed. |
| 12:03.28 | keesj | and where you are the head of your master branch at that time? |
| 12:05.30 | keesj | either way I am not a guru either here. the thing is that is you rebased your main branch you will need to force a push to the git repository as you changed history. but this is probably not the case at your end |
| 12:05.49 | T0mW | that is what i'm thinking, I may have moved the HEAD of master at some point, then patched the previous commit. |
| 12:06.21 | T0mW | not sure what I did, you know how it goes. In the heat of writing code... |
| 12:06.34 | T0mW | I'll try a rebase. |
| 12:06.48 | T0mW | after I tar first. |
| 12:06.54 | keesj | :p |
| 12:07.49 | keesj | or just do an other clone. git is often wreird but nobody is allowed to say so |
| 12:13.07 | T0mW | :D |
| 12:13.37 | T0mW | You know the deal, bitch and you're the guy assigned to fix things. |
| 12:14.22 | T0mW | Well, so far, I am very pleased with git. It sure beats the heck out of cvs and svn! |
| 12:14.29 | av500 | git pull --rebase |
| 12:14.57 | av500 | that should rebase all your stuff on top of the remote |
| 12:20.11 | T0mW | :/ sigh, merge conflicts, ok, this ain't gonna be easy, I need to RTFM. |
| 12:20.22 | T0mW | thanks guys. |
| 12:21.08 | av500 | you can get back with git rebase abort |
| 12:25.00 | T0mW | av500: this is the first time I've lost sync with the remote, so it is a learning experience. |
| 12:25.16 | av500 | yeah |
| 12:25.57 | T0mW | I'll soon have someone else working on this project. So, I'm sure that more conflicts of this nature will occur. |
| 12:26.55 | T0mW | we plan to use a common remote repository and each keep a local clone that we work with, then push into the common. |
| 12:27.23 | T0mW | I didn't think that I needed to implement something on the order of git-hub, just ssh. |
| 12:32.33 | av500 | thats a typical setup |
| 12:32.57 | av500 | we do the same |
| 12:33.06 | av500 | just that we have gitosis on the server to manage the gits |
| 12:33.49 | T0mW | ah, I see. I did a new clone and see that my current master had been reset to a previous commit (detached?). |
| 12:36.37 | keesj | I plan on trying the gerrit approach sometime soon. where you push a change and somebody else reviews and accepts the patch |
| 12:37.08 | T0mW | there is a fork between the remote and local, local is 5 commits beyond the fork and the remote is 4 beyond. I had reset the local master to a previous commit, (pruned it), then proceed to continue making new commits to the local. |
| 12:37.26 | T0mW | doh |
| 12:37.59 | T0mW | looks like I have to reset the remote to the fork point? |
| 12:40.50 | av500 | I am not *the* git expert either ) |
| 12:40.51 | av500 | :) |
| 12:44.58 | *** join/#edev sunrunner20 (~jamesdoe@pool-72-64-102-237.dllstx.fios.verizon.net) |
| 12:45.49 | T0mW | Hey, Linus, some help here! heh. |
| 12:49.55 | T0mW | av500: ah, I know how I trashed things. I renamed a local branch to 'master'. |
| 13:10.28 | T0mW | av500: got it. Make a new branch, prune local back to fork point (git reset --hard <commit>), prune the remote (git push --mirror), then merge new branch back into local master and push the result. |
| 13:11.42 | T0mW | masty, I had 19 commits missing on the remote. |
| 13:21.25 | *** join/#edev mrcan (~mrcan@unaffiliated/mrcan) |
| 14:01.33 | *** join/#edev purl (~purl@rikers.org) |
| 14:01.33 | *** topic/#edev is Discussion of embedded systems (Hardware/Software/Linux/Commercial Device Repurposing) : Busybox and Buildroot : http://www.elinux.org |
| 15:03.27 | *** join/#edev prpplague^2 (~danders@192.91.66.186) |
| 15:05.08 | *** join/#edev prp^2 (~prpplague@ppp-70-242-123-139.dsl.rcsntx.swbell.net) |
| 15:38.40 | *** join/#edev purl (~purl@rikers.org) |
| 15:38.40 | *** topic/#edev is Discussion of embedded systems (Hardware/Software/Linux/Commercial Device Repurposing) : Busybox and Buildroot : http://www.elinux.org |
| 16:18.49 | *** join/#edev florian (~fuchs@sign-4db6b987.pool.mediaWays.net) |
| 16:18.49 | *** join/#edev florian (~fuchs@Maemo/community/contributor/florian) |
| 16:32.19 | *** join/#edev NightMonkey (~NightrMon@pdpc/supporter/professional/nightmonkey) |
| 16:38.20 | *** join/#edev vpopov (~happylife@dyn-45-216.fttbee.kis.ru) |
| 16:48.03 | *** join/#edev tarvik (~tarvik@nat/ti/x-wezxtidufsfzvscp) |
| 17:05.56 | *** join/#edev mrcan_ (~mrcan@unaffiliated/mrcan) |
| 17:08.47 | *** join/#edev mrcan__ (~mrcan@unaffiliated/mrcan) |
| 17:50.58 | *** part/#edev tarvik (~tarvik@nat/ti/x-wezxtidufsfzvscp) |
| 18:50.37 | *** join/#edev sterNiX (~LessIsMor@unaffiliated/nu253r/x-0655220) |
| 18:55.24 | *** join/#edev sterNiX (~LessIsMor@unaffiliated/nu253r/x-0655220) |
| 19:00.40 | *** join/#edev sterNiX (~LessIsMor@unaffiliated/nu253r/x-0655220) |
| 19:16.22 | *** join/#edev risca (~risca@wnpgmb0903w-ds01-249-233.dynamic.mtsallstream.net) |
| 19:46.33 | *** join/#edev CosmicPenguin (~nobody@soa.codeaurora.org) |
| 19:46.33 | *** mode/#edev [+o CosmicPenguin] by ChanServ |
| 19:55.38 | prpplague | CosmicPenguin: got any good beer on the menu for this evening? |
| 20:06.42 | CosmicPenguin | Probably not |
| 20:08.03 | CosmicPenguin | The fridge is a little bare |
| 20:13.30 | prpplague | doh |
| 20:22.40 | slashbeast | landley: when you plan to release next aboriginal? |
| 20:28.53 | landley | slashbeast: armv4l and x86_64 currently have regressions. |
| 20:29.14 | landley | I have a fix for the arm one, I think. x86-64 I need to investigate. |
| 20:29.31 | slashbeast | :< |
| 20:29.44 | landley | I have a build problem with current Fedora I need to debug. |
| 20:30.09 | landley | And I need to set up a fresh gentoo chroot to make sure it builds in that too, somebody mentioned a thing there... |
| 20:30.19 | landley | (The patch thing is fixed, but there was another thing. Have to check my back email.) |
| 20:30.35 | landley | And there's a new uClibc++ out I should probably upgrade to. |
| 20:30.43 | landley | But I believe that's it. |
| 20:31.07 | landley | I should get some time to catch up a bit this weekend. |
| 20:31.27 | landley | I note I get a week off at the end of may. |
| 20:31.30 | landley | I hope to get a lot done then. |
| 20:31.40 | mnemoc | landley: btw, do you have basic initramfs binary images hidden somewhere? :) |
| 20:31.45 | landley | (THe entire company's idling to make all the engineers burn PTO. ALways a good sign, that...) |
| 20:31.59 | landley | mnemoc: um, details? |
| 20:32.22 | landley | Do you mean "kernel that boots via initramfs", or "cpio.gz files"? |
| 20:32.42 | landley | And by "basic" do you mean "boots to a shell prompt" or the full contains native toolchain image? |
| 20:32.56 | mnemoc | landley: yes, like http://www.landley.net/aboriginal/downloads/binaries/root-filesystem/ but for initramfs |
| 20:33.07 | landley | mnemoc: I can trivially make 'em. |
| 20:33.12 | landley | THat's what the root-image.sh script does. |
| 20:33.28 | slashbeast | mnemoc: why you would need such? |
| 20:34.09 | landley | Run the build with SYSIMAGE_TYPE=initramfs and it'll do initramfs... |
| 20:34.40 | mnemoc | landley: thanks. good excuse to give aboriginal a try =) |
| 20:35.27 | landley | Let me know if you have any problems, and I'll try to fix 'em. :) |
| 20:36.43 | mnemoc | slashbeast: just having troubles moving a arm/mach-foo kernel patch from 2.6.36 to 3.0 (currenltly failing to see the mmc from where I boot) and good like to look at devtmpfs, sysfs and debugfs |
| 20:37.03 | mnemoc | landley: absolutely :) thanks! |
| 20:37.10 | mnemoc | s/good/would/ |
| 21:06.00 | mnemoc | landley: wow, this was smooth. now to try this initramfs_data.cpio. thanks! |
| 21:08.30 | landley | mnemoc: Good luck. :) |
| 21:09.19 | mnemoc | uhm.... landley: any quick hint to build something smaller? 66M is kind of fat to embed in the uImage... |
| 21:11.54 | landley | mnemoc: don't include the native compiler? |
| 21:12.06 | landley | Look at the "config" file for various things you can switch on/off. |
| 21:12.38 | landley | You can export NO_NATIVE_COMPILER=1 to skip the native compiler. Then the target image is only a couple megabytes. |
| 21:13.25 | landley | (The headers in /usr/include alone are several megabytes. It's hard to make a compiler _small_.) |
| 21:13.39 | landley | Well, ok, the tinycc binary is 100k. glibc is an utter pig. |
| 21:13.51 | mnemoc | :) |
| 21:14.41 | *** join/#edev yuuiio (~yuuiio@bl19-209-31.dsl.telepac.pt) |
| 21:14.57 | landley | I mean gcc is a pig. |
| 21:15.00 | mnemoc | I hadn't look inside this config file, I'm starting to like it :) |
| 21:15.03 | landley | glibc is a bit of a pig too, but not quite on the same scale... |
| 21:15.10 | mnemoc | :) |
| 21:15.14 | landley | I'm open to suggestions for improvement... :) |
| 21:18.03 | mnemoc | ^^ |
| 22:09.18 | landley | mnemoc: email me (or the aboriginal list) if you need more info, heading out for the weekend... |
| 22:23.36 | *** join/#edev CosmicPenguin (~nobody@soa.codeaurora.org) |
| 22:23.37 | *** mode/#edev [+o CosmicPenguin] by ChanServ |
| 22:42.04 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 22:50.26 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 22:55.40 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:00.59 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:06.20 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:11.15 | *** join/#edev stereohead-away (~stereohea@fiber-087-195-245-144.solcon.nl) |
| 23:11.15 | *** join/#edev av500 (~av500@ip-95-222-195-137.unitymediagroup.de) |
| 23:11.15 | *** join/#edev jonmasters (~jcm@edison.jonmasters.org) |
| 23:11.15 | *** join/#edev itdnhr (~quassel@64.31.59.70) |
| 23:11.15 | *** join/#edev ohsix (ohsix@208.100.175.111) |
| 23:11.15 | *** join/#edev m4t (matt@theorize.org) |
| 23:13.41 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:18.59 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:24.19 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:37.34 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:42.58 | *** join/#edev grummund (~user@aa.dnsdojo.com) |
| 23:43.07 | *** join/#edev grummund (~user@unaffiliated/grummund) |
| 23:54.17 | *** join/#edev grummund (~user@unaffiliated/grummund) |