Difference between revisions of "Repository Layout"
| Line 29: | Line 29: | ||
meta-smartphone: please try to push all changes to danny *and* shr (compatible with master) branches. meta-smartphone/shr is merged to meta-smartphone/master (when there isn't explicit dependency on other shr branche) and after that webOS-ports/master is rebased from meta-smartphone/master. If some change isn't pushed to "shr" branch, then there is a risk that we'll forget to forward-port that change when moving to dylan release. | meta-smartphone: please try to push all changes to danny *and* shr (compatible with master) branches. meta-smartphone/shr is merged to meta-smartphone/master (when there isn't explicit dependency on other shr branche) and after that webOS-ports/master is rebased from meta-smartphone/master. If some change isn't pushed to "shr" branch, then there is a risk that we'll forget to forward-port that change when moving to dylan release. | ||
oe-core: usually both webOS-ports/danny, webOS-ports/master if applies | oe-core: usually both webOS-ports/danny, webOS-ports/master if applies | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
Revision as of 23:01, 9 April 2013
Overview
https://github.com/webOS-ports/webos-ports-setup/blob/master/conf/layers.txt Right layers and branches/revs are always defined in webos-ports-setup/conf/layers.txt. webos-ports-setup is using master from all layers, currently we support older danny release, but master is prepared and should build too (but not very often tested on target). Layerman will take care of checkouting right layers with right revisions - just type make update if you want newer.
Current (as of right now 9th April 2013) we're using this set of layers:
- changes in our meta-webos fork (meta-webos-ports repository) are described here MetaWebosCommits
webos-ports-setup/danny
- bitbake,1.16
- oe-core,webOS-ports/danny
- meta-oe,danny
- meta-smartphone,webOS-ports/danny
- meta-webos-backports,webOS-ports/danny (will be added soon)
- meta-webos-ports,danny
webos-ports-setup/master (this will be renamed as dylan when new oe-core 1.4 is release)
- bitbake,master
- oe-core,webOS-ports/master
- meta-oe,master
- meta-smartphone,webOS-ports/master
- meta-webos-ports,master
Branch name prefixed with 'webOS-ports/', means we're modifying some upstream repository. webOS-ports/danny also means that this modification is compatible with danny branches and also indicates that this branch is sometimes rebased on danny branch in upstream repository.
Where to push changes: meta-webos-ports: danny branch and ask me to rebase master (until we all move to dylan release - after that we'll push to dylan first and backport only fixes to danny branch) meta-smartphone: please try to push all changes to danny *and* shr (compatible with master) branches. meta-smartphone/shr is merged to meta-smartphone/master (when there isn't explicit dependency on other shr branche) and after that webOS-ports/master is rebased from meta-smartphone/master. If some change isn't pushed to "shr" branch, then there is a risk that we'll forget to forward-port that change when moving to dylan release. oe-core: usually both webOS-ports/danny, webOS-ports/master if applies