Pushing Mamona patches to OE

The way we're working today is basically an clone of the OE repository at a fixed revision. We generally commit things directly at Mamona repository, but at some time we need to push and merge it at OE.

For Mamona 0.2 we made a rebase from a February revision, and wet spent a lot of time before merging things at OE, and that turns our job of merging much harder now.

We want to improve our way of developing, like doing the merge almost every week, or at least at every month, but first we need to make this big merge (tons of commits).

Table of changes we need to push to OE

As we can't just push our modifications right away (some commits needs review), we decided to separate the parts we need to merge and commiting them separately, when possible.

At the following table you'll see every part separately, with change descriptions, details and the responsible for generating the commits.

Recipe/Class/MachineCommentMamona bugOE BugMamona commitsResponsible
update-alternatives2102513fc6vivijim
sourcedsc.bbclasscreating it268026df2fvivijim
xserver-kdrive-xomap-1.3.99new versiona1405evivijim
icecc.bbclassexpanding environment variables correctly1161ecvivijim
Help us to fill it

Diff from OE to Mamona

Recipe/Class/MachineDescription
nokia800.conf souldn't we use nokia770-init instead of nokia800-init just like OE? does nokia800-init exist?
mamona.conf someone changed NPTL stuff from glibc-intermediate to glibc. We need to check it
noemu packages we shoud use require gcc-${PV}.inc instead of gcc3-build.inc that doesn't exist in OE anymore