Patchwork [4/4] scripts/combo-layer: add branch option to example config

login
register
mail settings
Submitter Paul Eggleton
Date Feb. 14, 2012, 1:44 p.m.
Message ID <e9c7cfe292d115a658caa8c7a57e2b6d5408a22b.1329226937.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/21267/
State Accepted
Commit 065798d8dd0552934175f794f7678e0dd24ef152
Headers show

Comments

Paul Eggleton - Feb. 14, 2012, 1:44 p.m.
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@linux.intel.com>
---
 scripts/combo-layer.conf.example |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

Patch

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