(→The team and the work) |
|||
| Line 131: | Line 131: | ||
|- | |- | ||
| Jun Tian || Skin and Device simulation || Team member || Intel || juntian | | Jun Tian || Skin and Device simulation || Team member || Intel || juntian | ||
| + | |- | ||
| + | | Joonas Lahtinen || OpenGL ES acceleration framework design || Team member || Nomovok || dolphin | ||
|} | |} | ||
Contents |
MeeGo Qemu team maintains QEMU system emulator for MeeGo SDK and QEMU linux-user emulator for OBS builders. Legacy support for scratchbox and Nokia N900 Running Maemo5 is provided as well.
Currently each and every consumer of QEMU under the MeeGo umbrella has their own version of Qemu. The plan is to migrate all this versions to a single repository, merge all code together, and then start tagging releases which will be same for all.
The main repository For MeeGo Qemu is MeeGo Qemu on gitorious. Upstream is at qemu.org.
In this documentation we shall refer to upstream git as "origin" and the the MeeGo QEMU gitorious repository as "meego".
$ git clone git://git.qemu.org/qemu.git $ cd qemu $ git remote add meego git://gitorious.org/qemu-maemo/qemu.git $ git fetch meego
The rule of thumb in development is "keep up to date with upstream". To achieve this, we rebase with upstream often. rebasing causes some pain, but that should be seen as an incentive to push the patches upstream.
Qemu head (origin/master) | (periodic rebase) | MeeGo Qemu master (meego/master) | | Everyones working branches ^
Where the working branches are "temporary" in nature. Eg once the code in the working branches have been applied (via git merge/cherry-pick/rebase or by hand), that working branch is thrown away and a new branch is created.
Being branches on top of rebased branches means one cant just "merge" changes from upstream branches - one either must rebase their own branch, or cherrypick selected changes in.
Gitorious provides "request merge" functionality, which can be used to propose changes to MeeGo Qemu.
Alternatively, people with commit access to MeeGo gitorious can push their branches for merging to MeeGo gitorious directly.git offers infinite amount of was to do that, but there is two that are probably most practical
$ git fetch meego # Make sure you are up to date $ git checkout -b temp-branch-name meego/master $ git log your-local-working-branch # pick the commit-id's of changes you want $ git cherry-pick commit-id $ vi foo.c # cleanup if necessary $ commit -a --amend # improve commit message if necessary $ git push meego temp-branch-name
$ git fetch meego $ git checkout -b temp-branch-name your-local-working-branch $ git rebase -i meego/master $ # follow instructions on editor $ git push master temp-branch-name
Where the working branches are "temporary" in nature. Eg once the code in the working branches have been applied (via git merge/cherry-pick/rebase or by hand), that working branch is thrown away and a new branch is created.
Being branches on top of rebased branches means one cant just "merge"changes from upstream branches - one either must rebase their own branch, or cherrypick selected changes in.
For ARM
git clone git://gitorious.org/qemu-maemo/gles-libs.git cd gles-libs/dgles2 ./configure --enable-glx --enable-x11 --enable-osmesa --prefix=/opt/dgles2 make install
git clone git://gitorious.org/qemu-maemo/qemu.git cd qemu ./configure --target-list="arm-softmmu arm-linux-user" --enable-gles2 --gles2dir=/opt/dgles2 make
Meego Qemu Image instructions for 1.1.
This QEMU adaptation team maintains and develops Qemu for MeeGo.
The current team members are (in no particular order):
| Name | Area | Role | Affiliation | IRC nickname |
|---|---|---|---|---|
| Riku Voipio | Linux-user and Arm system | Maintainer | Nokia | suihkulokki |
| Juha Riihimäki | Arm system | Team member | Nokia | __jr |
| Fathi Boudra | Package maintainer | Nokia | fabo | |
| Haitao Feng | OpenGL and OpenGL ES enabling and acceleration | Team member | Intel | haitao |
| Zhiyuan Lv | OpenGL and OpenGL ES enabling and acceleration | Team member | Intel | zhiyuan |
| Jun Tian | Skin and Device simulation | Team member | Intel | juntian |
| Joonas Lahtinen | OpenGL ES acceleration framework design | Team member | Nomovok | dolphin |
Our collaboration spaces are: