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

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

scripts/combo-layer: ignore merge commits

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

The combo-layer tool had trouble handling merge commits as they were included in the revision list but not the patches; these are now excluded from the revision list. Note however that this will not handle merge commits that resolved a conflict; since "git format-patch" cannot construct a linear change history over such merges there is nothing we can currently do with these. (From OE-Core rev: b6b6b215675631d0e505ffc8b4890f85fb3169f9) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie

scripts/combo-layer: fix configuration file handling

2011-08-24T01:23:34+00:00

(From OE-Core rev: e83017fe9e1dc89860a43d41d0480d1371539e44) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie

scripts/combo-layer: a simple way to script the combo-layer conf

2011-08-11T18:22:05+00:00

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. (From OE-Core rev: 62269642ce0e0e56d68d495b6c4d27327c9ed649) Signed-off-by: Leandro Dorileo Signed-off-by: Richard Purdie