summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-02-14 13:44:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-21 14:56:03 +0000
commit065798d8dd0552934175f794f7678e0dd24ef152 (patch)
treea3cfb4071dc1215752cc691c69df7fbbbc74f084 /scripts
parent4592f238de3fe6b0384c334774be9fcfc0985e4f (diff)
downloadopenembedded-core-contrib-065798d8dd0552934175f794f7678e0dd24ef152.tar.gz
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@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/combo-layer.conf.example13
1 files changed, 9 insertions, 4 deletions
diff --git a/scripts/combo-layer.conf.example b/scripts/combo-layer.conf.example
index 3865829606..010a692350 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