summaryrefslogtreecommitdiff
path: root/scripts/combo-layer
Commit message (Collapse)AuthorAgeFilesLines
* scripts/combo-layer: a simple way to script the combo-layer confLeandro Dorileo2011-08-111-1/+12
| | | | | | | | | | | | | | | | | | | | This small patch introduces a a very simple and basic way to script the combo-layer conf file. With that a combo can be shared with no need to change its config - associated to the use of environment variables for example. *Similar* to bitbake it considers every value starting with @ to be a python script. So local_repo could be easily configured as: [bitbake] local_repo = @os.getenv("LOCAL_REPO_DIR") + "/bitbake" or any more sophisticated python syntax. This version updates the config file description so users can be aware of. Signed-off-by: Leandro Dorileo <ldorileo@gmail.com>
* scripts/combo-layer: keep carriage returns at the end of linesPaul Eggleton2011-07-271-1/+1
| | | | | | | Use --keep-cr option to "git am" or otherwise we lose carriage returns which can be important for patches against files that use CRs. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
* combo-layer-tool: add tool to manipulate combo layersYu Ke2011-07-081-0/+366
This patch adds the script "combo-layer" to manipulate combo layer repos. A combo layer repo is a repo containing multiple component repos, e.g. oe-core, bitbake, BSP repos. The combo layer repo needs to be updated by syncing with the component repo upstream. This script is written to assist the combo layer handling. The combo layer tool provides three functionalities: - init: when the combo layer repo and component repo does not exist, init will "git init" the combo layer repo, and also "git clone" the component repos - update: combo layer tool will pull the latest commit from component repo upstream, and apply the commits since last update commit to the combo repo. If the user specifies interactive mode(--interactive), they can edit the patch list to select which commits to apply. - splitpatch: split the combo repo commit into separate patches per component repo, to facilitate upstream submission. Combo layer tool uses a config file to define the component repo info. Please check the combo-layer.conf.example for a detailed explanation of the config file fields. Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>