**** BEGIN LOGGING AT Mon Dec 05 02:59:56 2005 Dec 05 09:26:21 03rpurdie 07org.openembedded.dev * r112870d1... 10/packages/linux/ (14 files in 3 dirs): Dec 05 09:26:21 linux-oz-2.6: Add dyntick option to linux-openzaurus.inc. Update defconfigs to Dec 05 09:26:21 hopefully solve space issues on -git3 kernels and remove second CMDLINE option Dec 05 09:26:21 from the defconfigs as this breaks on recent kernel kconfig changes. Dec 05 09:26:23 03rpurdie 07org.openembedded.dev * r9b38a150... 10/packages/linux/ (2 files): linux-oz-2.6: bump PRs Dec 05 11:26:13 03koen 07org.openembedded.dev * r5b5b8b71... 10/packages/sword/sword_1.5.8.bb: sword 1.5.8: Fix staging, inherit pkgconfig and add curl support Dec 05 11:41:16 03jbowler 07org.openembedded.dev * r39a77001... 10/packages/linux/ (nslu2-kernel_2.6.15-rc2.bb nslu2-kernel_2.6.15-rc5.bb): Dec 05 11:41:16 nslu2-kernel: release 2.6.15-rc5 Dec 05 11:41:16 - this is the first RC (GIT snapshot - see the comments in the release Dec 05 11:41:16 notes) which compiles since rc2, no verification that it actually runs Dec 05 11:41:16 at this point. The RTC is probably still broken (as it was in rc2). Dec 05 11:46:08 03koen 07org.openembedded.dev * r643f20dc... 10/packages/gtkhtml/gtkhtml-3.6_3.6.2.bb: gtkhtml: add 3.6.2 Dec 05 11:51:40 03koen 07org.openembedded.dev * r7b0b9843... 10/packages/sword/gnomesword_2.1.2.bb: gnomesword: add 2.1.2 Dec 05 13:57:02 Next set of messages from CIA should be Unslung 6.2-alpha Dec 05 14:01:28 03rwhitby 07org.openembedded.dev * re9306802... 10/ (3 files in 3 dirs): unslung: Now based on Linksys version 2.3R63 Dec 05 14:01:32 03rwhitby 07org.openembedded.dev * rea3db1b2... 10/packages/nslu2-binary-only/unslung-rootfs/unsling: unslung-rootfs: Updated unsling to match new kernel mapping of drives. Dec 05 14:01:36 03rwhitby 07org.openembedded.dev * rd510fe2c... 10/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb: unslung-rootfs: Updated unsling to match new kernel mapping of drives. Dec 05 14:08:53 mwester-away, you should be able to build Unslung 6.2-alpha from monotone head now. Dec 05 15:21:10 03koen 07org.openembedded.dev * rb591bfca... 10/packages/atmelwlandriver/ (4 files in 2 dirs): atmelwlandriver 3.4.1.0: add patches to support iPAQ h5xxx, courtesy Erik Hovland Dec 05 15:41:06 03koen 07org.openembedded.dev * r2812814e... 10/packages/wget/wget_1.9.1.bb: wget 1.1.1: enable ipv6, courtesy Erik Hovland, closes familiar bug #1333 Dec 05 16:21:24 monotone: misuse: branch org.openembedded.dev has multiple heads Dec 05 16:22:22 Looks like the Monotone head has become a hydra - how do I work around this locally? Dec 05 19:22:50 ACTION  Dec 05 20:59:12 mwester: you are probably getting multiple heads because you have local changes. Dec 05 20:59:23 If you care about your local changes, you will need to merge. Dec 05 20:59:52 If you don't care about your local changes, then just delete your local database (make sure you save your keys first), and let "make setup" download a new one for you. Dec 05 21:09:45 I spent a little time trying to learn monotone. The two heads are one you checked in, and (I think) koen checked in. I just merged the two locally (I don't have keys that anyone else knows about, so there's no way that merge will make it back into the "real" db AFAIK. Anyway, built the head, flashed, and runs ok so far. :) Dec 05 21:13:18 ok, two heads like that are normal. If you use the makefile targets to "make update", then it will do the merging automatically for you. Dec 05 21:16:50 Hmm... ok, I'll play with it. Maybe it wouldn't do it because I hadn't created any local creds? (I started this by creating a new directory, copying in the Makefile, creating a sym link to the download directory from yesterday's builds, and issuing a "make update" command. Dec 05 21:26:00 yeah, you need to have a local key for it to do a merge **** ENDING LOGGING AT Tue Dec 06 02:59:58 2005