After having some trouble compiling an image including genuinedreambox plugin (missing dreambox-tpmd), I finally got success with some manual patches.
Into my 8000 building environement I created
.../openembedded/dreambox/dreambox-tpmd.bb
and
.../openembedded/dreambox/dreambox-tpmd/tpmd
then I patched dreambox-image.bb, and everything seemed to work fine (I still have to test my image)
What I still don't understand is why I'm not able to update my git environement as usual with a git pull for merging from head what I manually update.
Even a git checkout - f or a git reset --hard make no difference.
On the contrary, a git pull gives me a warning:

error: Untracked working tree file 'packages/dreambox/dreambox-tpmd.bb' would be overwritten by merge.

Where I was wrong?

ubuntu 9.04 - git 1.6.4

Thanks!

Zitat von ritzMo

Your problem is - as the error says - the untracked file that is now present upstream.

Just undo your changes...

Perfectly solved!
Thanks again!
Sorry, but error messages sometimes are not so "clear" (and, mainly, unfortunately I'm not so skillfull... )