summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-11-02 15:10:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:35 +0000
commitcb21ff180763f6d8dc6ec8e3fefb12512346b051 (patch)
tree6800fade764b2f1c0414b6b1f15e529bbb02965e
parentfd471a13371ef82b50db5a80fc624264edb8b9c2 (diff)
downloadpoky-cb21ff180763f6d8dc6ec8e3fefb12512346b051.tar.gz
scripts/combo-layer: tidy up config example
Move all example configuration to the example config file, tidy up a few long lines and fix some grammar. (From OE-Core rev: ec099a32243ebc7eecd86e4bf40ed38da4af3fe5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/combo-layer47
-rw-r--r--scripts/combo-layer.conf.example23
2 files changed, 19 insertions, 51 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index db38a95805..e39e4e013f 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -42,52 +42,7 @@ class Configuration(object):
42 """ 42 """
43 Manages the configuration 43 Manages the configuration
44 44
45 A valid conf looks like: 45 For an example config file, see combo-layer.conf.example
46
47# component name
48[bitbake]
49
50# mandatory options
51
52# git upstream uri
53src_uri = git://git.openembedded.org/bitbake
54
55# the directory to clone the component repo
56local_repo_dir = ~/src/bitbake
57
58# the relative dir to commit the repo patch
59# use "." if it is root dir
60dest_dir = bitbake
61
62# the updated revision last time.
63# leave it empty if no commit updated yet, and then the tool
64# will start from the first commit
65last_revision =
66
67# optional options
68
69# file_filter: only include the interested file
70# file_filter = [path] [path] ...
71# example:
72# file_filter = src/ : only include the subdir src
73# file_filter = src/*.c : only include the src *.c file
74# file_filter = src/main.c src/Makefile.am : only include these two files
75
76[oe-core]
77src_uri = git://git.openembedded.org/openembedded-core
78local_repo_dir = ~/src/oecore
79dest_dir = .
80last_revision =
81
82# it's also possible to embed python code in the config values. Similar
83# to bitbake it considers every value starting with @ to be a python script.
84# So local_repo could be easily configured using an environment variable as:
85#
86# [bitbake]
87# local_repo = @os.getenv("LOCAL_REPO_DIR") + "/bitbake"
88#
89
90# more components ...
91 46
92 """ 47 """
93 def __init__(self, options): 48 def __init__(self, options):
diff --git a/scripts/combo-layer.conf.example b/scripts/combo-layer.conf.example
index 8cee04f771..3865829606 100644
--- a/scripts/combo-layer.conf.example
+++ b/scripts/combo-layer.conf.example
@@ -1,3 +1,5 @@
1# combo-layer example configuration file
2
1# component name 3# component name
2[bitbake] 4[bitbake]
3# mandatory options 5# mandatory options
@@ -7,8 +9,8 @@ src_uri = git://git.openembedded.org/bitbake
7# the directory to clone the component repo 9# the directory to clone the component repo
8local_repo_dir = /home/kyu3/src/test/bitbake 10local_repo_dir = /home/kyu3/src/test/bitbake
9 11
10# the relative dir to commit the repo patch 12# the relative dir within the combo repo to put the component files
11# use "." if it is root dir 13# use "." if the files should be in the root dir
12dest_dir = bitbake 14dest_dir = bitbake
13 15
14# the last update revision. 16# the last update revision.
@@ -25,9 +27,10 @@ last_revision =
25# file_filter = src/*.c : only include the src *.c file 27# file_filter = src/*.c : only include the src *.c file
26# file_filter = src/main.c src/Makefile.am : only include these two files 28# file_filter = src/main.c src/Makefile.am : only include these two files
27 29
28# hook: if provided, the tool will call the hook to process the generated patch from upstream, 30# hook: if provided, the tool will call the hook to process the generated
29# and then apply the modified patch to combo repo 31# patch from upstream, and then apply the modified patch to the combo
30# the hook's parameter is: ./hook patchpath revision reponame 32# repo.
33# the hook script is called as follows: ./hook patchpath revision reponame
31# example: 34# example:
32# hook = combo-layer-hook-default.sh 35# hook = combo-layer-hook-default.sh
33 36
@@ -36,3 +39,13 @@ src_uri = git://git.openembedded.org/openembedded-core
36local_repo_dir = /home/kyu3/src/test/oecore 39local_repo_dir = /home/kyu3/src/test/oecore
37dest_dir = . 40dest_dir = .
38last_revision = 41last_revision =
42
43# It is also possible to embed python code in the config values. Similar
44# to bitbake it considers every value starting with @ to be a python
45# script.
46# e.g. local_repo_dir could easily be configured using an environment
47# variable:
48#
49# [bitbake]
50# local_repo_dir = @os.getenv("LOCAL_REPO_DIR") + "/bitbake"
51#