Re: Pending xkeyboard-config OLPC patches
On Thu, Feb 24, 2011 at 8:21 PM, Sergey V. Udaltsov s...@gnome.org wrote: As usual, I prefer to use bugzilla for patches. You can use one bug for all patches, or group them somehow, if you find it suitable. Thanks! Filed 34732 Merge OLPC es / olpc2 keyboard map 34738 Merge OLPC mechanical keyboard maps (us and es) 34730 Merge OLPC AF keyboard map 34734 Merge OLPC et keyboard map updates 34735 Merge OLPC kz keyboard map updates 34736 Merge OLPC mn keyboard map updates 34737 Merge OLPC np keyboard map updates I am not familiar with patch workflow for xkb so if there's specific info you need in all of them, you can say so via email or only in one of them. The patches actually come from Sayamindu and Paul Fox, they understand the xkb machinery in any case. I also wonder if there's a better way given our situation -- we often roll new keyboards into production. Does xkb define an alternative directory where an rpm could install additional keyboard definitions without patching xkeyboard-config the time? Of course, once defined and stable, we'd get them into xkeyboard-config proper, but what I see is that we define keyboards (and include them in our builds) in a rush, and then polish the definitions over the next year or so... with this dynamic we'll always be shipping a patched xkeyboard-config. cheers, m -- martin.langh...@gmail.com 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
Re: Pending xkeyboard-config OLPC patches
Thanks Martin I noticed that huge wave of spam in my box:) Going to look at it. Sergey On Fri, 2011-02-25 at 15:30 -0500, Martin Langhoff wrote: On Thu, Feb 24, 2011 at 8:21 PM, Sergey V. Udaltsov s...@gnome.org wrote: As usual, I prefer to use bugzilla for patches. You can use one bug for all patches, or group them somehow, if you find it suitable. Thanks! Filed 34732 Merge OLPC es / olpc2 keyboard map 34738 Merge OLPC mechanical keyboard maps (us and es) 34730 Merge OLPC AF keyboard map 34734 Merge OLPC et keyboard map updates 34735 Merge OLPC kz keyboard map updates 34736 Merge OLPC mn keyboard map updates 34737 Merge OLPC np keyboard map updates I am not familiar with patch workflow for xkb so if there's specific info you need in all of them, you can say so via email or only in one of them. The patches actually come from Sayamindu and Paul Fox, they understand the xkb machinery in any case. I also wonder if there's a better way given our situation -- we often roll new keyboards into production. Does xkb define an alternative directory where an rpm could install additional keyboard definitions without patching xkeyboard-config the time? Of course, once defined and stable, we'd get them into xkeyboard-config proper, but what I see is that we define keyboards (and include them in our builds) in a rush, and then polish the definitions over the next year or so... with this dynamic we'll always be shipping a patched xkeyboard-config. cheers, m ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Pending xkeyboard-config OLPC patches
In our F11 we shipped a heavily patched rpm for xkeyboard-config. Unfortunately, the rpm was not tagged 'olpc' so we didn't spot it as a custom rpm, and the git repo we worked with is hard to figure out patches vs upstream changes. I've spent some time separating - Our F9 patches (some got dropped) - F11 SRPM: separating our patches from Fedora's, reapplying dropped patches With this in hand, I've prepared a git repo of upstream xkeyboard-config with 3 interesting branches. - v1.5-olpc - these are the patches from the keyboard-data repo, plus the patches we dropped from F9. Paul, could you give this a quick check? - v1.9-rebase - rebase of our patchseries for v1.9 (which we ship for F14) - post-2.1-rebase - rebase of our patchseries on today's master all at http://dev.laptop.org/git/users/martin/xkeyboard-config My intention is to - talk with upstream (Hi Sergey!) about the patches in post-2.1-rebase - prep patched rpms for F11 and F14, tracking both in fedpkg-style http://dev.laptop.org/git/packages/xkeyboard-config/ - these rpms will be tagged olpc m -- martin.langh...@gmail.com 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
Re: Pending xkeyboard-config OLPC patches
martin wrote: In our F11 we shipped a heavily patched rpm for xkeyboard-config. Unfortunately, the rpm was not tagged 'olpc' so we didn't spot it as a custom rpm, and the git repo we worked with is hard to figure out patches vs upstream changes. I've spent some time separating - Our F9 patches (some got dropped) - F11 SRPM: separating our patches from Fedora's, reapplying dropped patches With this in hand, I've prepared a git repo of upstream xkeyboard-config with 3 interesting branches. - v1.5-olpc - these are the patches from the keyboard-data repo, plus the patches we dropped from F9. Paul, could you give this a quick check? i'll cut to the chase and say that i'm completely confused by what's happened, or not happened, and by what you've done to make it better. in other words, it's probably all fine. ;-) i'm not sure what a quick check means in this case. i'm sure the rebasing process was as accurate as any diffing or eyeballing i can do now, and from experience, the only reliable way to find bugs in the keyboard maps is to try every key on every keyboard. i no longer have the machines necessary to do that testing. what i don't understand from your messages so far re: keyboards is, what exactly is wrong? which keys, on which keyboards, for which languages, don't work? - v1.9-rebase - rebase of our patchseries for v1.9 (which we ship for F14) - post-2.1-rebase - rebase of our patchseries on today's master all at http://dev.laptop.org/git/users/martin/xkeyboard-config when i try and clone this repo, it seems to work fine until the very end, then says: warning: remote HEAD refers to nonexistent ref, unable to checkout. and i get no content. the web view, of course, is working fine. paul My intention is to - talk with upstream (Hi Sergey!) about the patches in post-2.1-rebase - prep patched rpms for F11 and F14, tracking both in fedpkg-style http://dev.laptop.org/git/packages/xkeyboard-config/ - these rpms will be tagged olpc m -- martin.langh...@gmail.com 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 =- paul fox, p...@laptop.org ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: Pending xkeyboard-config OLPC patches
On Thu, Feb 24, 2011 at 1:36 PM, Paul Fox p...@laptop.org wrote: i'll cut to the chase and say that i'm completely confused by what's happened, or not happened, and by what you've done to make it better. in other words, it's probably all fine. ;-) Ok. So for the F11 series, you and Sayamindu worked on the 'keyboard-data' repo. It had some issues... - It has an initial import that wasn't upstream's pristine 1.5 -- it was 1.5 plus several patches (the patches Fedora rpms were applying at that exact time, plus some of ours... but not all). So I studied the delta between pristine and our import to trace all changes. It paid off -- there was a one line change that wasn't in any patch, and I think it'd have bitten us. - That repo also has dropped some patches that were present (and of value) the F9 rpm. Notably the 'olpc2 for es' patch that is discussed @ http://dev.laptop.org/ticket/9126 . Same with the patch for http://dev.laptop.org/ticket/5060 . I don't know if this was intentional. I've re-merged the #9126 patch. I strongly suspect that #5060 is addressed in a different way now. Were these patches removed for a good reason? Perhaps you can remember... what i don't understand from your messages so far re: keyboards is, what exactly is wrong? which keys, on which keyboards, for which languages, don't work? So we discovered that olpc-utils has a code block for #9126, which triggers, but there is no es / olpc2 definition. all at http://dev.laptop.org/git/users/martin/xkeyboard-config when i try and clone this repo, it seems to work fine until the very end, then says: Sorry - fixed now. thanks! m -- martin.langh...@gmail.com 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
Re: Pending xkeyboard-config OLPC patches
martin wrote: On Thu, Feb 24, 2011 at 1:36 PM, Paul Fox p...@laptop.org wrote: i'll cut to the chase and say that i'm completely confused by what's happened, or not happened, and by what you've done to make it better. in other words, it's probably all fine. ;-) Ok. So for the F11 series, you and Sayamindu worked on the 'keyboard-data' repo. It had some issues... - It has an initial import that wasn't upstream's pristine 1.5 -- it was 1.5 plus several patches (the patches Fedora rpms were applying at that exact time, plus some of ours... but not all). So I studied the delta between pristine and our import to trace all changes. thanks. that clarifies. It paid off -- there was a one line change that wasn't in any patch, and I think it'd have bitten us. - That repo also has dropped some patches that were present (and of value) the F9 rpm. Notably the 'olpc2 for es' patch that is discussed @ http://dev.laptop.org/ticket/9126 . Same with the patch for http://dev.laptop.org/ticket/5060 . I don't know if this was intentional. I've re-merged the #9126 patch. I strongly suspect that #5060 is addressed in a different way now. Were these patches removed for a good reason? Perhaps you can remember... no, sorry, i don't remember -- i suspect it was an oversight. i started from the tree sayamindu pointed me to, and didn't spend a lot of time on anything but the mechanical key layouts. (it was a bit of a rush: the h/w layout of the mech keys was very carefully done to avoid any need for software remapping of the US keyboard, but at the time we'd sort of overlooked the mapping work needed for the spanish version. and since the principle customer for those keyboards was spanish... :-) paul what i don't understand from your messages so far re: keyboards is, what exactly is wrong? which keys, on which keyboards, for which languages, don't work? So we discovered that olpc-utils has a code block for #9126, which triggers, but there is no es / olpc2 definition. all at http://dev.laptop.org/git/users/martin/xkeyboard-config when i try and clone this repo, it seems to work fine until the very end, then says: Sorry - fixed now. thanks! m -- martin.langh...@gmail.com 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 =- paul fox, p...@laptop.org ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
Re: Pending xkeyboard-config OLPC patches
Hi Martin As usual, I prefer to use bugzilla for patches. You can use one bug for all patches, or group them somehow, if you find it suitable. Regards, Sergey On Thu, 2011-02-24 at 12:50 -0500, Martin Langhoff wrote: In our F11 we shipped a heavily patched rpm for xkeyboard-config. Unfortunately, the rpm was not tagged 'olpc' so we didn't spot it as a custom rpm, and the git repo we worked with is hard to figure out patches vs upstream changes. I've spent some time separating - Our F9 patches (some got dropped) - F11 SRPM: separating our patches from Fedora's, reapplying dropped patches With this in hand, I've prepared a git repo of upstream xkeyboard-config with 3 interesting branches. - v1.5-olpc - these are the patches from the keyboard-data repo, plus the patches we dropped from F9. Paul, could you give this a quick check? - v1.9-rebase - rebase of our patchseries for v1.9 (which we ship for F14) - post-2.1-rebase - rebase of our patchseries on today's master all at http://dev.laptop.org/git/users/martin/xkeyboard-config My intention is to - talk with upstream (Hi Sergey!) about the patches in post-2.1-rebase - prep patched rpms for F11 and F14, tracking both in fedpkg-style http://dev.laptop.org/git/packages/xkeyboard-config/ - these rpms will be tagged olpc m ___ Devel mailing list Devel@lists.laptop.org http://lists.laptop.org/listinfo/devel
