Difference between revisions of "Repository Layout"

From WebOS-Ports
Jump to navigation Jump to search
Line 1: Line 1:
 
== Overview ==
 
== Overview ==
  
Right layers and branches/revs are always defined in webos-ports/webos/layers.txt and mcf is calling simplified oebb.sh (+layerman) script to checkout/update them.
+
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.
  
We're using mcf but in simplified form too, it does not use git submodules, but normal checkouts (managed by layerman). And we've removed options to enable/disable layers (one setup to rule them all). I would also change build layout, because separate BUILD-machine dir is not needed and one tmpdir is more effective - sharing native and cross builds. Each machine has separate sysroot in it so no problem with this.
+
Current (as of right now 9th April 2013) we're using this set of layers:
  
Current (as of right now 27th October 2012) it looks like this:
+
* changes in our meta-webos fork (meta-webos-ports repository) are described here [[MetaWebosCommits]]
  
* bitbake,git://github.com/openembedded/bitbake.git,master,4cd0200e96fb282980a945b80af641a6e022e0b4
+
webos-ports-setup/danny
* openembedded-core,git://github.com/openembedded/oe-core.git,master,40cf43c1c2fa15d0ee4bcc1226d9184747695b88
+
* bitbake,1.16
* meta-openembedded,git://github.com/openembedded/meta-oe.git,master,d9b7d6b4cd6b959b3998ddfec9775b64ffa61fe0
+
* oe-core,webOS-ports/danny
* meta-smartphone,git://github.com/webOS-ports/meta-smartphone.git,webOS-ports/master,HEAD
+
* meta-oe,danny
* meta-webos,git://github.com/webOS-ports/meta-webos.git,webOS-ports/master,HEAD
+
* meta-smartphone,webOS-ports/danny
* meta-webos-ports,git://github.com/webOS-ports/meta-webos-ports.git,master,HEAD
+
* meta-webos-backports,webOS-ports/danny (will be added soon)
 +
* meta-webos-ports,danny
  
* bitbake/oe-core/meta-oe are using master with locked revision (compatible with danny/yocto-v1.3 release).
+
webos-ports-setup/master (this will be renamed as dylan when new oe-core 1.4 is release)
* changes in our meta-webos fork are described here [[MetaWebosCommits]]
+
* bitbake,master
 +
* oe-core,webOS-ports/master
 +
* meta-oe,master
 +
* meta-smartphone,webOS-ports/master
 +
* meta-webos-ports,master
  
There are currently the following repositories needed to build webos-ports:
+
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.
  
* openembedded-core
+
Where to push changes:
* meta-openembedded/meta-oe
+
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-webos
+
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.
** The layer from the Open webOS project
+
oe-core: usually both webOS-ports/danny, webOS-ports/master if applies
* meta-webos-ports
 
** Layer with additions for meta-webos needed for webos-ports
 
* meta-smartphone/meta-samsung
 
** Hardware support for the gnex device
 
* meta-smartphone/meta-fso
 
* meta-smartphone/meta-android
 
 
 
Each of this will have a ''webos-ports/master'' branch if there are additional commits which are not upstream yet. If there is no ''webos-ports/master'' branch the ''master'' branch should be used. '''The master branch will always track the upstream ''master'' branch!'''
 
  
 
== Layer description ==
 
== Layer description ==

Revision as of 22:00, 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

Layer description

meta-webos

This layers contains the recipes needed for openwebos. This is the original repository from the openwebos project with some additional changes which should go upstream in the near future.

meta-webos-ports

This layer contains several additions to meta-webos which can not go into meta-webos as they are specific for the webos-ports project.