Re: XO-1.75 B1 units - this is how they look
On 1 August 2011 23:51, Martin Langhoff mar...@laptop.org wrote: We are doing some background work to improve the membrane kb -- mechanical engineering is hard and can't be rushed (not with good results anyway). So it's hard to know whether it'll make the cut. Keep your eyes open for C1 stage units -- :-) Improvements to the membrane keyboard would be greatly welcomed. The biggest problem that our teachers deal with are keyboards that have been ripped out. Is there anything being done to reduce the likelihood/impact of this? Thanks, Sridhar Sridhar Dhanapalan Engineering Manager One Laptop per Child Australia M: +61 425 239 701 E: srid...@laptop.org.au A: G.P.O. Box 731 Sydney, NSW 2001 W: www.laptop.org.au ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: XO-1.75 B1 units - this is how they look
On Wed, Aug 3, 2011 at 4:32 AM, Sridhar Dhanapalan srid...@laptop.org.au wrote: On 1 August 2011 23:51, Martin Langhoff mar...@laptop.org wrote: We are doing some background work to improve the membrane kb -- mechanical engineering is hard and can't be rushed (not with good results anyway). So it's hard to know whether it'll make the cut. Keep your eyes open for C1 stage units -- :-) Improvements to the membrane keyboard would be greatly welcomed. The biggest problem that our teachers deal with are keyboards that have been ripped out. Is there anything being done to reduce the likelihood/impact of this? I'll let Wad answer in detail, but there are some improvements undergoing testing. Looks promising. -walter Thanks, Sridhar Sridhar Dhanapalan Engineering Manager One Laptop per Child Australia M: +61 425 239 701 E: srid...@laptop.org.au A: G.P.O. Box 731 Sydney, NSW 2001 W: www.laptop.org.au ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: XO-1.75 B1 units - this is how they look
A time ago, we do with a friend some prototype tests with resistive touch screens, here we post information to reproduce the experiment, maybe can help to someone: http://wiki.laptop.org/go/Peripherals/Touch_Screen#Adding_a_Touch_Screen_to_the_XO cheers andres On Mon, Aug 1, 2011 at 11:30 AM, NoiseEHC noise...@freemail.hu wrote: Do you have any prototypes with touchscreens? Or have you dropped the idea? On 2011.07.29. 21:18, Martin Langhoff wrote: CL2 and CL2A, B1-stage engineering prototypes, just arrived in Miami and Boston http://dev.laptop.org/~martin/xo1.75-b1-look/ If you want one, you know what to do... :-) http://blog.laptop.org/2011/07/25/new-xo-1-75-contributors-program-test-our-new-prototypes/ cheers, m ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel -- /\ndrés ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: [Sugar-devel] battery indicator missing on customized image based on 11.2.0 for XO 1.5
Daniel and list, upower was not included in the build, so, by adding this package with: [custom_packages] add_packages=upower the battery indicator is now back on sugar :) Thanks... 2011/8/2 Daniel Drake d...@laptop.org On 2 August 2011 23:01, Jerry Vonau jvo...@shaw.ca wrote: Hi: I haven't tried to remove gnome, but the one difference is the battery applet rpm(batti) is being asked to be installed on the image in modules/gnome/kspkglist.50.gnome.inc, which is no longer being included. Batti isn't used by sugar, but you might well be onto the problem. German, is the upower package included in your build? If not, if you add it (e.g. with custom_packages) does it fix your problem? Thanks, Daniel -- German R S ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: [Sugar-devel] battery indicator missing on customized image based on 11.2.0 for XO 1.5
On Wed, Aug 3, 2011 at 4:42 PM, German Ruiz germa...@opensuse.org.niwrote: Daniel and list, upower was not included in the build, so, by adding this package with: [custom_packages] add_packages=upower the battery indicator is now back on sugar :) Not sure why as the sugar packages have upower as a requirement. Peter ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: [Sugar-devel] battery indicator missing on customized image based on 11.2.0 for XO 1.5
On Wed, Aug 3, 2011 at 4:48 PM, Peter Robinson pbrobin...@gmail.com wrote: Not sure why as the sugar packages have upower as a requirement. Looks like an issue with OLPC's forked sugar package, where this dependency isn't present. (the fork just removes the keyboard and software updater dialogs from Sugar, everything else is upstream). Thanks to Jerry for pointing us in the right direction and German for getting back to us with the results. If we do another v3.0 release of olpc-os-builder we'll force inclusion of upower for sugar, and for 11.3 we'll fix the sugar RPM to have the dependency. http://dev.laptop.org/ticket/11106 Daniel ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: [Sugar-devel] battery indicator missing on customized image based on 11.2.0 for XO 1.5
On Wed, Aug 3, 2011 at 4:59 PM, Daniel Drake d...@laptop.org wrote: On Wed, Aug 3, 2011 at 4:48 PM, Peter Robinson pbrobin...@gmail.com wrote: Not sure why as the sugar packages have upower as a requirement. Looks like an issue with OLPC's forked sugar package, where this dependency isn't present. (the fork just removes the keyboard and software updater dialogs from Sugar, everything else is upstream). Sounds like a spec rebase is required :-) Peter ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
powerd-dbus network extension
Hi Paul, For 11.3.0 I'd like to implement a solution for the issue where powerd idle-suspends while wifi connections are being established, causing connection failures and other undesirable activity. The solution I'm thinking of isn't ideal in that it adds a mini-daemon alongside powerd. But hey, you just got rid of HAL, we have breathing space ;) and I can't think of a better way. Here is what I've thought up: Instead of being on-demand and short lived, powerd-dbus will be launched by powerd and will become a full-time daemon. In addition to the functionality that it already has, it will connect to the dbus system bus and monitor NetworkManager's StateChanged signals. The NM states are: DEVICE_STATE_UNKNOWN = 0 DEVICE_STATE_UNMANAGED = 1 DEVICE_STATE_UNAVAILABLE = 2 DEVICE_STATE_DISCONNECTED = 3 DEVICE_STATE_PREPARE = 4 DEVICE_STATE_CONFIG = 5 DEVICE_STATE_NEED_AUTH = 6 DEVICE_STATE_IP_CONFIG = 7 DEVICE_STATE_ACTIVATED = 8 DEVICE_STATE_FAILED = 9 Lets assign a variable: nm_suspend_ok = state = 3 state = 8 (i.e. suspend is only OK if we aren't establishing a connection) It will also monitor the wpa_supplicant signals for the same device, watching for the Scanning signal. wpas_suspend_ok = !Scanning Finally: suspend_ok = wpas_suspend_ok nm_suspend_ok When the suspend_ok flag changes, it would be communicated to powerd through the powerevents socket, as network_suspend_ok or network_suspend_not_ok. There would be a 2 second settle period after a not-OK to OK transition before sending the powerd event (and the event would be aborted if the situation changes within those 2 seconds). This captures the case where NM says the device is disconnected, and wpa_supplicant has finished a scan (suspend_ok == TRUE), but NM will initiate a connection immediately after (once it has processed the scan results). When powerd has been told network_suspend_not_ok, it would not suspend until told otherwise. (I'll probably ask you to implement this bit, I guess you could do it rather quickly?) The above is the main functionality I want to implement. But, to kill 2 birds in 1 stone, having this full-time daemon around lets me solve another issue: rfkill. You probably recall that sugar-0.84 executed rfkill block olpc when the disable wifi checkbox was ticked. Unfortunately this was never upstreamed (boo), so 11.2.0 doesn't have that functionality. In 11.2.0, the NM WirelessEnabled property is manipulated, and the interface is brought down, but we don't actually cut power. We do have the option of reimplementing it in Sugar, but (for now) I think powerd would be a nicer place to do this. (Ultimately, we want NM to do it). So, in addition to the above, powerd-dbus would monitor for NetworkManager's PropertiesChanged signal, and apply this simple logic. if WirelessEnabled == true: rfkill unblock olpc else: rfkill block olpc How does this sound to you? Thanks, Daniel ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: powerd-dbus network extension
What kind of idle-suspend are we talking about here (and on what XO hardware)? Shouldn't a proper idle-suspend be resumed when the system isn't idle any more, i.e. when a packet comes in or a timer expires in NetworkManager? Fixing that would eliminate having to build a separate kludge for every time-sensitive protocol. John ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: powerd-dbus network extension
Hi Daniel, Not sure if powerd makes use of it at all already (for things like watching videos in totem) but why not use the kernel/upower inhibit functionally just like totem and the like does. Then powerd just needs to listen/check/whatever for the inhibit and it would then also work (if it doesn't already) for those apps like totem in the gnome desktop. Peter On Wed, Aug 3, 2011 at 7:07 PM, Daniel Drake d...@laptop.org wrote: Hi Paul, For 11.3.0 I'd like to implement a solution for the issue where powerd idle-suspends while wifi connections are being established, causing connection failures and other undesirable activity. The solution I'm thinking of isn't ideal in that it adds a mini-daemon alongside powerd. But hey, you just got rid of HAL, we have breathing space ;) and I can't think of a better way. Here is what I've thought up: Instead of being on-demand and short lived, powerd-dbus will be launched by powerd and will become a full-time daemon. In addition to the functionality that it already has, it will connect to the dbus system bus and monitor NetworkManager's StateChanged signals. The NM states are: DEVICE_STATE_UNKNOWN = 0 DEVICE_STATE_UNMANAGED = 1 DEVICE_STATE_UNAVAILABLE = 2 DEVICE_STATE_DISCONNECTED = 3 DEVICE_STATE_PREPARE = 4 DEVICE_STATE_CONFIG = 5 DEVICE_STATE_NEED_AUTH = 6 DEVICE_STATE_IP_CONFIG = 7 DEVICE_STATE_ACTIVATED = 8 DEVICE_STATE_FAILED = 9 Lets assign a variable: nm_suspend_ok = state = 3 state = 8 (i.e. suspend is only OK if we aren't establishing a connection) It will also monitor the wpa_supplicant signals for the same device, watching for the Scanning signal. wpas_suspend_ok = !Scanning Finally: suspend_ok = wpas_suspend_ok nm_suspend_ok When the suspend_ok flag changes, it would be communicated to powerd through the powerevents socket, as network_suspend_ok or network_suspend_not_ok. There would be a 2 second settle period after a not-OK to OK transition before sending the powerd event (and the event would be aborted if the situation changes within those 2 seconds). This captures the case where NM says the device is disconnected, and wpa_supplicant has finished a scan (suspend_ok == TRUE), but NM will initiate a connection immediately after (once it has processed the scan results). When powerd has been told network_suspend_not_ok, it would not suspend until told otherwise. (I'll probably ask you to implement this bit, I guess you could do it rather quickly?) The above is the main functionality I want to implement. But, to kill 2 birds in 1 stone, having this full-time daemon around lets me solve another issue: rfkill. You probably recall that sugar-0.84 executed rfkill block olpc when the disable wifi checkbox was ticked. Unfortunately this was never upstreamed (boo), so 11.2.0 doesn't have that functionality. In 11.2.0, the NM WirelessEnabled property is manipulated, and the interface is brought down, but we don't actually cut power. We do have the option of reimplementing it in Sugar, but (for now) I think powerd would be a nicer place to do this. (Ultimately, we want NM to do it). So, in addition to the above, powerd-dbus would monitor for NetworkManager's PropertiesChanged signal, and apply this simple logic. if WirelessEnabled == true: rfkill unblock olpc else: rfkill block olpc How does this sound to you? Thanks, Daniel ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: powerd-dbus network extension
On Wed, Aug 3, 2011 at 7:48 PM, Peter Robinson pbrobin...@gmail.com wrote: Hi Daniel, Not sure if powerd makes use of it at all already (for things like watching videos in totem) but why not use the kernel/upower inhibit functionally just like totem and the like does. Then powerd just needs to listen/check/whatever for the inhibit and it would then also work (if it doesn't already) for those apps like totem in the gnome desktop. Good suggestion, I assume you are talking about http://people.gnome.org/~mccann/gnome-session/docs/gnome-session.html Apart from totem, what else uses this? NetworkManager doesn't (and can't, since it is systemwide and this is only for sessions), so it wouldn't solve the immediate problem. Unfortunately it would be a lot of work to implement, because gnome-session implements this interface. We would have to rebase sugar around that. Then we would have to extend upower to support our idle-suspend model, and somehow get it to replace or play nice with powerd (because gnome-session calls into upower for this stuff). And then we'd have to solve the network problem separately anyway... Thanks, Daniel ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: powerd-dbus network extension
On Wed, Aug 3, 2011 at 8:39 PM, Daniel Drake d...@laptop.org wrote: On Wed, Aug 3, 2011 at 7:48 PM, Peter Robinson pbrobin...@gmail.com wrote: Hi Daniel, Not sure if powerd makes use of it at all already (for things like watching videos in totem) but why not use the kernel/upower inhibit functionally just like totem and the like does. Then powerd just needs to listen/check/whatever for the inhibit and it would then also work (if it doesn't already) for those apps like totem in the gnome desktop. Good suggestion, I assume you are talking about http://people.gnome.org/~mccann/gnome-session/docs/gnome-session.html Apart from totem, what else uses this? NetworkManager doesn't (and can't, since it is systemwide and this is only for sessions), so it wouldn't solve the immediatne problem. Unfortunately it would be a lot of work to implement, because gnome-session implements this interface. We would have to rebase sugar around that. Then we would have to extend upower to support our idle-suspend model, and somehow get it to replace or play nice with powerd (because gnome-session calls into upower for this stuff). And then we'd have to solve the network problem separately anyway... Maybe, I thought it was a system wide thing (maybe a freedesktop thing) that was implemented by gnome using gnome-power-manager. Peter ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Kernel git reorganisation
Hi, We've recently talked about reorganising our kernel git repo, and avoiding having multiple repos like we have ended up with now. I propose the following (and I volunteer to do it): When I say archive X I mean: create a tag named archive/X pointing at the current tip of branch X, then delete the branch. And archive X as Y means: create a tag named archive/Y pointing at the current tip of branch X, then delete the branch. - ask Chris to take a backup - olpc-2.6 is renamed to olpc-kernel - symlink set up so that olpc-2.6 still works - Existing master is tagged as archive/olpc-2.6.27 - master is reset to Linus HEAD as of now - remove origin branch (seems to be entirely contained within olpc-2.6.22) - archive stable as olpc-2.6.22 - archive testing as olpc-2.6.25 - archive xo-1.5 as xo15-2.6.30 - archive xo_1.5-2.6.30 as xo15-2.6.30-2 - archive xo-v2.6.30 as xo1-2.6.30 - archive 2.6.30-rc5 as olpc-2.6.30-rc5 - archive mfgtest - archive olpc-2.6.30 - remove olpc-2.6.31-updates (entirely contained within olpc-2.6.31) - archive olpc-2.6.34-dev - archive zones_of_death This leaves just 2 branches: olpc-2.6.31 and olpc-2.6.35 Then ARM can add arm-3.0 where XO-1.75 11.3.0 kernels will be built from. When ARM does move into the repo (which should be soon, I'd hope), I'd like to request that it goes back to the linear usage of git that we've done for our other branches. I've been trying to keep an eye on the ARM kernel but it's simply too confusing with 2 repos, scratch branches, branches being rewinded/rebased, etc. Obviously theres a lot of churn going on, but that's the way it is, even post-production. A year from now it will be difficult to figure out what happened, unless you can go through the commit list. It is already painful doing that for XO-1.5 (look at the mess we made with the 2.6.30 branches above) but everything can still be traced quite easily. What would be nice to have is a branch where releases are built from, which doesn't ever get rewinded. Commits can be reverted, experimental stuff can be committed, but it shouldn't ever rewind or rebase. Things do get a bit messy, but every 2 months we should be looking at rebasing on top of a new Linus release (in a new branch), at which point commits can be merged and cleaned up, and we should be upstreaming heavily at the same time. Those measures will keep things manageable. Daniel ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: Kernel git reorganisation
Hi Dan, On Wed, Aug 03 2011, Daniel Drake wrote: We've recently talked about reorganising our kernel git repo, and avoiding having multiple repos like we have ended up with now. I propose the following (and I volunteer to do it): +1. Go ahead! - Chris. -- Chris Ball c...@laptop.org http://printf.net/ One Laptop Per Child ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Fixing yum on F14-arm build os31
On Thu, Jul 28, 2011 at 4:03 PM, Martin Langhoff mar...@laptop.org wrote: The Switch to Fedora-14 build. Download from: http://build.laptop.org/F14-arm/os31/ The default yum config - which we include - points to the official Fedora mirrors, and those don't really support unsupported architectures like ARM. Surprise! Of course it's in my list of things to fix. In the meantime, here's what you can do - edit /etc/yum.repos.d/fedora-update.repo -- look at the first section, disable it (enabled=0) - edit /etc/yum.repos.d/fedora.repo -- look at the first section, disable gpg checks (gpgcheck=0), comment out the mirrorlist line, and add baseurl=http://arm.koji.fedoraproject.org/repos/dist-f14-build/latest/arm/ You're done! Note that it is a partial repo, and it only has the packages at the F14 release time versions. Additionally, some packages are missing or tagged wrong. If you want a package that is missing, ping Peter to see if it'll be available soon. If you see a package or dependency bail out complaining about python(abi)=2.6, let Peter know. The repo is just showing the wrong package (and the right one is likely there). cheers, m -- mar...@laptop.org -- Software Architect - OLPC - ask interesting questions - don't get distracted with shiny stuff - working code first - http://wiki.laptop.org/go/User:Martinlanghoff ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Software Freedom Day 17 September 2011
Hi Sugar and olpc world What are people doing to celebrate Software Freedom Day this year? We are having an event in our city (Auckland, NZ) and are planning to show the XOs and if I can get some USBs then give out Sugar on a Stick. I am hoping to find a good printer to get some posters done. Anyone else doing anything? Kind regards Tabitha Roder eLearning specialist and olpc volunteer Cell +64 21 482229 tabi...@tabitha.net.nz http://tabitharoder.wordpress.com/ Winner: NZ Open Source Contributor Award 2010 ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: [SoaS] Software Freedom Day 17 September 2011
On Wed, Aug 3, 2011 at 7:55 PM, Tabitha Roder tabi...@tabitha.net.nz wrote: Hi Sugar and olpc world What are people doing to celebrate Software Freedom Day this year? Good question. We should do something. Maybe a mini-camp in Boston? -walter We are having an event in our city (Auckland, NZ) and are planning to show the XOs and if I can get some USBs then give out Sugar on a Stick. I am hoping to find a good printer to get some posters done. Anyone else doing anything? Kind regards Tabitha Roder eLearning specialist and olpc volunteer Cell +64 21 482229 tabi...@tabitha.net.nz http://tabitharoder.wordpress.com/ Winner: NZ Open Source Contributor Award 2010 ___ SoaS mailing list s...@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/soas -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: Software Freedom Day 17 September 2011
Hi Sugar and olpc world What are people doing to celebrate Software Freedom Day this year? We are having an event in our city (Auckland, NZ) and are planning to show the XOs and if I can get some USBs then give out Sugar on a Stick. I am hoping to find a good printer to get some posters done. Anyone else doing anything? Hi I have asked the Melbourne SFD organisers and its likely to be held at the Hub, Docklands, the usual Melbourne monthly testing venue http://wiki.laptop.org/go/MelbourneXOClub We will have some XO's on show Tony ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: Software Freedom Day 17 September 2011
On Wed, Aug 3, 2011 at 8:05 PM, fors...@ozonline.com.au wrote: Hi Sugar and olpc world What are people doing to celebrate Software Freedom Day this year? We are having an event in our city (Auckland, NZ) and are planning to show the XOs and if I can get some USBs then give out Sugar on a Stick. I am hoping to find a good printer to get some posters done. Anyone else doing anything? Hi I have asked the Melbourne SFD organisers and its likely to be held at the Hub, Docklands, the usual Melbourne monthly testing venue http://wiki.laptop.org/go/MelbourneXOClub We will have some XO's on show And some sensors, I expect :) -walter Tony ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: [SoaS] Software Freedom Day 17 September 2011
On Wed, Aug 3, 2011 at 4:55 PM, Tabitha Roder tabi...@tabitha.net.nz wrote: Hi Sugar and olpc world What are people doing to celebrate Software Freedom Day this year? We are having an event in our city (Auckland, NZ) and are planning to show the XOs and if I can get some USBs then give out Sugar on a Stick. I am hoping to find a good printer to get some posters done. Anyone else doing anything? We'll be hosting SFD2011 on our campus on Sept 15 (we have no foot traffic on Saturdays). We usually have a few XOs at hand, a bunch of Ubuntu CDs and handmade copies of FOSS for Windows. (http://www.ttcsweb.org/osswin-cd/) Sameer -- Dr. Sameer Verma, Ph.D. Associate Professor, Information Systems Director, Campus Business Solutions San Francisco State University http://verma.sfsu.edu/ http://opensource.sfsu.edu/ http://cbs.sfsu.edu/ http://is.sfsu.edu/ ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: [SoaS] Software Freedom Day 17 September 2011
On Wed, Aug 3, 2011 at 4:55 PM, Tabitha Roder tabi...@tabitha.net.nz wrote: Hi Sugar and olpc world What are people doing to celebrate Software Freedom Day this year? We are having an event in our city (Auckland, NZ) and are planning to show the XOs and if I can get some USBs then give out Sugar on a Stick. I am hoping to find a good printer to get some posters done. Anyone else doing anything? We'll be hosting SFD2011 on our campus on Sept 15 (we have no foot traffic on Saturdays). We usually have a few XOs at hand, a bunch of Ubuntu CDs and handmade copies of FOSS for Windows. http://www.ttcsweb.org/osswin-cd/) cheers, Sameer -- Dr. Sameer Verma, Ph.D. Associate Professor, Information Systems Director, Campus Business Solutions San Francisco State University http://verma.sfsu.edu/ http://opensource.sfsu.edu/ http://cbs.sfsu.edu/ http://is.sfsu.edu/ ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: Kernel git reorganisation
daniel wrote: Hi, We've recently talked about reorganising our kernel git repo, and avoiding having multiple repos like we have ended up with now. I propose the following (and I volunteer to do it): When I say archive X I mean: create a tag named archive/X pointing at the current tip of branch X, then delete the branch. And archive X as Y means: create a tag named archive/Y pointing at the current tip of branch X, then delete the branch. when you say delete the branch, does this imply no longer being able to look at the history leading to the X or Y tag? i hope not. if it's purely to give the tips more meaningful names, then that, of course, is good. - ask Chris to take a backup - olpc-2.6 is renamed to olpc-kernel - symlink set up so that olpc-2.6 still works - Existing master is tagged as archive/olpc-2.6.27 - master is reset to Linus HEAD as of now - remove origin branch (seems to be entirely contained within olpc-2.6.22) - archive stable as olpc-2.6.22 - archive testing as olpc-2.6.25 - archive xo-1.5 as xo15-2.6.30 - archive xo_1.5-2.6.30 as xo15-2.6.30-2 - archive xo-v2.6.30 as xo1-2.6.30 - archive 2.6.30-rc5 as olpc-2.6.30-rc5 - archive mfgtest - archive olpc-2.6.30 - remove olpc-2.6.31-updates (entirely contained within olpc-2.6.31) - archive olpc-2.6.34-dev - archive zones_of_death This leaves just 2 branches: olpc-2.6.31 and olpc-2.6.35 Then ARM can add arm-3.0 where XO-1.75 11.3.0 kernels will be built from. When ARM does move into the repo (which should be soon, I'd hope), I'd like to request that it goes back to the linear usage of git that we've done for our other branches. I've been trying to keep an eye on the ARM kernel but it's simply too confusing with 2 repos, scratch branches, branches being rewinded/rebased, etc. Obviously theres a lot fully agree here. paul of churn going on, but that's the way it is, even post-production. A year from now it will be difficult to figure out what happened, unless you can go through the commit list. It is already painful doing that for XO-1.5 (look at the mess we made with the 2.6.30 branches above) but everything can still be traced quite easily. What would be nice to have is a branch where releases are built from, which doesn't ever get rewinded. Commits can be reverted, experimental stuff can be committed, but it shouldn't ever rewind or rebase. Things do get a bit messy, but every 2 months we should be looking at rebasing on top of a new Linus release (in a new branch), at which point commits can be merged and cleaned up, and we should be upstreaming heavily at the same time. Those measures will keep things manageable. Daniel ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel =- paul fox, p...@laptop.org ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
