diff options
author | Christopher Larson <chris_larson@mentor.com> | 2013-03-18 18:55:07 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-19 11:54:22 +0000 |
commit | 05985a7c22655a2f35ff0fcec723173c404c7993 (patch) | |
tree | 39b61d3699cf606b621ad4fb4749ed96e2225eca | |
parent | 683abbce582a9366aca859bc7b69c56ba0565b1d (diff) | |
download | poky-05985a7c22655a2f35ff0fcec723173c404c7993.tar.gz |
layer.conf: avoid unnecessary early expansion with :=
bitbake handles immediate expansions of LAYERDIR for us automatically.
(From OE-Core rev: 643ac87145eba5dc105377041bc3deb163b62926)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta-hob/conf/layer.conf | 6 | ||||
-rw-r--r-- | meta-skeleton/conf/layer.conf | 6 | ||||
-rw-r--r-- | meta/conf/layer.conf | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/meta-hob/conf/layer.conf b/meta-hob/conf/layer.conf index ea977e2cc3..6df27ac5a3 100644 --- a/meta-hob/conf/layer.conf +++ b/meta-hob/conf/layer.conf | |||
@@ -1,11 +1,11 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a packages directory, add to BBFILES | 4 | # We have a packages directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb" | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb" |
6 | 6 | ||
7 | BBFILE_COLLECTIONS += "hob" | 7 | BBFILE_COLLECTIONS += "hob" |
8 | BBFILE_PATTERN_hob := "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_hob = "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_hob = "1" | 9 | BBFILE_PRIORITY_hob = "1" |
10 | 10 | ||
11 | # This should only be incremented on significant changes that will | 11 | # This should only be incremented on significant changes that will |
diff --git a/meta-skeleton/conf/layer.conf b/meta-skeleton/conf/layer.conf index 4cf476711d..10031c1e2a 100644 --- a/meta-skeleton/conf/layer.conf +++ b/meta-skeleton/conf/layer.conf | |||
@@ -1,11 +1,11 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a packages directory, add to BBFILES | 4 | # We have a packages directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb" | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb" |
6 | 6 | ||
7 | BBFILE_COLLECTIONS += "skeleton" | 7 | BBFILE_COLLECTIONS += "skeleton" |
8 | BBFILE_PATTERN_skeleton := "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_skeleton = "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_skeleton = "1" | 9 | BBFILE_PRIORITY_skeleton = "1" |
10 | 10 | ||
11 | # This should only be incremented on significant changes that will | 11 | # This should only be incremented on significant changes that will |
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 6e5cd0cf8d..81f1071a91 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf | |||
@@ -4,7 +4,7 @@ BBPATH .= ":${LAYERDIR}" | |||
4 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb" | 4 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb" |
5 | 5 | ||
6 | BBFILE_COLLECTIONS += "core" | 6 | BBFILE_COLLECTIONS += "core" |
7 | BBFILE_PATTERN_core := "^${LAYERDIR}/" | 7 | BBFILE_PATTERN_core = "^${LAYERDIR}/" |
8 | BBFILE_PRIORITY_core = "5" | 8 | BBFILE_PRIORITY_core = "5" |
9 | 9 | ||
10 | # This should only be incremented on significant changes that will | 10 | # This should only be incremented on significant changes that will |
@@ -12,10 +12,10 @@ BBFILE_PRIORITY_core = "5" | |||
12 | LAYERVERSION_core = "1" | 12 | LAYERVERSION_core = "1" |
13 | 13 | ||
14 | # Set a variable to get to the top of the metadata location | 14 | # Set a variable to get to the top of the metadata location |
15 | COREBASE := '${@os.path.normpath("${LAYERDIR}/../")}' | 15 | COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' |
16 | 16 | ||
17 | # Set path to qemu image tests included in this layer | 17 | # Set path to qemu image tests included in this layer |
18 | QEMUIMAGETESTS := "${COREBASE}/scripts/qemuimage-tests" | 18 | QEMUIMAGETESTS = "${COREBASE}/scripts/qemuimage-tests" |
19 | 19 | ||
20 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | 20 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ |
21 | sysvinit-inittab \ | 21 | sysvinit-inittab \ |