From cf10b9b8472f9e025d4659e9475d2c7245c89868 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 14 Feb 2012 13:44:06 +0000 Subject: [PATCH] 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 (From OE-Core rev: 065798d8dd0552934175f794f7678e0dd24ef152) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/combo-layer.conf.example | 13 +++++++++---- 1 file 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