Difference between revisions of "Repository Layout"
| Line 6: | Line 6: | ||
Layerman will take care of checkouting right layers with right revisions - just type make update if you want newer. | Layerman will take care of checkouting right layers with right revisions - just type make update if you want newer. | ||
| − | Current (as of right now | + | Current (as of right now 21th September 2013) we're using this set of layers: |
* changes in our meta-webos fork (meta-webos-ports repository) are described here [[MetaWebosCommits]] | * changes in our meta-webos fork (meta-webos-ports repository) are described here [[MetaWebosCommits]] | ||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
| − | |||
webos-ports-setup/master (this will be renamed when new oe-core 1.5 is released - master always tracks master in upstream layers) | webos-ports-setup/master (this will be renamed when new oe-core 1.5 is released - master always tracks master in upstream layers) | ||
| Line 31: | Line 20: | ||
* meta-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. | + | Branch name prefixed with 'webOS-ports/', means we're modifying some upstream repository. webOS-ports/danny, webOS-ports/dylan also means that this modification is compatible with older danny, dylan branches and also indicates that this branch is sometimes rebased on danny, dylan branch in upstream repository. |
Where to push changes: | Where to push changes: | ||
| − | meta-webos-ports: | + | meta-webos-ports: master branch |
| − | meta-smartphone: please try to push all changes to | + | meta-smartphone: please try to push all changes to webOS-ports/master *and* shr (compatible with master) branches. meta-smartphone/shr is merged to meta-smartphone/master (when there isn't explicit dependency on other shr branches) 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 next release. |
| − | oe-core: | + | oe-core: webOS-ports/master |
| + | |||
| + | Branches which are rebased now have git tags with date when it was rebased (this way we can continue to use older revisions, which are no longer in branch after last rebase). | ||
Revision as of 11:59, 21 September 2013
Overview
Right layers and branches/revs are always defined in webos-ports-setup/conf/layers.txt. Currently we're using dylan release, master is sometimes updated to test newer stuff in upstream layers (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 21th September 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/master (this will be renamed when new oe-core 1.5 is released - master always tracks master in upstream layers)
https://github.com/webOS-ports/webos-ports-setup/blob/master/conf/layers.txt
- bitbake,master
- oe-core,webOS-ports/master
- meta-oe,master
- meta-qt5,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, webOS-ports/dylan also means that this modification is compatible with older danny, dylan branches and also indicates that this branch is sometimes rebased on danny, dylan branch in upstream repository.
Where to push changes: meta-webos-ports: master branch meta-smartphone: please try to push all changes to webOS-ports/master *and* shr (compatible with master) branches. meta-smartphone/shr is merged to meta-smartphone/master (when there isn't explicit dependency on other shr branches) 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 next release. oe-core: webOS-ports/master
Branches which are rebased now have git tags with date when it was rebased (this way we can continue to use older revisions, which are no longer in branch after last rebase).