openembedded-core.git/scripts/combo-layer, branch danny

scripts/combo-layer: ensure we validate branch/revision on init

2012-09-14T08:49:55+00:00

If both branch and last_revision are specified for a component when
combo-layer init is run, ensure that the specified revision is actually
on the specified branch and error out if not. Also ensure that the error
message mentions the component.

Signed-off-by: Paul Eggleton 
Signed-off-by: Saul Wold

scripts/combo-layer: use last_revision if specified in init

2012-09-14T08:49:54+00:00

If last_revision is specified for a component when running combo-layer
init, then use that revision instead of the latest revision on the
branch. Also, remove unnecessary git checkout during init since we
specify the revision to all calls to git when dealing with the component
repositories.

Fixes [YOCTO #3040].

Signed-off-by: Paul Eggleton 
Signed-off-by: Saul Wold

scripts/combo-layer: specify branch when getting current revision

2012-08-23T10:15:50+00:00

Handle the case during update where the configured branch is not
currently checked out in the component repository by just specifying
it in the places where it was not previously.

Signed-off-by: Paul Eggleton 
Signed-off-by: Saul Wold

combo-layer: ensure init works with split local config

2012-07-31T10:58:19+00:00

If the local configuration is already split out, ensure the init action
works properly and does not error in the case that last_revision is not
set. Additionally, if the local configuration is within the repository,
prevent it from being committed and add it to .gitignore.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

combo-layer: allow splitting out local config

2012-07-31T06:57:21+00:00

Allow splitting the local parts of the configuration (mostly
local_repo_dir and last_revision, although there is no limitation) to
a side-by-side -local.conf file, with component sections optionally
tagged with the combo layer branch name. This effectively allows you to:

 * avoid polluting the history by committing the updated last revision
   to the combo repository for every update
 * avoid putting local repo paths into the combo repository
 * manage multiple branches of the combo repository whilst avoiding the
   possibility of mixing the configuration for one branch with another.

An example split configuration (note, values may be artificial):

------------------- combo-layer.conf -------------------
[bitbake]
src_uri = git://git.openembedded.org/bitbake
dest_dir = bitbake
hook = scripts/combo-layer-hook-default.sh

[oe-core]
src_uri = git://git.openembedded.org/openembedded-core
dest_dir = .
hook = scripts/combo-layer-hook-default.sh
--------------------------------------------------------

---------------- combo-layer-local.conf ----------------
[bitbake]
local_repo_dir = ../repos/bitbake

[oe-core]
local_repo_dir = ../repos/oe-core

[bitbake|master]
branch = master
last_revision = db689a99beffea1a285cdfc74a58fe73f1666987

[oe-core|master]
branch = master
last_revision = 121a1499a81706366acc0081272a6bff634d4d62

[bitbake|denzil]
branch = 1.12
last_revision = 24b631acdaa143a4de39c6e1328849660c66f219

[oe-core|denzil]
branch = denzil
last_revision = 741146fa90f28f7ce8d82ee7f7e254872d519724
--------------------------------------------------------

It is assumed that the local config file will be added to .gitignore.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

combo-layer: check that last_revision is valid

2012-07-31T06:57:13+00:00

If the user edits the configuration file by hand and sets last_revision,
we need to ensure that the revision is valid and on the specified
branch.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

combo-layer: improve patch list handling and output

2012-07-31T06:57:07+00:00

* Ignore blank lines in patch list
* Don't fail in interactive mode if patch list is deleted
* Show patch counter
* Show relative path for patches
* Print headings before applying patch list for each component

Also change to using a "with" block to read the patch list so it gets
closed properly when we're finished.

Fixes [YOCTO #2455].

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

combo-layer: drop to a shell when apply fails during update

2012-07-31T06:56:59+00:00

If applying a patch fails during the update process, drop to a shell
instead of exiting; at that point the user can manually apply the patch,
do nothing and "exit" to skip it, or "exit 1" to abort the process.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

combo-layer: ignore patch-* temp directories in dirty check

2012-07-31T06:56:51+00:00

Make the dirty repo check somewhat less strict by ignoring old
patch directories created by this tool.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

combo-layer: allow component pull to be done separately

2012-07-31T06:56:44+00:00

* Add a -n option to disable component repo pull during update
* Add a 'pull' action to pull the component repos only

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie