linux/poky.git/scripts/combo-layer, branch 1.2_M3

scripts/combo-layer: allow updating a specific component(s) only

2012-02-21T17:00:47+00:00

If you specify one or more components to update immediately following the "update" command, only these components will be updated as opposed to the default behaviour of updating all of them. (From OE-Core rev: 1779afce024b31edcf846329da705ed5aa9fe63e) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: avoid saving last revision if unchanged

2012-02-21T17:00:46+00:00

If we are running an update and the last revision hasn't changed since the last update, don't write to the configuration file. This avoids committing the config file with no changes other than spontaneous reordering of sections, which sometimes occurs due to the behaviour of the internal dictionary in Python's ConfigParser class. (This can be fixed properly but the fix is only easy in Python 2.7+ due to the availability there of the collections.OrderedDict class, and we currently want to be compatible with 2.6.x as well.) (From OE-Core rev: 4592f238de3fe6b0384c334774be9fcfc0985e4f) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: avoid error when config file is outside repo

2012-02-21T17:00:45+00:00

Avoid displaying the error from the "git status" command we use to check the status of the config file if the config file is outside of the repository (a situation that is already handled). (From OE-Core rev: 9d3e54057673348e85ba479705c4ffaad56973d6) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: skip empty commits

2011-11-07T14:05:37+00:00

If a commit is empty (for example, commits brought over from svn where only properties were changed) then attempting to apply it with "git am" will result in the error "Patch format detection failed", so skip it instead. (From OE-Core rev: 5754bc7bcc2f57b6b56e67e2900eeaab5bc184d8) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: improve some messages

2011-11-07T14:05:36+00:00

Fix some grammar. (From OE-Core rev: cc34f1bf136409d2e31c443dd5334c3a35d208af) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: auto-commit updated config file

2011-11-07T14:05:36+00:00

If the config file is tracked within the combo-layer repository and it is updated at the end of the "update" operation (because last_revision has been changed), then automatically commit the file. This ensures that multiple people can perform updates on different machines without the last revision information going missing. (If the file is outside the repository or is masked via .gitignore, this will do nothing.) (From OE-Core rev: 14f89acb43b0d9bec09b94668fbb056c7b5b1456) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: fix dirty repo check

2011-11-07T14:05:36+00:00

Fix the dirty repository check to detect any changes, including untracked files and uncommitted changes in the index. (From OE-Core rev: f03fa8bbafa82ce6b09c08bf86011b6c51eb3531) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: make component repo branch configurable

2011-11-07T14:05:36+00:00

Add an optional per-component branch setting to allow specifying the branch instead of always using master. (From OE-Core rev: 8e2b8b05607103acd539808c5ab0cc80c0d481fc) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: tidy up config example

2011-11-07T14:05:35+00:00

Move all example configuration to the example config file, tidy up a few long lines and fix some grammar. (From OE-Core rev: ec099a32243ebc7eecd86e4bf40ed38da4af3fe5) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: make init set up initial component data

2011-11-07T14:05:35+00:00

The "init" subcommand will now copy the current state of each component repository into the combo layer repository, set last_revision for each component, and then use "git add" to set up the initial commit (but will not actually make the initial commit - that is left up to the user). Also take the opportunity to bump the version number. (From OE-Core rev: d4d491aa118b6cbe895167c62a46d883abc7b4ab) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie