[oe-commits] Paul Eggleton : scripts/combo-layer: add branch option to example config

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 065798d8dd0552934175f794f7678e0dd24ef152
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=065798d8dd0552934175f794f7678e0dd24ef152

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Tue Feb 14 13:44:06 2012 +0000

scripts/combo-layer: add branch option to example config

Minor improvements to the example combo-layer config file:
* Add the recently added branch option to the optional options section
* Mention in comments that last_revision gets updated during "update"
* Tidy up some more grammar

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/combo-layer.conf.example |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/combo-layer.conf.example b/scripts/combo-layer.conf.example
index 3865829..010a692 100644
--- a/scripts/combo-layer.conf.example
+++ b/scripts/combo-layer.conf.example
@@ -14,13 +14,18 @@ local_repo_dir = /home/kyu3/src/test/bitbake
 dest_dir = bitbake
 
 # the last update revision.
-# "init" will set this automatically, however if it is empty when "update"
-# is run, the tool will start from the first commit.
+# "init" will set this to the latest revision automatically, however if it
+# is empty when "update" is run, the tool will start from the first commit.
+# Note that this value will get updated by "update" if the component repo's
+# latest revision changed and the operation completes successfully.
 last_revision =
 
-# optional options
+# optional options:
 
-# file_filter: only include the interested file
+# branch: specify the branch in the component repo to pull from
+# (master if not specified)
+
+# file_filter: only include the specified file(s)
 # file_filter = [path] [path] ...
 # example:
 #   file_filter = src/  : only include the subdir src