2010-09-13 01:07 <qi-bot> [commit] Xiangfu Liu: update build script file. checkout to tracking_backfire branch http://qi-hw.com/p/openwrt-xburst/6883363
2010-09-13 01:32 <qi-bot> [commit] Wolfgang Spraul: shorter config.xbboot, uses make oldconfig http://qi-hw.com/p/openwrt-xburst/1d326c6
2010-09-13 01:49 <qi-bot> [commit] kyak: mupdf, jbig2dec and openjpeg as prerequisites of nupdf. http://qi-hw.com/p/openwrt-packages/bbe0237
2010-09-13 02:39 <qi-bot> [commit] kyak: fbterm and jfbterm are now sharing unifont.pcf.gz http://qi-hw.com/p/openwrt-packages/383b527
2010-09-13 03:08 <rafa> wpwrak: hey
2010-09-13 03:08 <rafa> wpwrak: which subtle advertizing ?
2010-09-13 03:09 <rafa> wpwrak: dd.. no idea.. if mkswap does that then it is something new for me
2010-09-13 03:09 <rafa> :)
2010-09-13 03:23 <rafa> (and i am an old admin :D)
2010-09-13 05:19 <wpwrak> rafa: (advertizing) setting the prompt to "Jlime". good product placement :)
2010-09-13 05:45 <wolfspraul> xiangfu: maybe you have seen the new config.miminal and config.xbboot style?
2010-09-13 05:45 <wolfspraul> I have experimented a bit with make oldconfig in OpenWrt, and so far it works quite well
2010-09-13 05:46 <wolfspraul> OpenWrt has no silentoldconfig so the way to get the config files picked up is yes ""|make oldconfig>/dev/null
2010-09-13 05:46 <wolfspraul> maybe they can introduce a silentoldconfig later if they want
2010-09-13 05:46 <wolfspraul> I will now commit the new, much shorter, config.full_system
2010-09-13 05:46 <wolfspraul> only 8 KB instead of 110 KB
2010-09-13 05:47 <wolfspraul> what we still need to do over time is to cleanup config.full_system inside - order apps and libraries in meaningful groups, for some document what they are, etc.
2010-09-13 05:48 <wolfspraul> I am currently running a full build with the new, shorter config.full_system, but will commit it already
2010-09-13 05:48 <wolfspraul> check it out and let me know what you think...
2010-09-13 05:50 <qi-bot> [commit] Wolfgang Spraul: shortened config.full_system by using make oldconfig http://qi-hw.com/p/openwrt-xburst/f697e21
2010-09-13 06:04 <xiangfu> wolfspraul: I also try 'make oldconfig' today.
2010-09-13 06:04 <xiangfu> I am test the your commit now. :)
2010-09-13 06:04 <wolfspraul> it works quite well I think
2010-09-13 06:04 <wolfspraul> it seems to ignore comment lines (though gives warnings on empty lines :-))
2010-09-13 06:05 <wolfspraul> no silentoldconfig unfortunately, but once you know the yes "" thing it works quite well
2010-09-13 06:06 <wolfspraul> I am currently running a test build with the config.full_system I just committed, should finish in a few hours.
2010-09-13 06:06 <wolfspraul> if it produces a bootable image, I will then spend a few hours to reorder/group the config file in meaningful groups
2010-09-13 06:06 <wolfspraul> at that point we hopefully have a basis that people can easily and quickly add meaningful apps and libraries too
2010-09-13 06:07 <wolfspraul> that's my plan roughly...
2010-09-13 06:08 <wolfspraul> then I still need an image for my reflashing job which starts tomorrow. Any progress on the sdl/qt bugs?
2010-09-13 06:08 <xiangfu> no.
2010-09-13 06:09 <xiangfu> hard to find.  I search a lot. but I can  not find a answer.
2010-09-13 06:09 <wolfspraul> well I think we just need classical debugging tools. debug symbols, gdb/gdbserver, etc.
2010-09-13 06:10 <wolfspraul> I created a config.minimal, did you see that?
2010-09-13 06:10 <xiangfu> wolfspraul: I will remove the 'ubi-utils' in openwrt-package.git.  which is the same 'mtd-utils' in openwrt.
2010-09-13 06:10 <xiangfu> yes. I saw the config.minimal
2010-09-13 06:10 <wolfspraul> I'm not sure whether it's the same. is it really?
2010-09-13 06:10 <wolfspraul> I thought there are different tools in ubi-utils that are not in mtd-utils. Do they point to the same upstream sources?
2010-09-13 06:11 <wolfspraul> for config.minimal, my plan is to only add one app, say NanoMap, or imgv, but turn all debug symbols on. the image is then still relatively quick to build.
2010-09-13 06:11 <wolfspraul> that way hopefully it's possible to zoom in on bugs quickly
2010-09-13 06:17 <xiangfu> mtd and ubi point to the same upstream sources.
2010-09-13 06:18 <wolfspraul> oh
2010-09-13 06:19 <wolfspraul> hmm
2010-09-13 06:19 <wolfspraul> is ubiformat in mtd-utils?
2010-09-13 06:19 <xiangfu> yes
2010-09-13 06:19 <wolfspraul> well then, I think when we created ubi-utils there was some problem with mtd-utils
2010-09-13 06:19 <wolfspraul> maybe that has been resolved since - so yeah, let's delete ubi-utils
2010-09-13 06:20 <wolfspraul> do you know how we can display the diff between tracking_backfire and openwrt backfire, and between tracking_trunk and openwrt trunk?
2010-09-13 06:24 <xiangfu> hmm.. we need add two remote git url for diff. for example tracking_trunk...openwrt_trunk
2010-09-13 06:24 <xiangfu> 1. git remote add upstream git://nbd.name/openwrt.git
2010-09-13 06:24 <xiangfu> 2. git fetch upstream
2010-09-13 06:24 <xiangfu> 3. git checkout -b openwrt_trunk upstream/master
2010-09-13 06:25 <xiangfu> 4. git diff openwrt_trunk...tracking_trunk
2010-09-13 06:25 <xiangfu> same as backfire.  the backfire upstream is git://nbd.name/backfire.git
2010-09-13 06:25 <xiangfu> 1. git remote add backfire git://nbd.name/backfire.git
2010-09-13 06:25 <xiangfu> 2. git fetch backfire
2010-09-13 06:26 <xiangfu> 3. git checkout -b openwrt_backfire backfire/master
2010-09-13 06:26 <xiangfu> 4. git diff  openwrt_backfire...tracking_backfire
2010-09-13 06:35 <xiangfu> since we always use 'git merge' not 'git rebase'  it's very hard to see what we have changed.
2010-09-13 06:49 <xiangfu> wolfspraul: "this config file does not work on tracking_trunk branch - why?" there are some commit for zImage and xbboot only in tracking_backfire branch.
2010-09-13 06:49 <xiangfu> not into upstream.
2010-09-13 06:54 <wolfspraul> xiangfu: why are we not rebasing the tracking_ branches?
2010-09-13 06:54 <wolfspraul> if you say 'very hard to see' then I just interpret that as 'impossible' :-)
2010-09-13 06:54 <wolfspraul> and that means that we need to run a diff -ru from outside on the entire tree (that always works), and/or use rebase instead of merge
2010-09-13 06:54 <wolfspraul> the goal of the tracking_ branches in the openwrt-xburst project is to be as small as possible, so if the diff is hard to see we will not reach that goal, for sure
2010-09-13 06:54 <wolfspraul> over time more and more crap will accumulate there
2010-09-13 06:55 <wolfspraul> what do you think we should do?
2010-09-13 07:03 <xiangfu> how about we only change the those folder:
2010-09-13 07:04 <xiangfu> target/linux/xburst/
2010-09-13 07:04 <xiangfu> package/uboot-xburst/
2010-09-13 07:04 <xiangfu> data/
2010-09-13 07:04 <xiangfu> scripts/build
2010-09-13 07:04 <xiangfu> scripts/reflash_ben.sh
2010-09-13 07:05 <xiangfu> if someone think he/she want change the openwrt system files.  he/she should change it in his personal branch. or send it to upstream.
2010-09-13 07:05 <xiangfu> if someone want change
2010-09-13 07:07 <xiangfu> wolfspraul: we need create a new branch for this. it's impossible to rebase the tracking_backfire branch.
2010-09-13 07:09 <wolfspraul> we should definitely wait until October when Mirko is back to get his advice. in the meantime I just though I look at the diff a little to understand what we are talking about.
2010-09-13 07:10 <wolfspraul> do you think we only made changes in those directories you mentioned? plus the build and reflash_ben.sh scripts?
2010-09-13 07:10 <xiangfu> wolfspraul: yes.
2010-09-13 07:10 <wolfspraul> can we move the uboot-xburst package into openwrt-packages?
2010-09-13 07:12 <xiangfu> yes. we can but it's not good. if we move it to openwrt-package. then upstream must add our openwrt-packages to feeds.conf
2010-09-13 07:15 <kristianpaul> Good Morning :)
2010-09-13 07:15 <xiangfu> since the u-boot is core part of make ben image. it's better to add it in package/ folder.
2010-09-13 07:17 <kyak> xiangfu: do you know how to create fonts (pnm files) for setfont2? i tryed playing with gimp and netpbm, but can't produce a font -\
2010-09-13 07:17 <wolfspraul> xiangfu: oh so the package/uboot-xburst folder is also in the upstream repository?
2010-09-13 07:18 <wolfspraul> and target/linux/xburst as well I guess
2010-09-13 07:19 <xiangfu> wolfspraul: yes. both are in the upstream repository
2010-09-13 07:20 <wolfspraul> ok
2010-09-13 07:21 <kristianpaul> git push origin master:tracking_trunk
2010-09-13 07:21 <kristianpaul> fatal: The remote end hung up unexpectedly
2010-09-13 07:21 <kristianpaul> :/
2010-09-13 07:22 <kristianpaul> hmm better start all ove again..
2010-09-13 07:23 <wolfspraul> kristianpaul: do you use your git@ url for authenticated access? check .git/config
2010-09-13 07:24 <wolfspraul> git@projects.qi-hardware.com:openwrt-xburst.git
2010-09-13 07:24 <kristianpaul> let see
2010-09-13 07:24 <kyak> wolfspraul: looking at config.full_system: do we need CONFIG_BUSYBOX_CONFIG_HTTPD=y? also we might want to disable CONFIG_BUSYBOX_CONFIG_SETFONT, because setfont is provided by kbd, and busybox uses some other file format...
2010-09-13 07:24 <wolfspraul> you get that 'hung up' message when you try to push into the read-only url git://projects.qi-hardware.com/openwrt-xburst.git
2010-09-13 07:24 <kristianpaul> hmm
2010-09-13 07:24 <xiangfu> kyak: sorry. I don't know. we need ask "Unclouded"
2010-09-13 07:25 <kristianpaul> i just was following instructions to get the update about branch renaming
2010-09-13 07:25 <wolfspraul> kyak: I like the idea of having a http server because you can connect from your notebook and have a 'big screen', for example as a development environment
2010-09-13 07:25 <kyak> xiangfu: ok, no problem :)
2010-09-13 07:25 <wolfspraul> for the busybox setfont - sure if you think it's redundant, then out with it!
2010-09-13 07:26 <kyak> wolfspraul: hm, i thought it's SSH server?
2010-09-13 07:26 <wolfspraul> that's why I started working towards a cleaner config, so we can finally zoom in on a collection of valuable stuff
2010-09-13 07:26 <wolfspraul> httpd is a ssh server? well, don't know. dropbear is the ssh server.
2010-09-13 07:27 <kyak> no-no.. "big screen" as a development environment is an SSH server :0
2010-09-13 07:27 <wolfspraul> kyak: if you think the busybox_setfont is redundant and not needed - don't hesitate and just remove it.
2010-09-13 07:27 <kyak> what do you expect to do with httpd ?
2010-09-13 07:28 <kristianpaul> UI?
2010-09-13 07:28 <kristianpaul> upload music?
2010-09-13 07:28 <xiangfu> kristianpaul: whey you want "push origin master:tracking_trunk" ??
2010-09-13 07:28 <wolfspraul> kyak: ah sure, yes. but imagine you have some php or python or whatever scripts installed that let you access the nanonote from another computer. nice applications are imaginable.
2010-09-13 07:28 <kristianpaul> and other stuff may be?
2010-09-13 07:28 <wolfspraul> the browser is just a very ubiquitous app...
2010-09-13 07:28 <kristianpaul> xiangfu: no, i'm reading now is no cense
2010-09-13 07:28 <kyak> hm, ok.. but i can't imagine any use of httpd, when you have sshd
2010-09-13 07:28 <kyak> kristianpaul: what do you mean "UI"?
2010-09-13 07:29 <wolfspraul> people may only have, or be more familiar, with a browser on the other side
2010-09-13 07:29 <wolfspraul> anyway I vote to leave the httpd in
2010-09-13 07:29 <rafa> wpwrak: that is the prompt of the shell ;).. a lot nicer than root@alongwordwhenyouhavejust320x240screen ;-))
2010-09-13 07:29 <kristianpaul> xiangfu: ahh sorry i was reading wrong part  of your mail :p
2010-09-13 07:29 <kristianpaul> kyak: User Interface
2010-09-13 07:30 <xiangfu> I was usually think put the nanonote manual  web page to nanonote . then we can http://192.168.254.101 for read the manual . that is an old idea.
2010-09-13 07:30 <kyak> wolfspraul: the make oldconfig, will it use default config but take values from .config and override the default value with them?
2010-09-13 07:31 <kristianpaul> kyak: i agreee with wolfspraul broweser is friendly and people righ now are capable of attching mails so... :) will be the same with the Ben
2010-09-13 07:31 <wolfspraul> yes I think that's how it works
2010-09-13 07:31 <kristianpaul> broweser/web browser
2010-09-13 07:31 <wolfspraul> the idea with the config files in data/qi_lb60/conf is that you copy them to .config, then you run oldconfig over it
2010-09-13 07:32 <kyak> lets say it this way: make oldconfig is using value you provide in .config, and everything else is default?
2010-09-13 07:32 <kyak> will it also track dependencies?
2010-09-13 07:33 <wolfspraul> I'm actually not sure whether the busybox httpd is good enough, maybe lighttpd is better? but anyway nobody uses it right now so we can start with the lightest approach, which I'm sure is the busybox builtin one...
2010-09-13 07:33 <kyak> and why it is named so strange? :)
2010-09-13 07:33 <wolfspraul> kyak: what is named strange?
2010-09-13 07:33 <kyak> "oldconfig"
2010-09-13 07:33 <wolfspraul> yes, I'm pretty sure dependencies work as normal
2010-09-13 07:33 <wolfspraul> it's coming from the Linux kernel
2010-09-13 07:34 <wolfspraul> I think in general the OpenWrt build system borrows (reuses) a lot of concepts and ideas from the original Linux kernel config system
2010-09-13 07:34 <wolfspraul> well, someone more knowledgeable about OpenWrt correct me if that impression is wrong...
2010-09-13 07:34 <kyak> yes ,this is so...
2010-09-13 07:34 <wolfspraul> kyak: check out config.minimal
2010-09-13 07:35 <kyak> hm ok, then it's only a matter of edditing text file now to remove or add some option
2010-09-13 07:35 <wolfspraul> if all works well in OpenWrt, it's as if you turn these things on in make menuconfig, and then OpenWrt adds the necessary dependencies
2010-09-13 07:35 <kyak> wolfspraul: already did, very cool
2010-09-13 07:35 <wolfspraul> yes
2010-09-13 07:36 <wolfspraul> the config.xbboot one is quite unstable, I'd say stay away from that unless you know what you are doing. when I remove or add anything there, the resulting initramfs will not boot anymore
2010-09-13 07:36 <wolfspraul> but config.minimal and config.full_system should be more robust, we can spend some time to improve config.full_system now
2010-09-13 07:37 <wolfspraul> OpenWrt does not seem to have a 'silentoldconfig' option
2010-09-13 07:37 <kyak> does Linux kernel have?
2010-09-13 07:37 <wolfspraul> so if you just run 'make oldconfig', it will ask you a one-line question for every new package or package/setting that was not in your .config
2010-09-13 07:37 <wolfspraul> I think it does, yes.
2010-09-13 07:38 <kyak> but your workaround seems ok
2010-09-13 07:38 <kyak> echo "yes"
2010-09-13 07:38 <wolfspraul> but we can simulate silent with yes ""|make oldconfig > /dev/null
2010-09-13 07:38 <wolfspraul> it's not echoing yes, it's echoing 'enter'
2010-09-13 07:38 <wolfspraul> so we take the default value OpenWrt suggests
2010-09-13 07:38 <kyak> oh right
2010-09-13 07:38 <wolfspraul> just run yes ""
2010-09-13 07:38 <wolfspraul> :-)
2010-09-13 07:38 <kristianpaul> xiangfu: i noticed new stuff when run the reflash script, so i guess the sources for this are in the OpenWrt Release (Backfire)  isnt?
2010-09-13 07:39 <kristianpaul> xiangfu: but the .config for stable image is in the opernwrt data folder or http://downloads.qi-hardware.com/software/images/Ben_NanoNote_2GB_NAND/latest/config ?
2010-09-13 07:40 <kristianpaul> ah okk
2010-09-13 07:40 <wolfspraul> first time when you play with it just run 'make oldconfig', then you see it line by line, and need to press enter...
2010-09-13 07:40 <kristianpaul> sorry i think  i need re-read wiki instructions again
2010-09-13 07:40 <wolfspraul> second time do yes ""|make oldconfig
2010-09-13 07:40 <wolfspraul> then you still see it running down the screen, just automatically pressing enter
2010-09-13 07:41 <wolfspraul> finaly yes ""|make oldconfig >/dev/null
2010-09-13 07:41 <xiangfu> kristianpaul: the .config in data folder is current we working on.
2010-09-13 07:41 <wolfspraul> then it's silent, you only see the warning (or error) messages which is good
2010-09-13 07:41 <xiangfu> kristianpaul: the http:/.../latest/config is the config file for the latest release.
2010-09-13 07:41 <kristianpaul> xiangfu: okay :)
2010-09-13 07:42 <kristianpaul> i'll stick to last relase for now :)
2010-09-13 07:43 <kyak> !seen unclouded
2010-09-13 07:44 <kyak> that's why we need a seen/stats bot here :)
2010-09-13 07:44 <kristianpaul> indeed
2010-09-13 08:06 <kristianpaul> wolfspraul: your new freedom stack image is not very clear to see btw
2010-09-13 08:07 <wolfspraul> revert to the old one :-)
2010-09-13 08:07 <wolfspraul> I liked the old one better too, the new one is too complicated.
2010-09-13 08:14 <kristianpaul> done
2010-09-13 08:14 <kristianpaul> what that problem revert changes when poeple dont make comments...
2010-09-13 09:16 <kyak> hm, i'm using busybox with CONFIG_BUSYBOX_CONFIG_DESKTOP=y, this automatically enables many "desktop" features
2010-09-13 09:16 <kyak> i think Ben is powerfull enough for this
2010-09-13 09:19 <kyak> i wonder what just happened..
2010-09-13 09:20 <kyak> i git push'ed to openwrt-xburst, but there was no output
2010-09-13 09:20 <kyak> though i've commited prior to the push
2010-09-13 09:21 <wolfspraul> I don't see the commit here http://projects.qi-hardware.com/index.php/p/openwrt-xburst/timeline/
2010-09-13 09:22 <kyak> me too
2010-09-13 09:22 <wolfspraul> did your local git tell you it pushed something? you will see what it pushes etc.
2010-09-13 09:22 <wolfspraul> it worked before for you...
2010-09-13 09:22 <kyak> but my changes are done locally to data/qi_lb60/conf/config.full_system
2010-09-13 09:22 <wolfspraul> so: what did you do differently this time?
2010-09-13 09:22 <kyak> i see them, and git status doesn't show this file as "modified"
2010-09-13 09:23 <kyak> actually, this is the first time i commit to openwrt-xburst
2010-09-13 09:23 <kyak> but it is set in the same way as openwrt-pacakges
2010-09-13 09:23 <kyak> wolfspraul: the output of git push was empty
2010-09-13 09:24 <wolfspraul> hmm
2010-09-13 09:24 <wolfspraul> try changing config.full_system again
2010-09-13 09:24 <wolfspraul> git status should show it as modified
2010-09-13 09:25 <wolfspraul> if course you say you git pushed already?/
2010-09-13 09:25 <kyak> ok, let's do it again
2010-09-13 09:25 <kyak> modified:   data/qi_lb60/conf/config.full_system
2010-09-13 09:25 <kyak> now i git add data/qi_lb60/conf/config.full_system
2010-09-13 09:25 <kyak> now i git commit
2010-09-13 09:25 <wolfspraul> normally you make a change, then git commit -a, then git push origin local_backfire:tracking_backfire
2010-09-13 09:26 <wolfspraul> git add?
2010-09-13 09:26 <wolfspraul> not needed
2010-09-13 09:26 <wolfspraul> the file already exists and is already tracked by git, no need to do git add
2010-09-13 09:26 <kyak> h, and git push says "everything is up to date"
2010-09-13 09:26 <wolfspraul> just git commit -a
2010-09-13 09:26 <kyak> wolfspraul: no, i git add for another reason
2010-09-13 09:26 <kyak> i have other files modified
2010-09-13 09:26 <kyak> don't want to commit those, too
2010-09-13 09:26 <wolfspraul> oh, OK
2010-09-13 09:27 <wolfspraul> but is 'git add' the right way? don't know...
2010-09-13 09:27 <kyak> this is how i do it for openwrt-packages, and this is what git says
2010-09-13 09:27 <kyak> # Changed but not updated:
2010-09-13 09:27 <kyak> #   (use "git add <file>..." to update what will be committed)
2010-09-13 09:28 <kyak> so i "update what will be committed"
2010-09-13 09:28 <wolfspraul> there a -u option to git-add
2010-09-13 09:28 <wolfspraul> first try to commit properly locally, don't jump to git push right away. try git log -1
2010-09-13 09:29 <wolfspraul> does 'git log -1' show you the config.full_system modification you did?
2010-09-13 09:29 <kyak> yup
2010-09-13 09:29 <wolfspraul> if no: no need to worry about git push
2010-09-13 09:29 <kyak> it shows me my last commit message
2010-09-13 09:29 <wolfspraul> what is the name of your local branch?
2010-09-13 09:30 <wolfspraul> try: git push origin local_backfire:tracking_backfire
2010-09-13 09:30 <wolfspraul> (assuming your local branch is called local_backfire)
2010-09-13 09:30 <kyak> [branch "xburst"] remote = origin merge = refs/heads/tracking_backfire
2010-09-13 09:30 <kyak> is this my local branch?..
2010-09-13 09:31 <kyak> i don't quite understand
2010-09-13 09:31 <wolfspraul> me neither, but let's be brave.try: git push origin xburst:tracking_backfire
2010-09-13 09:32 <qi-bot> [commit] kyak: removed busybox "kbd" features; use "kbd" for this http://qi-hw.com/p/openwrt-xburst/c5ee642
2010-09-13 09:32 <qi-bot> [commit] kyak: test.. http://qi-hw.com/p/openwrt-xburst/17f7378
2010-09-13 09:32 <kyak> oh
2010-09-13 09:32 <kyak> there they are
2010-09-13 09:32 <kyak> only the first one is valid :)
2010-09-13 09:32 <kyak> how do i avoid typing this hell?
2010-09-13 09:33 <kyak> (also now to figure out how to undo the last commit)
2010-09-13 09:33 <wolfspraul> don't know. maybe xiangfu can delete the test commit? xiangfu : do you know how to setup git push so that it automatically finds the right remote repository?
2010-09-13 09:34 <wolfspraul> kyak: if we are lucky xiangfu is still around :-) otherwise we have to turn on our brains ourselves, and find the answer...
2010-09-13 09:34 <wolfspraul> kyak: congratulations for your first openwrt-xburst commit!
2010-09-13 09:34 <kyak> when it comes to git, my brain hides somewhere
2010-09-13 09:34 <kyak> wolfspraul: thanks!
2010-09-13 09:35 <kyak> my usage of git is limited to three commands
2010-09-13 09:36 <kyak> git pull, git delete/add/mv <file>, git commit and git push
2010-09-13 09:36 <kyak> this is all i know :0
2010-09-13 09:38 <wpwrak> kyak: git log, git show, and git rebase -i are also worth knowing :)
2010-09-13 09:39 <kyak> wpwrak: git rebase is new to me
2010-09-13 09:40 <wpwrak> ah, and git reset. undo what git add did. useful if you have two sets of changes, want to put them in separate commits, and made a mistake.
2010-09-13 09:41 <kyak> wpwrak: better explain to me what git rebase is :)
2010-09-13 09:41 <wpwrak> git rebase -i lets you merge commits (and do a few other things to them). the man page has a good example. only limitation is that you shouldn't have pushed them yet.
2010-09-13 09:41 <kyak> man page would be useful, if i knew some basics.. but "Forward-port local commits to the updated upstream head" are just a set of words for me
2010-09-13 09:42 <kyak> ok, i see.. it's when i want to merge remote changes into my local branch, but i want my local changes to stay?
2010-09-13 09:43 <wpwrak> just ignore the weirdness they talk about :) the interesting bit is in the section INTERACTIVE MODE
2010-09-13 09:43 <kyak> is it smart diff? :)
2010-09-13 09:43 <wpwrak> it can do that too, yes. but rebase -i is about managing your own commits.
2010-09-13 09:44 <kyak> i should check that -i
2010-09-13 09:44 <wpwrak> you basically get another layer of "committing", where commits aren't final.
2010-09-13 09:45 <larsc> you can rearange, remove, edit and squash commits into each other
2010-09-13 09:46 <kyak> this sounds like cool.. one only needs to hope that his project will work continue working after such intensive things :)
2010-09-13 09:47 <wpwrak> kyak: if you break something, you can always git rebase -i again ;-))
2010-09-13 09:47 <larsc> or reset
2010-09-13 09:48 <kyak> ok, but i already pushed
2010-09-13 09:48 <kyak> how to revert in this case?
2010-09-13 09:48 <larsc> you add another commit reverting your commit
2010-09-13 09:48 <larsc> git revert <commit-id>
2010-09-13 09:54 <qi-bot> [commit] kyak: Revert "test.." http://qi-hw.com/p/openwrt-xburst/9066680
2010-09-13 09:55 <kyak> that's clear, though i couldn't play with rebase -i
2010-09-13 09:56 <kyak> i wonder what would happen if i revert some intermediate commit, which itself could been affected by other later commits
2010-09-13 09:57 <wolfspraul> kyak: great, so that part is already done
2010-09-13 09:57 <kyak> i should set up a local repo and experiment there
2010-09-13 09:58 <wolfspraul> now we need to find out how to setup your git push so that you don't have to specify the from and to branch
2010-09-13 09:58 <kyak> yup...
2010-09-13 09:58 <wolfspraul> I think by default git is looking for branches with the same name on the other side, or something like that
2010-09-13 09:58 <kyak> ok, have to do now.. see you later
2010-09-13 09:58 <wolfspraul> but at least you have a line (if a bit long) that works
2010-09-13 09:58 <wolfspraul> cya
2010-09-13 12:13 <aisa> It is Programmer's Day today, the 256th day of the year!
2010-09-13 12:15 <bartbes> great
2010-09-13 15:18 <bartbes> http://imm.io/media/1i/1iCq.jpg
2010-09-13 15:47 <qi-bot> [commit] Jiri Brozovsky: First attempt port of PicoC interpreter. Should work. http://qi-hw.com/p/openwrt-packages/8f050f9
2010-09-13 16:08 <kristianpaul> gforth hackers around?
2010-09-13 18:45 <qi-bot> [commit] David Kühling: use new upstream snapshot that fixes various problems reported on http://qi-hw.com/p/openwrt-packages/bb5e738
2010-09-13 21:10 <kristianpaul> xiangfu: morning
2010-09-13 21:10 <kristianpaul> There was a revese in the last image for Ben?
2010-09-13 21:11 <kristianpaul> I noticed big font again and gmenu was not the same..
2010-09-13 21:12 <xiangfu> kristianpaul: you mean this one: http://downloads.qi-hardware.com/software/images/NanoNote/Ben/latest/ ?
2010-09-13 21:12 <kristianpaul> well the one that the update script fetches
2010-09-13 21:13 <kristianpaul> i jsut updated my ben today and seemed like a downgrade :(
2010-09-13 21:13 <xiangfu> kristianpaul: ok. we make the last image point to 16-Jun-2010 image. since the 2010-08-26 have uClibc 0.9.32 problem.
2010-09-13 21:13 <kristianpaul> ahh i see
2010-09-13 21:13 <xiangfu> kristianpaul: yes. we downgrade it.
2010-09-13 21:13 <kristianpaul> cause i was hoping to see the ogg stuff and nanomap in gmenu too
2010-09-13 21:14 <kristianpaul> okay is clear for me now
2010-09-13 21:17 <xiangfu> kristianpaul: I found the 'tangogps' is ported to openwrt. we have selected it in config.full_system. just FYI.
2010-09-13 21:18 <kristianpaul> xiangfu: yes is i usde in the past
2010-09-13 21:18 <kristianpaul> xiangfu: really i dont follow tangogps on openwrt is *really* slow
2010-09-13 21:18 <kristianpaul> nanomap save the day in openwrt
2010-09-13 21:18 <kristianpaul> for sure :)
2010-09-13 21:19 <kristianpaul> i will take care of (remebers the bug in openwrt) about cgps and gpx logger
2010-09-13 21:20 <kristianpaul> i said cause i requested it from openwrt
2010-09-13 21:20 <kristianpaul> it really will help not just only to Ben
2010-09-13 21:22 <xiangfu> sure.
2010-09-13 21:30 <kristianpaul> xiangfu: i'm curios as there is a full system config, there is no a minal config, or i may be wrong?
2010-09-13 21:31 <xiangfu> kristianpaul: wolfgang have created a config.minimal already.
2010-09-13 21:31 <kristianpaul> oh let me push
2010-09-13 21:31 <kristianpaul> pull
2010-09-13 21:31 <kristianpaul> sorry
2010-09-13 21:32 <kristianpaul> hehe great i was thinking that i was alrady made hours ago :)
2010-09-13 21:32 <kristianpaul> btw are you using an script in fidelio for the builds?
2010-09-13 21:32 <kristianpaul> i it somwhere?
2010-09-13 21:32 <xiangfu> kristianpaul: yes.
2010-09-13 21:32 <kristianpaul> and is reausble for other users?
2010-09-13 21:33 <kristianpaul> good :)
2010-09-13 21:33 <kristianpaul> i just want prepare a full and minimal image :)
2010-09-13 21:33 <xiangfu> kristianpaul: there is one in git: "tracking_backfire/scripts/build'
2010-09-13 21:33 <kristianpaul> okie dokie :)
2010-09-13 21:34 <xiangfu> kristianpaul: you can take a look that file you will understand. for use this scripts file. we need copy the config.minimal to .config manually
2010-09-13 21:35 <kristianpaul> sure
2010-09-13 21:36 <xiangfu> kristianpaul: do you think we should use [yes "" | make oldconfig] instead of [make oldconfig] ??
2010-09-13 21:36 <xiangfu> in this 'scripts/build' script file.
2010-09-13 21:37 <kristianpaul> hmm is a bit confusing
2010-09-13 21:38 <kristianpaul> [ make oldconfig | yes]
2010-09-13 21:39 <kristianpaul> echo "Are you brave, dude? [NO/yes]"
2010-09-13 21:39 <kristianpaul> lol :)
2010-09-13 21:39 <xiangfu> kristianpaul:[make oldconfig | yes] will make the script will never stop. :)
2010-09-13 21:39 <kristianpaul> ahh
2010-09-13 21:39 <kristianpaul> hehe
2010-09-13 21:39 <kristianpaul> i tought was a question not a command
2010-09-13 21:40 <kristianpaul> yes is a command i see now
2010-09-13 21:40 <kristianpaul> [yes "" | make oldconfig] <<<-- yes i agree
2010-09-13 21:40 <xiangfu> yes. I think [yes "" | make oldconfig] is much better.
2010-09-13 21:45 <qi-bot> [commit] Xiangfu Liu: use [yes "" | make oldconfig] http://qi-hw.com/p/openwrt-xburst/e72eac6
2010-09-13 23:09 <qi-bot> [commit] Xiangfu Liu: add gforth to config.full_system http://qi-hw.com/p/openwrt-xburst/d4cb34a