From: Christopher Larson Date: Tue, 19 Mar 2013 02:03:20 +0000 (-0700) Subject: layer.conf: avoid unnecessary early expansion with := X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee59f1ec94ba8474876603dad1ab32d131227f49;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git layer.conf: avoid unnecessary early expansion with := bitbake handles immediate expansions of LAYERDIR for us automatically. Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie --- diff --git a/meta-yocto-bsp/conf/layer.conf b/meta-yocto-bsp/conf/layer.conf index 49fb1350946..18544bd0cfb 100644 --- a/meta-yocto-bsp/conf/layer.conf +++ b/meta-yocto-bsp/conf/layer.conf @@ -1,11 +1,11 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "yoctobsp" -BBFILE_PATTERN_yoctobsp := "^${LAYERDIR}/" +BBFILE_PATTERN_yoctobsp = "^${LAYERDIR}/" BBFILE_PRIORITY_yoctobsp = "5" diff --git a/meta-yocto/conf/layer.conf b/meta-yocto/conf/layer.conf index 791796243f4..89ed1710038 100644 --- a/meta-yocto/conf/layer.conf +++ b/meta-yocto/conf/layer.conf @@ -1,11 +1,11 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${LAYERDIR}:${BBPATH}" +BBPATH =. "${LAYERDIR}:" # We have a packages directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "yocto" -BBFILE_PATTERN_yocto := "^${LAYERDIR}/" +BBFILE_PATTERN_yocto = "^${LAYERDIR}/" BBFILE_PRIORITY_yocto = "5" diff --git a/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf b/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf index 921d976dce5..97029dd7e40 100644 --- a/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf +++ b/scripts/lib/bsp/substrate/target/arch/common/conf/layer.conf @@ -1,10 +1,10 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "{{=machine}}" -BBFILE_PATTERN_{{=machine}} := "^${LAYERDIR}/" +BBFILE_PATTERN_{{=machine}} = "^${LAYERDIR}/" BBFILE_PRIORITY_{{=machine}} = "6" diff --git a/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf b/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf index 84a9abb1d04..76153f3f8ff 100644 --- a/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf +++ b/scripts/lib/bsp/substrate/target/arch/layer/conf/layer.conf @@ -1,10 +1,10 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have a recipes directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "{{=layer_name}}" -BBFILE_PATTERN_{{=layer_name}} := "^${LAYERDIR}/" +BBFILE_PATTERN_{{=layer_name}} = "^${LAYERDIR}/" BBFILE_PRIORITY_{{=layer_name}} = "{{=layer_priority}}"