summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer-hook-default.sh
Commit message (Collapse)AuthorAgeFilesLines
* scripts/combo-layer: fix still overzealous regex in default hook scriptPaul Eggleton2011-09-211-1/+1
| | | | | | | | | | | | | In the previous fix to this hook script (OE core revision e7aae45414e4597e9244f86a81fbc940f73785c8) a start-of-line (^) marker was missed, so if a commit had no Signed-off-by line but it contained an inner patch that did, the inner patch was modified causing a "corrupt patch" error. (From OE-Core rev: 9f1b4e5923c60cd4215b0ca4da2cab6245e54ccb) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/combo-layer: fix overzealous regex in default hook scriptPaul Eggleton2011-08-231-2/+2
| | | | | | | | | | | | | | | combo-layer's hook scripts are intended to modify patches as they pass through; the default one adds a prefix with the component name and a line with the component repo revision before the Signed-off-by; however the script was also unintentionally modifying the contents of patches *within* the patches passing through it, which resulted in unexpected failures when the combo-layer script attempted to use "git am" to apply them. (From OE-Core rev: e7aae45414e4597e9244f86a81fbc940f73785c8) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* combo-layer-tool: add tool to manipulate combo layersYu Ke2011-07-081-0/+13
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. (From OE-Core rev: 68394476748386e58f40173643967f5a248173b1) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>